[arch-commits] Commit in bup/trunk (PKGBUILD avoid-using-pandoc.patch)

[Alexander Rødseth]

    Date: Monday, February 1, 2016 @ 14:41:40
  Author: arodseth
Revision: 159790

upgpkg: bup 0.27-2

Modified:
  bup/trunk/PKGBUILD
Deleted:
  bup/trunk/avoid-using-pandoc.patch

--------------------------+
 PKGBUILD                 |   27 ++++++++++++---------------
 avoid-using-pandoc.patch |   31 -------------------------------
 2 files changed, 12 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-01 13:31:50 UTC (rev 159789)
+++ PKGBUILD	2016-02-01 13:41:40 UTC (rev 159790)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Contributor: Jakob Matthes <jakob.matthes at gmail.com>
 # Contributor: Bram Schoenmakers <me at bramschoenmakers.nl>
 # Contributor: henning mueller <henning at orgizm.net>
@@ -8,19 +9,17 @@
 
 pkgname=bup
 pkgver=0.27
-pkgrel=1
-pkgdesc='Highly efficient file backup system based on the git packfile format'
-arch=('i686' 'x86_64')
-url='https://github.com/bup/bup'
+pkgrel=2
+pkgdesc='Efficient backup system based on the git packfile format'
+arch=('x86_64' 'i686')
+url='https://bup.github.io/'
 license=('GPL')
 depends=('python2-fuse' 'par2cmdline' 'pylibacl' 'python2-pyxattr' 'git')
-makedepends=('ruby-ronn' 'git' 'setconf')
+makedepends=('ruby-ronn' 'git' 'setconf' 'pandoc')
 checkdepends=('rsync')
 optdepends=('python2-tornado: for bup web')
-source=("git://github.com/bup/bup.git#tag=$pkgver"
-        'avoid-using-pandoc.patch')
-sha256sums=('SKIP'
-            'd0bfe1e9f21b6552ae46db738ca798c7cef9a655dd8ad899b807d7e4ebaa8a14')
+source=("git://github.com/bup/bup.git#tag=$pkgver")
+md5sums=('SKIP')
 
 prepare() {
   cd "$pkgname"
@@ -32,11 +31,8 @@
   grep -rl python | xargs sed -i 's:env python:env python2:g'
   sed -i 's:find_prog python:find_prog python2:g' config/configure
 
-  # avoid using pandoc
-  patch -p1 -i ../avoid-using-pandoc.patch
-
-  # make test suite happy
-  git config --global user.email "john at doe.com"
+  # Make test suite happy
+  git config --global user.email "bob at zombo.com"
 }
 
 build() {
@@ -51,4 +47,5 @@
   make -C "$pkgname" DESTDIR="$pkgdir" install
 }
 
+# getver: bup.github.io
 # vim:set ts=2 sw=2 et:

Deleted: avoid-using-pandoc.patch
===================================================================
--- avoid-using-pandoc.patch	2016-02-01 13:31:50 UTC (rev 159789)
+++ avoid-using-pandoc.patch	2016-02-01 13:41:40 UTC (rev 159790)
@@ -1,31 +0,0 @@
-diff --git a/Documentation/Makefile b/Documentation/Makefile
-index 067f698..0532c31 100644
---- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -1,12 +1,5 @@
- PANDOC:=$(shell \
--	if pandoc </dev/null 2>/dev/null; then \
--		echo pandoc; \
--		touch .docs-available; \
--	else \
--		echo "Warning: pandoc not installed; can't generate manpages." >&2; \
--		echo '@echo Skipping: pandoc'; \
--		rm -f .docs-available; \
--	fi)
-+		touch .docs-available)
- BUP_VERSION:=$(shell ../bup version --tag)
- BUP_DATE:=$(shell ../bup version --date)
- 
-@@ -19,10 +12,10 @@ man: $(patsubst %.md,%.1,$(wildcard *.md))
- html: $(patsubst %.md,%.html,$(wildcard *.md))
- 
- %.1: %.md.tmp Makefile
--	$(PANDOC) -s -r markdown -w man -o $@ $<
-+	ronn -r --pipe $< > $@
- 	
- %.html: %.md.tmp Makefile
--	$(PANDOC) -s -r markdown -w html -o $@ $<
-+	 rdiscount $< > $@
- 	
- .PRECIOUS: %.md.tmp
- %.md.tmp: %.md Makefile