switch to libzip5 on EL-7

re-add obsoletes and provides filtering

1 files changed, 29 insertions, 15 deletions

diff --git a/libzip.spec b/libzip.spec
index 2adee87..caad60f 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -9,15 +9,19 @@
 # Please preserve changelog entries
 #
 
+## FOR EL-7
+##     build as libzip5
 ## FOR EL-8
-## 1st build --with    move_to_opt for SCL
-## 2nd build --without move_to_opt for module
+##     1st build --with    move_to_opt for SCL
+##     2nd build --without move_to_opt for module
+## FOR EL-9
+##     build as remi-libzip
 
 %global libname libzip
 %global soname  5
 %bcond_without  tests
 
-%if 0%{?vendeur:1} && 0%{?rhel} >= 7
+%if 0%{?vendeur:1} && 0%{?rhel} >= 8
 %bcond_without move_to_opt
 %else
 %bcond_with    move_to_opt
@@ -28,11 +32,15 @@
 %global __arch_install_post /bin/true
 Name:    %{?vendeur:%{vendeur}-}%{libname}
 %else
+%if 0%{?rhel} == 7
+Name:    %{libname}%{soname}
+%else
 Name:    %{libname}
 %endif
+%endif
 
 Version: 1.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: C library for reading, creating, and modifying zip archives
 
 License: BSD
@@ -67,10 +75,11 @@ BuildRequires:  perl(UNIVERSAL)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
 
-%if 0
 %if 0%{?rhel} == 7
-Obsoletes: libzip5      < %{version}
+# RHEL have commands in main package
+Provides:  %{libname} =  %{version}-%{release}
 %endif
+%if %{with move_to_opt}
 %if 0%{?rhel} == 8
 Obsoletes: php56-libzip < %{version}
 Obsoletes: php70-libzip < %{version}
@@ -107,11 +116,12 @@ The API is documented by man pages.
 Summary:  Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
-%if 0
 %if 0%{?rhel} == 7
-Obsoletes: libzip5-devel      < %{version}
+Conflicts: %{libname}-last-devel     <  %{version}
+Conflicts: %{libname}-devel          <  %{version}
+Provides:  %{libname}-devel          =  %{version}-%{release}
 %endif
-%if 0%{?rhel} == 8
+%if %{with move_to_opt} && 0%{?rhel} == 8
 Obsoletes: php56-libzip-devel < %{version}
 Obsoletes: php70-libzip-devel < %{version}
 Obsoletes: php71-libzip-devel < %{version}
@@ -122,7 +132,6 @@ Obsoletes: php80-libzip-devel < %{version}
 Obsoletes: php81-libzip-devel < %{version}
 Obsoletes: php82-libzip-devel < %{version}
 %endif
-%endif
 
 %description devel
 The %{name}-devel package contains libraries and header files for
@@ -133,11 +142,13 @@ developing applications that use %{name}.
 Summary:  Command line tools from %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
-%if 0
 %if 0%{?rhel} == 7
-Obsoletes: libzip5-tools      < %{version}
+Conflicts: %{libname}-last-tools     <  %{version}
+Conflicts: %{libname}-tools          <  %{version}
+# RHEL have commands in main package
+Conflicts: %{libname}                <  1.1
 %endif
-%if 0%{?rhel} == 8
+%if %{with move_to_opt} && 0%{?rhel} == 8
 Obsoletes: php56-libzip-tools < %{version}
 Obsoletes: php70-libzip-tools < %{version}
 Obsoletes: php71-libzip-tools < %{version}
@@ -148,7 +159,6 @@ Obsoletes: php80-libzip-tools < %{version}
 Obsoletes: php81-libzip-tools < %{version}
 Obsoletes: php82-libzip-tools < %{version}
 %endif
-%endif
 
 %description tools
 The %{name}-tools package provides command line tools split off %{name}:
@@ -274,11 +284,15 @@ make check
 
 
 %changelog
+* Wed Jun 29 2022 Remi Collet <remi@remirepo.net> - 1.9.2-3
+- switch to libzip5 on EL-7
+- re-add obsoletes and provides filtering
+
 * Tue Jun 28 2022 Remi Collet <remi@remirepo.net> - 1.9.2-2
 - don't obsolete libzip5 and php*-libzip for now
 
 * Tue Jun 28 2022 Remi Collet <remi@remirepo.net> - 1.9.2-1
-- update to 1.9.1
+- update to 1.9.2
 - also build as remi-libzip for EL-7 and EL-8
 
 * Tue Jun 28 2022 Remi Collet <remi@remirepo.net> - 1.9.1-1