cleanup and only rename for fedora < 34

1 files changed, 22 insertions, 7 deletions

diff --git a/libcouchbase.spec b/libcouchbase.spec
index 0a1c68d..b58c1c3 100644
--- a/libcouchbase.spec
+++ b/libcouchbase.spec
@@ -10,7 +10,7 @@
 %global libname libcouchbase
 %global soname  6
 
-%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
+%if 0%{?fedora} >= 34 || 0%{?rhel} >= 7
 %bcond_with    rename
 %else
 %bcond_without rename
@@ -32,7 +32,7 @@ Name:          %{libname}%{soname}
 Name:          %{libname}
 %endif
 Version:       3.0.6
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Couchbase client library
 Group:         System Environment/Libraries
 License:       ASL 2.0
@@ -69,6 +69,9 @@ Suggests:   %{name}-tools%{_isa}    = %{version}-%{release}
 %else
 Requires:   %{name}-libevent%{_isa} = %{version}-%{release}
 %endif
+%if %{without rename}
+Obsoletes:     %{libname}%{soname}  < %{version}-%{release}
+%endif
 
 # Filter shared private badly named
 %{?filter_provides_in: %filter_provides_in %{name}/%{name}.*\.so$}
@@ -97,7 +100,7 @@ Requires:      %{name}%{?_isa} = %{version}-%{release}
 Conflicts:     %{libname}-devel < %{version}
 Provides:      %{libname}-devel = %{version}-%{release}
 %else
-Obsoletes:     %{libname}%{soname}-devel < %{version}
+Obsoletes:     %{libname}%{soname}-devel < %{version}-%{release}
 %endif
 
 %description devel
@@ -109,18 +112,24 @@ developing applications that use %{name}.
 Summary:       Couchbase client library - libevent IO back-end
 Group:         System Environment/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
+%if %{without rename}
+Obsoletes:     %{libname}%{soname}-libevent < %{version}-%{release}
+%endif
 
 %description libevent
-This package provides libevent back-end for libcouchbase.
+This package provides libevent back-end for %{name}.
 
 
 %package       libev
 Summary:       Couchbase client library - libev IO back-end
 Group:         System Environment/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
+%if %{without rename}
+Obsoletes:     %{libname}%{soname}-libev  < %{version}-%{release}
+%endif
 
 %description libev
-This package provides libev back-end for libcouchbase.
+This package provides libev back-end for %{name}.
 
 
 %if %{with uv}
@@ -128,9 +137,12 @@ This package provides libev back-end for libcouchbase.
 Summary:       Couchbase client library - libuv IO back-end
 Group:         System Environment/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
+%if %{without rename}
+Obsoletes:     %{libname}%{soname}-libuv  < %{version}-%{release}
+%endif
 
 %description libuv
-This package provides libuv back-end for libcouchbase.
+This package provides libuv back-end for %{name}.
 %endif
 
 
@@ -143,7 +155,7 @@ Requires:      %{name}-libevent%{?_isa} = %{version}-%{release}
 Conflicts:     %{libname}-tools < %{version}
 Provides:      %{libname}-tools = %{version}-%{release}
 %else
-Obsoletes:     %{libname}%{soname}-tools < %{version}
+Obsoletes:     %{libname}%{soname}-tools < %{version}-%{release}
 %endif
 
 %description tools
@@ -238,6 +250,9 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags}
 
 
 %changelog
+* Mon Nov 16 2020 Remi Collet <remi@remirepo.net> - 3.0.6-2
+- cleanup and only rename for fedora < 34
+
 * Thu Nov 12 2020 Remi Collet <remi@remirepo.net> - 3.0.6-1
 - update to 3.0.6
 - rename to libcouchbase6 to allow parallel installation with libcouchbase v2