[arch-commits] Commit in bup/repos (6 files)
Alexander Rødseth
arodseth at archlinux.org
Mon Feb 1 13:43:10 UTC 2016
Date: Monday, February 1, 2016 @ 14:43:10
Author: arodseth
Revision: 159791
archrelease: copy trunk to community-x86_64, community-i686
Added:
bup/repos/community-i686/PKGBUILD
(from rev 159790, bup/trunk/PKGBUILD)
bup/repos/community-x86_64/PKGBUILD
(from rev 159790, bup/trunk/PKGBUILD)
Deleted:
bup/repos/community-i686/PKGBUILD
bup/repos/community-i686/avoid-using-pandoc.patch
bup/repos/community-x86_64/PKGBUILD
bup/repos/community-x86_64/avoid-using-pandoc.patch
-------------------------------------------+
/PKGBUILD | 102 ++++++++++++++++++++++++++++
community-i686/PKGBUILD | 54 --------------
community-i686/avoid-using-pandoc.patch | 31 --------
community-x86_64/PKGBUILD | 54 --------------
community-x86_64/avoid-using-pandoc.patch | 31 --------
5 files changed, 102 insertions(+), 170 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-02-01 13:41:40 UTC (rev 159790)
+++ community-i686/PKGBUILD 2016-02-01 13:43:10 UTC (rev 159791)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: 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>
-# Contributor: rakoo (AUR)
-# Contributor: SanskritFritz (gmail)
-
-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'
-license=('GPL')
-depends=('python2-fuse' 'par2cmdline' 'pylibacl' 'python2-pyxattr' 'git')
-makedepends=('ruby-ronn' 'git' 'setconf')
-checkdepends=('rsync')
-optdepends=('python2-tornado: for bup web')
-source=("git://github.com/bup/bup.git#tag=$pkgver"
- 'avoid-using-pandoc.patch')
-sha256sums=('SKIP'
- 'd0bfe1e9f21b6552ae46db738ca798c7cef9a655dd8ad899b807d7e4ebaa8a14')
-
-prepare() {
- cd "$pkgname"
-
- # Use Python 2
- setconf Makefile PYTHON python2
- grep -rl python | xargs sed -i 's:/python:/python2:g'
- grep -rl python | xargs sed -i 's:python -:python2 -:g'
- 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"
-}
-
-build() {
- make -C "$pkgname"
-}
-
-check() {
- make -C "$pkgname" test -j1
-}
-
-package() {
- make -C "$pkgname" DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: bup/repos/community-i686/PKGBUILD (from rev 159790, bup/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-02-01 13:43:10 UTC (rev 159791)
@@ -0,0 +1,51 @@
+# $Id$
+# 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>
+# Contributor: rakoo (AUR)
+# Contributor: SanskritFritz (gmail)
+
+pkgname=bup
+pkgver=0.27
+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' 'pandoc')
+checkdepends=('rsync')
+optdepends=('python2-tornado: for bup web')
+source=("git://github.com/bup/bup.git#tag=$pkgver")
+md5sums=('SKIP')
+
+prepare() {
+ cd "$pkgname"
+
+ # Use Python 2
+ setconf Makefile PYTHON python2
+ grep -rl python | xargs sed -i 's:/python:/python2:g'
+ grep -rl python | xargs sed -i 's:python -:python2 -:g'
+ grep -rl python | xargs sed -i 's:env python:env python2:g'
+ sed -i 's:find_prog python:find_prog python2:g' config/configure
+
+ # Make test suite happy
+ git config --global user.email "bob at zombo.com"
+}
+
+build() {
+ make -C "$pkgname"
+}
+
+check() {
+ make -C "$pkgname" test -j1
+}
+
+package() {
+ make -C "$pkgname" DESTDIR="$pkgdir" install
+}
+
+# getver: bup.github.io
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/avoid-using-pandoc.patch
===================================================================
--- community-i686/avoid-using-pandoc.patch 2016-02-01 13:41:40 UTC (rev 159790)
+++ community-i686/avoid-using-pandoc.patch 2016-02-01 13:43:10 UTC (rev 159791)
@@ -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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-02-01 13:41:40 UTC (rev 159790)
+++ community-x86_64/PKGBUILD 2016-02-01 13:43:10 UTC (rev 159791)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: 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>
-# Contributor: rakoo (AUR)
-# Contributor: SanskritFritz (gmail)
-
-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'
-license=('GPL')
-depends=('python2-fuse' 'par2cmdline' 'pylibacl' 'python2-pyxattr' 'git')
-makedepends=('ruby-ronn' 'git' 'setconf')
-checkdepends=('rsync')
-optdepends=('python2-tornado: for bup web')
-source=("git://github.com/bup/bup.git#tag=$pkgver"
- 'avoid-using-pandoc.patch')
-sha256sums=('SKIP'
- 'd0bfe1e9f21b6552ae46db738ca798c7cef9a655dd8ad899b807d7e4ebaa8a14')
-
-prepare() {
- cd "$pkgname"
-
- # Use Python 2
- setconf Makefile PYTHON python2
- grep -rl python | xargs sed -i 's:/python:/python2:g'
- grep -rl python | xargs sed -i 's:python -:python2 -:g'
- 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"
-}
-
-build() {
- make -C "$pkgname"
-}
-
-check() {
- make -C "$pkgname" test -j1
-}
-
-package() {
- make -C "$pkgname" DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: bup/repos/community-x86_64/PKGBUILD (from rev 159790, bup/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-02-01 13:43:10 UTC (rev 159791)
@@ -0,0 +1,51 @@
+# $Id$
+# 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>
+# Contributor: rakoo (AUR)
+# Contributor: SanskritFritz (gmail)
+
+pkgname=bup
+pkgver=0.27
+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' 'pandoc')
+checkdepends=('rsync')
+optdepends=('python2-tornado: for bup web')
+source=("git://github.com/bup/bup.git#tag=$pkgver")
+md5sums=('SKIP')
+
+prepare() {
+ cd "$pkgname"
+
+ # Use Python 2
+ setconf Makefile PYTHON python2
+ grep -rl python | xargs sed -i 's:/python:/python2:g'
+ grep -rl python | xargs sed -i 's:python -:python2 -:g'
+ grep -rl python | xargs sed -i 's:env python:env python2:g'
+ sed -i 's:find_prog python:find_prog python2:g' config/configure
+
+ # Make test suite happy
+ git config --global user.email "bob at zombo.com"
+}
+
+build() {
+ make -C "$pkgname"
+}
+
+check() {
+ make -C "$pkgname" test -j1
+}
+
+package() {
+ make -C "$pkgname" DESTDIR="$pkgdir" install
+}
+
+# getver: bup.github.io
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/avoid-using-pandoc.patch
===================================================================
--- community-x86_64/avoid-using-pandoc.patch 2016-02-01 13:41:40 UTC (rev 159790)
+++ community-x86_64/avoid-using-pandoc.patch 2016-02-01 13:43:10 UTC (rev 159791)
@@ -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
More information about the arch-commits
mailing list