65a3235ab8
* zdiff.cc (set_fifonames): Encode pid in little endian order. * zupdate.cc (zupdate_file): Fix a portability issue with Solaris 10. * zutils.texi: Document that 'zgrep -L' fails with GNU grep 3.2 to 3.4. * check.sh: Test empty input files with all tools except zupdate. OBS-URL: https://build.opensuse.org/package/show/Archiving/zutils?expand=0&rev=18
60 lines
2.9 KiB
Diff
60 lines
2.9 KiB
Diff
From: Luigi Baldoni <aloisio@gmx.com>
|
|
Date: 2018-08-25 14:19:22 +0200
|
|
Subject: Avoid conflict with gzip package
|
|
References: boo#1105973
|
|
|
|
Use zutils- prefix with executables also present in the gzip
|
|
package.
|
|
|
|
---
|
|
Index: zutils-1.10/Makefile.in
|
|
===================================================================
|
|
--- zutils-1.10.orig/Makefile.in
|
|
+++ zutils-1.10/Makefile.in
|
|
@@ -126,12 +126,12 @@ install-strip-compress : install-bin-str
|
|
|
|
install-bin : all
|
|
if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi
|
|
- $(INSTALL_PROGRAM) ./zcat "$(DESTDIR)$(bindir)/zcat"
|
|
- $(INSTALL_PROGRAM) ./zcmp "$(DESTDIR)$(bindir)/zcmp"
|
|
- $(INSTALL_PROGRAM) ./zdiff "$(DESTDIR)$(bindir)/zdiff"
|
|
- $(INSTALL_SCRIPT) ./zegrep "$(DESTDIR)$(bindir)/zegrep"
|
|
- $(INSTALL_SCRIPT) ./zfgrep "$(DESTDIR)$(bindir)/zfgrep"
|
|
- $(INSTALL_PROGRAM) ./zgrep "$(DESTDIR)$(bindir)/zgrep"
|
|
+ $(INSTALL_PROGRAM) ./zcat "$(DESTDIR)$(bindir)/zutils-zcat"
|
|
+ $(INSTALL_PROGRAM) ./zcmp "$(DESTDIR)$(bindir)/zutils-zcmp"
|
|
+ $(INSTALL_PROGRAM) ./zdiff "$(DESTDIR)$(bindir)/zutils-zdiff"
|
|
+ $(INSTALL_SCRIPT) ./zegrep "$(DESTDIR)$(bindir)/zutils-zegrep"
|
|
+ $(INSTALL_SCRIPT) ./zfgrep "$(DESTDIR)$(bindir)/zutils-zfgrep"
|
|
+ $(INSTALL_PROGRAM) ./zgrep "$(DESTDIR)$(bindir)/zutils-zgrep"
|
|
$(INSTALL_PROGRAM) ./ztest "$(DESTDIR)$(bindir)/ztest"
|
|
$(INSTALL_PROGRAM) ./zupdate "$(DESTDIR)$(bindir)/zupdate"
|
|
if [ ! -e "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ] ; then \
|
|
@@ -161,18 +161,18 @@ install-man :
|
|
-rm -f "$(DESTDIR)$(mandir)/man1/zgrep.1"*
|
|
-rm -f "$(DESTDIR)$(mandir)/man1/ztest.1"*
|
|
-rm -f "$(DESTDIR)$(mandir)/man1/zupdate.1"*
|
|
- $(INSTALL_DATA) $(VPATH)/doc/zcat.1 "$(DESTDIR)$(mandir)/man1/zcat.1"
|
|
- $(INSTALL_DATA) $(VPATH)/doc/zcmp.1 "$(DESTDIR)$(mandir)/man1/zcmp.1"
|
|
- $(INSTALL_DATA) $(VPATH)/doc/zdiff.1 "$(DESTDIR)$(mandir)/man1/zdiff.1"
|
|
- $(INSTALL_DATA) $(VPATH)/doc/zgrep.1 "$(DESTDIR)$(mandir)/man1/zgrep.1"
|
|
+ $(INSTALL_DATA) $(VPATH)/doc/zcat.1 "$(DESTDIR)$(mandir)/man1/zutils-zcat.1"
|
|
+ $(INSTALL_DATA) $(VPATH)/doc/zcmp.1 "$(DESTDIR)$(mandir)/man1/zutils-zcmp.1"
|
|
+ $(INSTALL_DATA) $(VPATH)/doc/zdiff.1 "$(DESTDIR)$(mandir)/man1/zutils-zdiff.1"
|
|
+ $(INSTALL_DATA) $(VPATH)/doc/zgrep.1 "$(DESTDIR)$(mandir)/man1/zutils-zgrep.1"
|
|
$(INSTALL_DATA) $(VPATH)/doc/ztest.1 "$(DESTDIR)$(mandir)/man1/ztest.1"
|
|
$(INSTALL_DATA) $(VPATH)/doc/zupdate.1 "$(DESTDIR)$(mandir)/man1/zupdate.1"
|
|
|
|
install-man-compress : install-man
|
|
- lzip -v -9 "$(DESTDIR)$(mandir)/man1/zcat.1"
|
|
- lzip -v -9 "$(DESTDIR)$(mandir)/man1/zcmp.1"
|
|
- lzip -v -9 "$(DESTDIR)$(mandir)/man1/zdiff.1"
|
|
- lzip -v -9 "$(DESTDIR)$(mandir)/man1/zgrep.1"
|
|
+ lzip -v -9 "$(DESTDIR)$(mandir)/man1/zutils-zcat.1"
|
|
+ lzip -v -9 "$(DESTDIR)$(mandir)/man1/zutils-zcmp.1"
|
|
+ lzip -v -9 "$(DESTDIR)$(mandir)/man1/zutils-zdiff.1"
|
|
+ lzip -v -9 "$(DESTDIR)$(mandir)/man1/zutils-zgrep.1"
|
|
lzip -v -9 "$(DESTDIR)$(mandir)/man1/ztest.1"
|
|
lzip -v -9 "$(DESTDIR)$(mandir)/man1/zupdate.1"
|
|
|