summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--0001_fix-makefile.patch24
-rw-r--r--PKGBUILD35
3 files changed, 55 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dfa1286b6f63..8eab18cd68d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,19 @@
pkgbase = cvs-fast-export
pkgdesc = Export RCS or CVS history as a fastimport stream.
- pkgver = 0.7
+ pkgver = 0.8
pkgrel = 1
url = http://www.catb.org/esr/cvs-fast-export/
arch = i686
arch = x86_64
license = GPL2
makedepends = asciidoc
- source = http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-0.7.tar.gz
- sha256sums = 4faaf7f6b6323f6dca3026fcf9eb94ebd24f80c892b09e73919589c4c561ac80
+ depends = python
+ source = http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-0.8.tar.gz
+ source = cvssync.txt::https://gitorious.org/cvs-fast-export/cvs-fast-export/raw/759a97ffa0b13af12dbf9cacfce96f049e1f0f0f:cvssync.asc
+ source = 0001_fix-makefile.patch
+ sha256sums = 856c09c9fb5e03fe0c59b0a6cc58c11debf6d58745f7762472be16360b4effe1
+ sha256sums = SKIP
+ sha256sums = 5c75fde5feedf1d1cf73110ec86f61ff85b701163f64f19416c4b7d328a0fb82
pkgname = cvs-fast-export
diff --git a/0001_fix-makefile.patch b/0001_fix-makefile.patch
new file mode 100644
index 000000000000..0396acecc040
--- /dev/null
+++ b/0001_fix-makefile.patch
@@ -0,0 +1,24 @@
+--- Makefile.orig 2013-12-16 08:36:26.000000000 -0800
++++ Makefile 2013-12-18 09:25:53.322278872 -0800
+@@ -63,10 +63,11 @@
+ check: cvs-fast-export
+ @(cd tests >/dev/null; make --quiet)
+
+-install: cvs-fast-export.1 all
++install: cvs-fast-export cvs-fast-export.1 cvssync.1
+ $(INSTALL) -d "$(target)/bin"
+ $(INSTALL) -d "$(target)/share/man/man1"
+ $(INSTALL) cvs-fast-export "$(target)/bin"
++ $(INSTALL) cvssync "$(target)/bin"
+ $(INSTALL) -m 644 cvs-fast-export.1 "$(target)/share/man/man1"
+ $(INSTALL) -m 644 cvssync.1 "$(target)/share/man/man1"
+
+@@ -85,7 +86,7 @@
+ cppcheck --template gcc --enable=all $(SUPPRESSIONS) --suppress=unusedStructMember *.[ch]
+
+ SOURCES = Makefile *.[ch] *.[yl] cvssync
+-DOCS = README COPYING NEWS AUTHORS TODO control cvs-fast-export.asc
++DOCS = README COPYING NEWS AUTHORS TODO control cvs-fast-export.asc cvssync.asc
+ ALL = $(SOURCES) $(DOCS)
+ cvs-fast-export-$(VERSION).tar.gz: $(ALL)
+ tar --transform='s:^:cvs-fast-export-$(VERSION)/:' --show-transformed-names -cvzf cvs-fast-export-$(VERSION).tar.gz $(ALL)
diff --git a/PKGBUILD b/PKGBUILD
index 003e0ffe4cdb..36f438934b10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,44 @@
# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
pkgname=cvs-fast-export
-pkgver=0.7
+pkgver=0.8
pkgrel=1
pkgdesc="Export RCS or CVS history as a fastimport stream."
arch=('i686' 'x86_64')
+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=('4faaf7f6b6323f6dca3026fcf9eb94ebd24f80c892b09e73919589c4c561ac80')
+source=(http://www.catb.org/~esr/$pkgname/$pkgname-$pkgver.tar.gz
+ 'cvssync.txt::https://gitorious.org/cvs-fast-export/cvs-fast-export/raw/759a97ffa0b13af12dbf9cacfce96f049e1f0f0f:cvssync.asc'
+ 0001_fix-makefile.patch)
+sha256sums=('856c09c9fb5e03fe0c59b0a6cc58c11debf6d58745f7762472be16360b4effe1'
+ 'SKIP'
+ '5c75fde5feedf1d1cf73110ec86f61ff85b701163f64f19416c4b7d328a0fb82')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Grumble about "make install" targets that don't work...
+ patch Makefile ../0001_fix-makefile.patch
+
+ # Naming this *.asc in the source array makes makepkg
+ # think it's a GPG signature...
+ ln -s ../cvssync.txt cvssync.asc
+
+ 2to3 -w cvssync
+}
build() {
cd ${pkgname}-${pkgver}
- make prefix=/usr $pkgname{,.1,.html}
- asciidoc README
+ make $pkgname{,.1} cvssync.1
}
package() {
cd ${pkgname}-${pkgver}
- # Grumble about "make install" targets that don't work...
- install -dm 755 ${pkgdir}/usr/bin
- install -dm 755 ${pkgdir}/usr/share/doc/cvs-fast-export
- install -dm 755 ${pkgdir}/usr/share/man/man1
- install -m 755 ${pkgname} ${pkgdir}/usr/bin
- install -m 644 *.html AUTHORS NEWS ${pkgdir}/usr/share/doc/${pkgname}
- install -m 644 ${pkgname}.1 ${pkgdir}/usr/share/man/man1
+ make prefix=/usr DESTDIR="${pkgdir}" install
}
# vim:set ts=2 sw=2 et: