From edf831abe11c2d9220a035d756886e37ca6b286f614d0b10b62c62f8311935cd Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 24 Jan 2023 08:46:03 +0000
Subject: [PATCH] Accepting request 1060258 from
 home:AndreasStieger:branches:Archiving

zutils 1.12

OBS-URL: https://build.opensuse.org/request/show/1060258
OBS-URL: https://build.opensuse.org/package/show/Archiving/zutils?expand=0&rev=22
---
 zutils-1.11.tar.lz          |   3 ---
 zutils-1.11.tar.lz.sig      | Bin 72 -> 0 bytes
 zutils-1.12.tar.lz          |   3 +++
 zutils-1.12.tar.lz.sig      | Bin 0 -> 72 bytes
 zutils-1.7-noconflict.patch |   8 +++----
 zutils.changes              |  46 ++++++++++++++++++++++++++++++++++++
 zutils.spec                 |  32 +++++--------------------
 7 files changed, 59 insertions(+), 33 deletions(-)
 delete mode 100644 zutils-1.11.tar.lz
 delete mode 100644 zutils-1.11.tar.lz.sig
 create mode 100644 zutils-1.12.tar.lz
 create mode 100644 zutils-1.12.tar.lz.sig

diff --git a/zutils-1.11.tar.lz b/zutils-1.11.tar.lz
deleted file mode 100644
index 1080848..0000000
--- a/zutils-1.11.tar.lz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50e8e24b0a280ccab037004b9000b070d17a6e0cd86972927d1b2a5505421389
-size 57098
diff --git a/zutils-1.11.tar.lz.sig b/zutils-1.11.tar.lz.sig
deleted file mode 100644
index e8483dda112e5b79e6ca408b3f3a2cc01f38b6593ca317eccc6839e8a76a2e04..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0%7=lH2?|;5Rd7V0~0NGLfCKspr+1_P%fOdj%#JtR2<^#
ea#&E-KmeemWI<#o214;P>vu&_%WNpIuma9=02}ZC

diff --git a/zutils-1.12.tar.lz b/zutils-1.12.tar.lz
new file mode 100644
index 0000000..1c10edc
--- /dev/null
+++ b/zutils-1.12.tar.lz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78ae5478b01c71c5194427c5c341765da831e42e80410ec980f403aa37ac88ee
+size 62965
diff --git a/zutils-1.12.tar.lz.sig b/zutils-1.12.tar.lz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..685e53d15cf48c89f9217a1d21777424c9cf8856503dda509f88a5b7db038549
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0%N+~kN^q^5Rd7V0~0NGLKYqXn+7=5h)c|SK;~k%tzx6r
e>E8}oEC8U9WK(jWWR@Qx|FE?k`7_Y#<)9^HN*xaX

literal 0
HcmV?d00001

diff --git a/zutils-1.7-noconflict.patch b/zutils-1.7-noconflict.patch
index d364157..6f060f6 100644
--- a/zutils-1.7-noconflict.patch
+++ b/zutils-1.7-noconflict.patch
@@ -7,10 +7,10 @@ Use zutils- prefix with executables also present in the gzip
 package.
 
 ---
-Index: zutils-1.10/Makefile.in
+Index: zutils-1.12/Makefile.in
 ===================================================================
---- zutils-1.10.orig/Makefile.in
-+++ zutils-1.10/Makefile.in
+--- zutils-1.12.orig/Makefile.in
++++ zutils-1.12/Makefile.in
 @@ -126,12 +126,12 @@ install-strip-compress : install-bin-str
  
  install-bin : all
@@ -29,7 +29,7 @@ Index: zutils-1.10/Makefile.in
 +	$(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 \
+ 	if [ ! -e "$(DESTDIR)$(sysconfdir)/$(pkgname).conf" ] ; then \
 @@ -161,18 +161,18 @@ install-man :
  	-rm -f "$(DESTDIR)$(mandir)/man1/zgrep.1"*
  	-rm -f "$(DESTDIR)$(mandir)/man1/ztest.1"*
diff --git a/zutils.changes b/zutils.changes
index a126c40..d61a85e 100644
--- a/zutils.changes
+++ b/zutils.changes
@@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Sun Jan 22 11:39:46 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 1.12:
+  * 'zutilsrc' has been renamed to 'zutils.conf', and is loog for in 
+    $XDG_CONFIG_HOME/zutils.conf instead of $HOME/.zutilsrc.
+    (XDG_CONFIG_HOME defaults to $HOME/.config).
+  * In zcat, zcmp, zdiff, and zgrep, the option '-O, --force-format'
+    now can force also "uncompressed" format.
+  * zcmp now accepts the option '-H, --hexadecimal' to print byte
+    values in hexadecimal instead of octal.
+  * zcmp: option '-s' changed to '--script'
+  * zcmp: '-q' has been assigned to options '--quiet' and '--silent'
+  * zcmp: '-q' now only suppresses diagnostic messages written to 
+    stderr
+  * zcmp: '-s' now only suppresses messages about file differences
+    written to stdout or stderr.
+  * zcmp: Option '-l, --list' is now different from option '-v,
+    --verbose', whichnow undoes the effect of '--quiet'.
+  * zcmp now prints byte and line in EOF message like GNU cmp:
+    "zcmp: EOF on FILE after byte B, in line L".
+  * zgrep now also accepts the following options:
+    '-G, --basic-regexp',
+    '--label=<label>',
+    '--line-buffered',
+    '-P, --perl-regexp',
+    '--silent',
+    '-T, --initial-tab',
+    '-U, --binary', and
+    '-Z, --null'.
+  * ztest now exits with status 2 if an uncompressed file has a
+    compressed file name extension, or if a compressed file has a 
+    wrong compressed extension.
+  * zudate now accepts option '-d, --destdir' to write recompressed
+    files to another directory.
+  * zupdate now accepts option '-e, --expand-extensions', which
+    makes it expand combined file name extensions; tgz --> tar.lz.
+  * zupdate now also accepts option '-i, --ignore-errors', which
+    makes it ignore non-fatal errors
+  * All utilities now support compress'd (.Z) files through gzip.
+  * At verbosity level 1 (2 for zdiff and zgrep) or higher, '-V,
+    --version' now prints the versions of the compressors used
+    (limited by option '-M, --format').
+  * Diagnostics caused by invalid arguments to command line options
+    now show the argument and the name of the option.
+
 -------------------------------------------------------------------
 Thu Apr 14 12:49:57 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
 
diff --git a/zutils.spec b/zutils.spec
index 0b38f4a..43badd2 100644
--- a/zutils.spec
+++ b/zutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package zutils
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           zutils
-Version:        1.11
+Version:        1.12
 Release:        0
 Summary:        Collection of utilities for dealing with compressed files
 License:        GPL-2.0-or-later
@@ -30,8 +30,6 @@ Source2:        %{name}.keyring
 Patch1:         zutils-1.7-noconflict.patch
 BuildRequires:  gcc-c++
 BuildRequires:  lzip
-Requires(post): %{install_info_prereq}
-Requires(preun):%{install_info_prereq}
 
 %description
 Zutils is a collection of utilities able to deal with any combination
@@ -56,30 +54,12 @@ in those utilities supporting it.
 %check
 %make_build check
 
-%post
-%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
-
-%preun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
-
 %files
 %doc ChangeLog README
 %license COPYING
-%config %{_sysconfdir}/zutilsrc
-%{_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/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}
+%{_sysconfdir}/zutils.conf
+%{_bindir}/*
+%{_infodir}/*.info%{?ext_info}
+%{_mandir}/man1/*.1%{?ext_man}
 
 %changelog