public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/credcheck] epel8: Updated the packaging layout to ensure that the EPEL packaging
@ 2026-09-01  6:30 Pavol Sloboda
  0 siblings, 0 replies; only message in thread
From: Pavol Sloboda @ 2026-09-01  6:30 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/credcheck
            Branch : epel8
            Commit : 6b4a70c4321edb133e075f1db3e3d98af5af4e60
            Author : Pavol Sloboda <psloboda@redhat.com>
            Date   : 2026-08-20T13:27:36+02:00
            Stats  : +14/-10 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/credcheck/c/6b4a70c4321edb133e075f1db3e3d98af5af4e60?branch=epel8

            Log:
            Updated the packaging layout to ensure that the EPEL packaging
guidelines about the package being installable by default are being met

https://docs.fedoraproject.org/en-US/epel/epel-packaging/#package_dependencies

Resolves: rhbz#2496715

---
diff --git a/credcheck.spec b/credcheck.spec
index 87caf1c..ebfe3d4 100644
--- a/credcheck.spec
+++ b/credcheck.spec
@@ -57,8 +57,10 @@ Patch1: upstream_db7c811a02f286b9ba3e81a219826bf47eca6d4e.patch
 #https://en.wikipedia.org/wiki/Interprocedural_optimization#WPO_and_LTO
 Patch2: lto_optimization.patch
 
-%package -n postgresql%{postgres_major_version}-%{upstream_name}
+%package -n postgresql-%{upstream_name}
 Summary: PostgreSQL extension for credential checking
+Provides: postgresql%{postgres_major_version}-%{upstream_name} = 0%{?epoch}:%{version}-%{release}
+Obsoletes: postgresql%{postgres_major_version}-%{upstream_name} <= 3.0-8
 
 #BuildRequires for postgresql
 BuildRequires: lz4-devel
@@ -121,7 +123,7 @@ BuildRequires: make gcc
 BuildRequires: cracklib-devel cracklib-dicts
 %endif
 
-Requires: postgresql-server > 16 postgresql-server < 17
+Requires: postgresql-server
 %if %{with cracklib}
 Requires: cracklib-dicts
 %if 0%{?with_selinux}
@@ -148,7 +150,7 @@ By using SET credcheck.<check-name> TO <some value>; command, enforce new
 settings for the credential checks. The settings can only be changed 
 by a superuser.
 
-%description -n postgresql%{postgres_major_version}-%{upstream_name}
+%description -n postgresql-%{upstream_name}
 The credcheck PostgreSQL extension provides few general credential checks,
 which will be evaluated during the user creation, during the password change
 and user renaming. By using this extension, we can define a set of rules:
@@ -169,15 +171,17 @@ by a superuser.
 
 %if %{with cracklib} && 0%{?with_selinux}
 #The SELinux subpackage
-%package -n postgresql%{postgres_major_version}-%{upstream_name}-selinux
+%package -n postgresql-%{upstream_name}-selinux
+Provides: postgresql%{postgres_major_version}-%{upstream_name}-selinux = 0%{?epoch}:%{version}-%{release}
+Obsoletes: postgresql%{postgres_major_version}-%{upstream_name}-selinux <= 3.0-8
 Summary: %{upstream_name} SELinux policy
 BuildArch: noarch
 BuildRequires: selinux-policy-%{selinuxtype}
 Requires: selinux-policy-%{selinuxtype}
-Recommends: postgresql%{postgres_major_version}-%{upstream_name} = %{version}-%{release}
+Recommends: postgresql-%{upstream_name} = %{version}-%{release}
 Requires(post): libselinux-utils selinux-policy-%{selinuxtype} policycoreutils
 
-%description -n postgresql%{postgres_major_version}-%{upstream_name}-selinux
+%description -n postgresql-%{upstream_name}-selinux
 SELinux policy for the %{upstream_name} to ensure the dictionaries installed by the
 cracklib-dicts package are reachable by this package.
 %endif
@@ -274,17 +278,17 @@ rm -rf %{buildroot}/tmp
 
 %if %{with cracklib} && 0%{?with_selinux}
 #installing selinux rules
-%post -n postgresql%{postgres_major_version}-%{upstream_name}-selinux
+%post -n postgresql-%{upstream_name}-selinux
 %selinux_modules_install -s %{selinuxtype} -p 200 %{_datadir}/selinux/packages/%{selinuxtype}/%{upstream_name}.cil
 
 #removing selinux rules
-%postun -n postgresql%{postgres_major_version}-%{upstream_name}-selinux
+%postun -n postgresql-%{upstream_name}-selinux
 if [ $1 -eq 0 ]; then
 %selinux_modules_uninstall -s %{selinuxtype} %{upstream_name}
 fi
 %endif
 
-%files -n postgresql%{postgres_major_version}-%{upstream_name}
+%files -n postgresql-%{upstream_name}
 %doc README.md 
 %license LICENSE
 %{_libdir}/pgsql/%{upstream_name}.so
@@ -294,7 +298,7 @@ fi
 %dir %{_datadir}/%{upstream_name}
 
 %if %{with cracklib} && 0%{?with_selinux}
-%files -n postgresql%{postgres_major_version}-%{upstream_name}-selinux
+%files -n postgresql-%{upstream_name}-selinux
 %{_datadir}/selinux/packages/%{selinuxtype}/%{upstream_name}.cil
 %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{upstream_name}
 %endif

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-01  6:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-01  6:30 [rpms/credcheck] epel8: Updated the packaging layout to ensure that the EPEL packaging Pavol Sloboda

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox