From ea8d4c6c35cfa35abb18b4b5edf65a1b6ceb8d574db79c33c33daafd234234d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 26 Aug 2018 17:48:57 +0000 Subject: [PATCH] Accepting request 631517 from home:alois:branches:Archiving - Added zutils-1.7-noconflict.patch (fixes boo#1105973) OBS-URL: https://build.opensuse.org/request/show/631517 OBS-URL: https://build.opensuse.org/package/show/Archiving/zutils?expand=0&rev=12 --- zutils-1.7-noconflict.patch | 59 +++++++++++++++++++++++++++++++++++++ zutils.changes | 5 ++++ zutils.spec | 24 ++++++++------- 3 files changed, 77 insertions(+), 11 deletions(-) create mode 100644 zutils-1.7-noconflict.patch diff --git a/zutils-1.7-noconflict.patch b/zutils-1.7-noconflict.patch new file mode 100644 index 0000000..c211d3a --- /dev/null +++ b/zutils-1.7-noconflict.patch @@ -0,0 +1,59 @@ +From: Luigi Baldoni +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.7/Makefile.in +=================================================================== +--- zutils-1.7.orig/Makefile.in ++++ zutils-1.7/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" + diff --git a/zutils.changes b/zutils.changes index 9ebfbd1..1577c66 100644 --- a/zutils.changes +++ b/zutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 25 12:28:27 UTC 2018 - aloisio@gmx.com + +- Added zutils-1.7-noconflict.patch (fixes boo#1105973) + ------------------------------------------------------------------- Mon Aug 6 10:29:51 UTC 2018 - aloisio@gmx.com diff --git a/zutils.spec b/zutils.spec index 87c7246..e19f1f4 100644 --- a/zutils.spec +++ b/zutils.spec @@ -28,11 +28,12 @@ Source1: https://download.savannah.gnu.org/releases/zutils/zutils-%{versi Source2: %{name}.keyring # PATCH-FIX-UPSTREAM zutils-1.7-zcat-buffer-overrun.patch Patch0: zutils-1.7-zcat-buffer-overrun.patch +# PATCH-FIX-OPENSUSE zutils-1.7-noconflict.patch +Patch1: zutils-1.7-noconflict.patch BuildRequires: gcc-c++ BuildRequires: lzip Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} -Conflicts: gzip %description Zutils is a collection of utilities able to deal with any combination @@ -47,6 +48,7 @@ in those utilities supporting it. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure @@ -65,19 +67,19 @@ make CXXFLAGS="%{optflags}" %{?_smp_mflags} %doc ChangeLog README %license COPYING %config %{_sysconfdir}/zutilsrc -%{_bindir}/zcat -%{_bindir}/zcmp -%{_bindir}/zdiff -%{_bindir}/zegrep -%{_bindir}/zfgrep -%{_bindir}/zgrep +%{_bindir}/zutils-zcat +%{_bindir}/zutils-zcmp +%{_bindir}/zutils-zdiff +%{_bindir}/zutils-zegrep +%{_bindir}/zutils-zfgrep +%{_bindir}/zutils-zgrep %{_bindir}/ztest %{_bindir}/zupdate %{_infodir}/zutils.info%{?ext_info} -%{_mandir}/man1/zcat.1%{?ext_man} -%{_mandir}/man1/zcmp.1%{?ext_man} -%{_mandir}/man1/zdiff.1%{?ext_man} -%{_mandir}/man1/zgrep.1%{?ext_man} +%{_mandir}/man1/zutils-zcat.1%{?ext_man} +%{_mandir}/man1/zutils-zcmp.1%{?ext_man} +%{_mandir}/man1/zutils-zdiff.1%{?ext_man} +%{_mandir}/man1/zutils-zgrep.1%{?ext_man} %{_mandir}/man1/ztest.1%{?ext_man} %{_mandir}/man1/zupdate.1%{?ext_man}