Hello community, here is the log from the commit of package zutils for openSUSE:Factory checked in at 2018-08-27 12:59:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zutils (Old) and /work/SRC/openSUSE:Factory/.zutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zutils" Mon Aug 27 12:59:55 2018 rev:6 rq:631612 version:1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/zutils/zutils.changes 2018-08-07 09:43:01.301304129 +0200 +++ /work/SRC/openSUSE:Factory/.zutils.new/zutils.changes 2018-08-27 12:59:57.272855816 +0200 @@ -1,0 +2,5 @@ +Sat Aug 25 12:28:27 UTC 2018 - [email protected] + +- Added zutils-1.7-noconflict.patch (fixes boo#1105973) + +------------------------------------------------------------------- New: ---- zutils-1.7-noconflict.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zutils.spec ++++++ --- /var/tmp/diff_new_pack.KePp6D/_old 2018-08-27 12:59:57.728856314 +0200 +++ /var/tmp/diff_new_pack.KePp6D/_new 2018-08-27 12:59:57.728856314 +0200 @@ -28,11 +28,12 @@ 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 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure @@ -65,19 +67,19 @@ %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} ++++++ zutils-1.7-noconflict.patch ++++++ From: Luigi Baldoni <[email protected]> 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"
