summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2014-11-05 23:14:12 -0800
committerMike Swanson2014-11-05 23:14:12 -0800
commitd576c91db7e6d7c4720a53f31dcb2c92edc954b3 (patch)
tree4070474f8248c295f0de0ccb5ba1b0ff8ff79b5d
parentef132534bd88ca80e73e58d4a9e13b6c8114c183 (diff)
downloadaur-d576c91db7e6d7c4720a53f31dcb2c92edc954b3.tar.gz
Update cvs-fast-export to 1.26
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD16
-rw-r--r--install-cvsconvert.patch20
3 files changed, 37 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 055472de7df2..8c1fb465c362 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cvs-fast-export
pkgdesc = Export RCS or CVS history as a fastimport stream.
- pkgver = 1.25
+ pkgver = 1.26
pkgrel = 1
url = http://www.catb.org/esr/cvs-fast-export/
arch = i686
@@ -8,8 +8,10 @@ pkgbase = cvs-fast-export
license = GPL2
makedepends = asciidoc
depends = python
- source = http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.25.tar.gz
- sha256sums = 9923a9ecec717ea4da41d4e27a90e5dc47acba9b8c34ad32b49d95f4a832f0eb
+ source = http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.26.tar.gz
+ source = install-cvsconvert.patch
+ sha256sums = ebca4b19ba9045bc1b733f729042d7a98dd6675dac3030239f718b13a99949ed
+ sha256sums = fd45067e8329811ca059aafb4df8a3bfced8b5a3023ba566dff25cfa4de84d66
pkgname = cvs-fast-export
diff --git a/PKGBUILD b/PKGBUILD
index 45d233f5932d..fa0c5eeddf1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
pkgname=cvs-fast-export
-pkgver=1.25
+pkgver=1.26
pkgrel=1
pkgdesc="Export RCS or CVS history as a fastimport stream."
arch=('i686' 'x86_64')
@@ -9,14 +9,22 @@ depends=('python')
makedepends=('asciidoc')
url="http://www.catb.org/esr/cvs-fast-export/"
license=('GPL2')
-source=(http://www.catb.org/~esr/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('9923a9ecec717ea4da41d4e27a90e5dc47acba9b8c34ad32b49d95f4a832f0eb')
+source=(http://www.catb.org/~esr/$pkgname/$pkgname-$pkgver.tar.gz
+ install-cvsconvert.patch)
+sha256sums=('ebca4b19ba9045bc1b733f729042d7a98dd6675dac3030239f718b13a99949ed'
+ 'fd45067e8329811ca059aafb4df8a3bfced8b5a3023ba566dff25cfa4de84d66')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ patch -p1 -i ../install-cvsconvert.patch
+}
build() {
cd ${pkgname}-${pkgver}
make $pkgname{,.1} cvssync.1
- 2to3 -w cvssync
+ 2to3 -w cvssync cvsconvert
}
package() {
diff --git a/install-cvsconvert.patch b/install-cvsconvert.patch
new file mode 100644
index 000000000000..e18f3f050bd4
--- /dev/null
+++ b/install-cvsconvert.patch
@@ -0,0 +1,20 @@
+diff --git a/Makefile b/Makefile
+index c716c74..06b8499 100644
+--- a/Makefile
++++ b/Makefile
+@@ -113,13 +113,14 @@ check: cvs-fast-export
+ $(MAKE) -C tests -s -f $(srcdir)tests/Makefile
+
+ install: install-bin install-man
+-install-bin: cvs-fast-export cvssync
++install-bin: cvs-fast-export cvssync cvsconvert
+ $(INSTALL) -d "$(target)/bin"
+ $(INSTALL) $^ "$(target)/bin"
+ install-man: man
+ $(INSTALL) -d "$(target)/share/man/man1"
+ $(INSTALL) -m 644 cvs-fast-export.1 "$(target)/share/man/man1"
+ $(INSTALL) -m 644 cvssync.1 "$(target)/share/man/man1"
++ $(INSTALL) -m 644 cvsconvert.1 "$(target)/share/man/man1"
+
+ PROFILE_REPO = ~/software/groff-conversion/groff-mirror/groff
+ gmon.out: cvs-fast-export