Replaced invalid use of Conflicts with Requires

uyuni-project · Dec 24, 2023 · 77234f4 · 77234f4
1 parent e4ef694
commit 77234f4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/spacewalk/package/spacewalk.changes.sbluhm.postgresql15 b/spacewalk/package/spacewalk.changes.sbluhm.postgresql15
@@ -1,3 +1,4 @@
 - Allow parameterisation of min/max PostgreSQL version for Enterprise Linux.
 - Adapt usage of postgresql_version_max to allow minor versions.
 - Remove creation of initdb symlink for Enterprise Linux to avoid package conflicts with PostgreSQL 15.
+- Replaced invalid use of Conflicts in spec file with Requires.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
@@ -114,14 +114,14 @@ Requires:       spacewalk-java-postgresql
 Requires:       perl(DBD::Pg)
 %if 0%{?suse_version}
 Requires:       postgresql-implementation >= %{postgresql_version_min}
+Requires:       postgresql-implementation <= %{postgresql_version_max}.9999
 Requires:       postgresql-contrib-implementation >= %{postgresql_version_min}
-Conflicts:      postgresql-implementation > %{postgresql_version_max}.9999
-Conflicts:      postgresql-contrib-implementation > %{postgresql_version_max}:.9999
+Requires:       postgresql-contrib-implementation <= %{postgresql_version_max}:.9999
 %else # not a supported SUSE version or alternative OS.
 Requires:       postgresql >= %{postgresql_version_min}
+Requires:       postgresql <= %{postgresql_version_max}.9999
 Requires:       postgresql-contrib >= %{postgresql_version_min}
-Conflicts:      postgresql > %{postgresql_version_max}.9999
-Conflicts:      postgresql-contrib > %{postgresql_version_max}.9999
+Requires:       postgresql-contrib <= %{postgresql_version_max}.9999
 %endif # if sle_Version
 
 %description postgresql

diff --git a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.changes.sbluhm.postgresql15 b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.changes.sbluhm.postgresql15
@@ -1,2 +1,3 @@
 - Allow parameterisation of min/max PostgreSQL version for Enterprise Linux.
 - Adapt usage of postgresql_version_max to allow minor versions.
+- Replaced invalid use of Conflicts in spec file with Requires.
diff --git a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
@@ -32,14 +32,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %if 0%{?suse_version}
 Requires:       postgresql-server-implementation >= %{postgresql_version_min}
+Requires:       postgresql-server-implementation <= %{postgresql_version_max}.9999
 Requires:       postgresql-contrib-implementation >= %{postgresql_version_min}
-Conflicts:      postgresql-server-implementation > %{postgresql_version_max}.9999
-Conflicts:      postgresql-contrib-implementation > %{postgresql_version_max}.9999
+Requires:       postgresql-contrib-implementation <= %{postgresql_version_max}.9999
 %else
 Requires:       postgresql-server >= %{postgresql_version_min}
+Requires:       postgresql-server <= %{postgresql_version_max}.9999
 Requires:       postgresql-contrib >= %{postgresql_version_min}
-Conflicts:      postgresql-server > %{postgresql_version_max}.9999
-Conflicts:      postgresql-contrib > %{postgresql_version_max}.9999
+Requires:       postgresql-contrib <= %{postgresql_version_max}.9999
 %endif
 Requires:       lsof
 

diff --git a/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.changes.sbluhm.postgresql15 b/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.changes.sbluhm.postgresql15
@@ -1,2 +1,3 @@
 - Allow parameterisation of min/max PostgreSQL version for Enterprise Linux.
 - Adapt usage of postgresql_version_max to allow minor versions.
+- Replaced invalid use of Conflicts in spec file with Requires.
diff --git a/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.spec b/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.spec
@@ -31,14 +31,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %if 0%{?suse_version}
 Requires:       postgresql-server-implementation >= %{postgresql_version_min}
+Requires:       postgresql-server-implementation <= %{postgresql_version_max}.9999
 Requires:       postgresql-contrib-implementation >= %{postgresql_version_min}
-Conflicts:      postgresql-server-implementation > %{postgresql_version_max}.9999
-Conflicts:      postgresql-contrib-implementation > %{postgresql_version_max}.9999
+Requires:       postgresql-contrib-implementation <= %{postgresql_version_max}.9999
 %else
 Requires:       postgresql-server >= %{postgresql_version_min}
+Requires:       postgresql-server <= %{postgresql_version_max}.9999
 Requires:       postgresql-contrib >= %{postgresql_version_min}
-Conflicts:      postgresql-server < %{postgresql_version_max}.9999
-Conflicts:      postgresql-contrib < %{postgresql_version_max}.9999
+Requires:       postgresql-contrib <= %{postgresql_version_max}.9999
 %endif
 Requires:       lsof
 Requires:       susemanager-schema-utility