diff --git a/change-docdir-definition.patch b/change-docdir-definition.patch new file mode 100644 index 0000000..f840ef2 --- /dev/null +++ b/change-docdir-definition.patch @@ -0,0 +1,80 @@ +--- + Makefile.in | 13 +++++++------ + configure.ac | 7 +------ + 2 files changed, 8 insertions(+), 12 deletions(-) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,6 +1,7 @@ + PACKAGE := @PACKAGE_NAME@ + VERSION := @PACKAGE_VERSION@ + RELEASE := @PACKAGE_RELEASE@ ++PACKAGE_TARNAME := @PACKAGE_TARNAME@ + PACKAGE_BUGREPORT := @PACKAGE_BUGREPORT@ + + prefix := @prefix@ +@@ -213,7 +214,7 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=qu + ;; \ + *@DOCSUBDIR@*) \ + echo "$$line" | \ +- $(SED) -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ ++ $(SED) -e 's:@DOCSUBDIR''@:$(docdir):g' \ + ;; \ + *) \ + echo "$$line" \ +@@ -272,7 +273,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu + -e 's:@RELEASE''@:$(RELEASE):g' \ + -e 's:@ETCDIR''@:$(etcdir):g' \ + -e 's:@LOCALEDIR''@:$(localedir):g' \ +- -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ ++ -e 's:@DOCSUBDIR''@:$(docdir):g' \ + $< > $@ + @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) + +@@ -331,11 +332,11 @@ endif + $(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE) + $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/ + +- $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ ++ $(INSTALL) -d $(BUILD_ROOT)$(docdir)/ + $(INSTALL) -m 644 doc/README \ +- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ ++ $(BUILD_ROOT)$(docdir)/ + $(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL \ +- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ ++ $(BUILD_ROOT)$(docdir)/ + + $(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1 + $(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/ +@@ -373,7 +374,7 @@ uninstall :: + $(notdir $(MAN1))) \ + $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt \ + $(BUILD_ROOT)$(etcdir)/quilt.quiltrc \ +- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ \ ++ $(BUILD_ROOT)$(docdir)/ \ + $(BUILD_ROOT)$(emacsdir)/quilt.el + + check: $(TESTS:test/%.test=test/.%.ok) +--- a/configure.ac ++++ b/configure.ac +@@ -6,6 +6,7 @@ AC_REVISION ($Revision: 1.84 $) + + PACKAGE_RELEASE=1 + AC_SUBST(PACKAGE_RELEASE) ++AC_SUBST(PACKAGE_TARNAME) + + dnl Setup for backup-files compilation + AC_HEADER_STDC +@@ -370,12 +371,6 @@ if test $USE_NLS = no ; then + fi + AC_SUBST(USE_NLS) + +-dnl Determine where package documentation is supposed to go +-if test -n "$RPM_DOC_DIR" ; then +- docdir="$RPM_DOC_DIR" +-else +- docdir='$(datadir)/doc' +-fi + AC_SUBST(docdir) + + dnl Check for rpmbuild (v4) vs. rpm (v3) diff --git a/docdir.diff b/docdir.diff deleted file mode 100644 index 73afbda..0000000 --- a/docdir.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- - Makefile.in | 10 +++++----- - doc/quilt.1.in | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - ---- quilt-0.50.orig/Makefile.in -+++ quilt-0.50/Makefile.in -@@ -268,7 +268,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu - -e 's:@RELEASE''@:$(RELEASE):g' \ - -e 's:@ETCDIR''@:$(etcdir):g' \ - -e 's:@LOCALEDIR''@:$(localedir):g' \ -- -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ -+ -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE):g' \ - $< > $@ - @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) - -@@ -327,11 +327,11 @@ endif - $(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE) - $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/ - -- $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ -+ $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)/ - $(INSTALL) -m 644 doc/README \ -- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ -+ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/ - $(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL \ -- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ -+ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/ - - $(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1 - $(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/ -@@ -369,7 +369,7 @@ uninstall :: - $(notdir $(MAN1))) \ - $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt \ - $(BUILD_ROOT)$(etcdir)/quilt.quiltrc \ -- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ \ -+ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/ \ - $(BUILD_ROOT)$(emacsdir)/quilt.el - - check: $(TESTS:test/%.test=test/.%.ok) ---- quilt-0.50.orig/doc/quilt.1.in -+++ quilt-0.50/doc/quilt.1.in -@@ -224,7 +224,7 @@ the pdf documentation, and in the help m - - .SH SEE ALSO - --The pdf documentation, which should be under /usr/share/doc/quilt/quilt.pdf. -+The pdf documentation, which should be under /usr/share/doc/packages/quilt/quilt.pdf. - Note that some distributors compress this file. - .BR zxpdf ( 1 ) - can be used to display compressed pdf files. diff --git a/quilt.changes b/quilt.changes index 6e3a1e8..4cbd89c 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 15 15:18:04 CET 2011 - jdelvare@suse.de + +- Delete docdir.diff, replaced with + substitute-docdir-in-man-page.patch and + change-docdir-definition.patch. Upstream solution for the same + problem. + ------------------------------------------------------------------- Wed Dec 7 23:26:56 CET 2011 - jdelvare@suse.de diff --git a/quilt.spec b/quilt.spec index 5dda5eb..785ae3c 100644 --- a/quilt.spec +++ b/quilt.spec @@ -36,12 +36,13 @@ AutoReqProv: off Source: %{name}-%{version}.tar.bz2 Source1: suse-start-quilt-mode.el Patch1: expand.diff -Patch2: docdir.diff +Patch2: substitute-docdir-in-man-page.patch Patch3: patch-wrapper-rpm.diff Patch4: grep-support-spaces.patch Patch5: suse-workaround-pseudo-release.patch Patch6: mail-fix-delivery-address-checking.patch Patch7: fix-inspect.patch +Patch8: change-docdir-definition.patch Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +69,7 @@ Authors: %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build autoconf @@ -80,6 +82,7 @@ autoconf CFLAGS="$RPM_OPT_FLAGS" \ ./configure --prefix=/usr \ --mandir=%{_mandir} \ + --docdir=%{_docdir}/%{name} \ --with-sendmail=/usr/sbin/sendmail \ --with-diffstat=/usr/bin/diffstat \ --with-patch-wrapper \ diff --git a/substitute-docdir-in-man-page.patch b/substitute-docdir-in-man-page.patch new file mode 100644 index 0000000..f6f809d --- /dev/null +++ b/substitute-docdir-in-man-page.patch @@ -0,0 +1,51 @@ +From eccbe8d7db4dfcbcd6a5c3f7c1949c9681f3faf0 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Tue, 06 Dec 2011 16:48:01 +0000 +Subject: Man page: substitute documentation directory name in path to PDF documentation + +--- +diff --git a/Makefile.in b/Makefile.in +index bdf015d..2ddea7e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -211,6 +211,10 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) $(COMPAT) + -e $$'s/^ \\(-[^\t]*\\)\t\\?/.IP " \\1" 8\\\n/' \ + -e $$'s/^ \t\\?//' \ + ;; \ ++ *@DOCSUBDIR@*) \ ++ echo "$$line" | \ ++ $(SED) -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ ++ ;; \ + *) \ + echo "$$line" \ + ;; \ +diff --git a/doc/quilt.1.in b/doc/quilt.1.in +index 1c1dcc2..db91b14 100644 +--- a/doc/quilt.1.in ++++ b/doc/quilt.1.in +@@ -224,7 +224,7 @@ the pdf documentation, and in the help messages of each commands. + + .SH SEE ALSO + +-The pdf documentation, which should be under /usr/share/doc/quilt/quilt.pdf. ++The pdf documentation, which should be under @DOCSUBDIR@/quilt.pdf. + Note that some distributors compress this file. + .BR zxpdf ( 1 ) + can be used to display compressed pdf files. +diff --git a/quilt.changes b/quilt.changes +index 24d2ef7..2054e1f 100644 +--- a/quilt.changes ++++ b/quilt.changes +@@ -1,4 +1,10 @@ + ------------------------------------------------------------------- ++Tue Dec 6 17:44:55 CET 2011 - jdelvare@suse.de ++ ++- Makefile.in, doc/quilt.1.in: Substitute documentation directory ++ name in path to PDF documentation. ++ ++------------------------------------------------------------------- + Mon Dec 5 22:00:00 CET 2011 - jdelvare@suse.de + + - configure*: Bump version to 0.50. +-- +cgit v0.9.0.2