commit 7a4e706a370a0a958c822704bdbc82d4916cd46f
Author: Caleb Maclennan <[email protected]>
Date: Mon May 27 17:20:11 2013 +0300
Fix version number and man page building.
The 3 was a build number not a dot release. This is fixed in upstream
tagging.
The manpage in the original package is compiled by ronn, which PLD doesn't
have. The upstream project maintains a patch with a precompiled version of the
manpage for some versions of Debian that also lack ronn. An upstream branch for
PLD has been created with these fixes and other tweaks.
vcsh-makefile.patch | 26 +++++++++++++++++++++++---
vcsh.spec | 18 ++++++++++++------
2 files changed, 35 insertions(+), 9 deletions(-)
---
diff --git a/vcsh.spec b/vcsh.spec
index eebcecd..c3ab373 100644
--- a/vcsh.spec
+++ b/vcsh.spec
@@ -1,11 +1,11 @@
Summary: home directory config manager based on git
Name: vcsh
-Version: 1.2.3
-Release: 0.2
+Version: 1.2
+Release: 0.3
License: GPL v2
Group: Applications/Console
-Source0: https://github.com/alerque/vcsh/archive/v%{version}.tar.gz
-# Source0-md5: 7305aaef5522d504ed36226034089c10
+Source0: https://github.com/alerque/vcsh/archive/v%{version}-pld.tar.gz
+# Source0-md5: 0f3f15c5a962dc932672aa7270d02daf
Patch0: %{name}-makefile.patch
URL: https://github.com/RichiH/vcsh
Requires: mr
@@ -27,8 +27,14 @@ Requires: zsh
Tab completion routines for %{name} in zsh.
%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p0
+%setup -q -n %{name}-%{version}-pld
+%patch0 -p1
+
+# Manpage in original package is compiled by ronn which PLD doesn't have. The
+# upstream project maintains a patch with a precompiled version for some
+# versions of debian that also lack ronn. An upstream branch for PLD is also
+# being maintained with these fixes and other tweaks.
+patch -p1 < pld/patches/precompiled_manpage.patch
%build
%{__make}
diff --git a/vcsh-makefile.patch b/vcsh-makefile.patch
index fa32b7a..726acde 100644
--- a/vcsh-makefile.patch
+++ b/vcsh-makefile.patch
@@ -1,6 +1,8 @@
---- Makefile~ 2013-05-06 00:56:11.000000000 +0300
-+++ Makefile 2013-05-16 13:03:34.863192036 +0300
-@@ -14,8 +14,8 @@
+diff --git a/Makefile b/Makefile
+index cb112c7..cf51462 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,8 +14,8 @@ install: all
install -d $(DESTDIR)$(PREFIX)/share/doc/$(self)
install -m 0644 README.md $(DESTDIR)$(PREFIX)/share/doc/$(self)
install -m 0644 doc/hooks $(DESTDIR)$(PREFIX)/share/doc/$(self)
@@ -11,3 +13,21 @@
manpages: $(manpages)
+@@ -29,7 +29,7 @@ uninstall:
+ rm -rf $(DESTDIR)$(PREFIX)/bin/$(self)
+ rm -rf $(DESTDIR)$(PREFIX)/share/man/man1/$(self).1
+ rm -rf $(DESTDIR)$(PREFIX)/share/doc/$(self)
+- rm -rf $(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/_$(self)
++ rm -rf $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_$(self)
+
+ # Potentially harmful, used a non-standard option on purpose.
+ # If PREFIX=/usr/local and that's empty...
+@@ -37,7 +37,7 @@ purge: uninstall
+ rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/bin/
+ rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/man/man1/
+ rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/doc/
+- rmdir -p --ignore-fail-on-non-empty
$(DESTDIR)$(PREFIX)/share/zsh/vendor-completions/
++ rmdir -p --ignore-fail-on-non-empty
$(DESTDIR)$(PREFIX)/share/zsh/site-functions/
+
+ test:
+ if which git > /dev/null ; then :; else echo "'git' not found,
exiting..."; exit 1; fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vcsh.git/commitdiff/7a4e706a370a0a958c822704bdbc82d4916cd46f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
