From c8a370972b069dd83f56582de7fe5b1065e6a2844a96fa37cbd181610ec7dc20 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sun, 15 Jul 2018 08:09:33 +0000
Subject: [PATCH] Accepting request 622784 from
 home:1Antoine1:branches:Archiving

- Update to version 1.7:
  * zgrep.cc (main): Pass '--color' option to grep.
  * check.sh: Added new tests for zgrep.

OBS-URL: https://build.opensuse.org/request/show/622784
OBS-URL: https://build.opensuse.org/package/show/Archiving/zutils?expand=0&rev=8
---
 zutils-1.6.tar.lz     |   3 ---
 zutils-1.6.tar.lz.sig | Bin 72 -> 0 bytes
 zutils-1.7.tar.lz     |   3 +++
 zutils-1.7.tar.lz.sig | Bin 0 -> 72 bytes
 zutils.changes        |   7 +++++++
 zutils.spec           |  20 ++++++++++----------
 6 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 zutils-1.6.tar.lz
 delete mode 100644 zutils-1.6.tar.lz.sig
 create mode 100644 zutils-1.7.tar.lz
 create mode 100644 zutils-1.7.tar.lz.sig

diff --git a/zutils-1.6.tar.lz b/zutils-1.6.tar.lz
deleted file mode 100644
index fda75f2..0000000
--- a/zutils-1.6.tar.lz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb100df09e3ff1af2c2424cf2799946d742f8275ea281118f87ff14ed1b8d73a
-size 43549
diff --git a/zutils-1.6.tar.lz.sig b/zutils-1.6.tar.lz.sig
deleted file mode 100644
index 4067b579cd152329e1d902a26f348bb7ad430859d37f400e50effe8109a561bc..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0$Aw9a{vkn5Rd7V0~0NGLf%XOprRo`IKKOP)<m`Ow)=D@
e;WgsKi~yjYclo>p=45q+8fRKi-AAjeKt>R~J027O

diff --git a/zutils-1.7.tar.lz b/zutils-1.7.tar.lz
new file mode 100644
index 0000000..a722c59
--- /dev/null
+++ b/zutils-1.7.tar.lz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4ffadab70458fab8f1fe51b003f953c590d95e060658105622144bdd93ba650
+size 43793
diff --git a/zutils-1.7.tar.lz.sig b/zutils-1.7.tar.lz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..32133a17c0557ea59d719bb7ff56614b81ea53ce0782a7f3d0d37ecea8f0357c
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0$Pf|#{dcm5Rd7V0~0NGLIHjNo-GT5HsxMp!Uib}@-ZS9
etia;R_5hwar0i7$8fxdp@pGXj8p_uK%=cz7%p0fx

literal 0
HcmV?d00001

diff --git a/zutils.changes b/zutils.changes
index c9a1178..ba94bae 100644
--- a/zutils.changes
+++ b/zutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jul 14 08:27:03 UTC 2018 - antoine.belvire@opensuse.org
+
+- Update to version 1.7:
+  * zgrep.cc (main): Pass '--color' option to grep.
+  * check.sh: Added new tests for zgrep.
+
 -------------------------------------------------------------------
 Mon Feb 19 12:07:34 UTC 2018 - aloisio@gmx.com
 
diff --git a/zutils.spec b/zutils.spec
index 543f82e..fe870d2 100644
--- a/zutils.spec
+++ b/zutils.spec
@@ -17,10 +17,10 @@
 
 
 Name:           zutils
-Version:        1.6
+Version:        1.7
 Release:        0
 Summary:        Collection of utilities for dealing with compressed files
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Archiving/Compression
 URL:            https://www.nongnu.org/zutils/zutils.html
 Source0:        https://download.savannah.gnu.org/releases/zutils/zutils-%{version}.tar.lz
@@ -50,7 +50,7 @@ in those utilities supporting it.
 make CXXFLAGS="%{optflags}" %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
@@ -70,12 +70,12 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %{_bindir}/zgrep
 %{_bindir}/ztest
 %{_bindir}/zupdate
-%{_infodir}/zutils.info.gz
-%{_mandir}/man1/zcat.1.gz
-%{_mandir}/man1/zcmp.1.gz
-%{_mandir}/man1/zdiff.1.gz
-%{_mandir}/man1/zgrep.1.gz
-%{_mandir}/man1/ztest.1.gz
-%{_mandir}/man1/zupdate.1.gz
+%{_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/ztest.1%{?ext_man}
+%{_mandir}/man1/zupdate.1%{?ext_man}
 
 %changelog