From c692ff2551da0adf87187ac7bd43d39fb2cd0e00db662275d9d07330524d2fe8 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 12 Sep 2022 18:51:52 +0000 Subject: [PATCH] Accepting request 1003033 from home:sbrabec:branches:util-linux-2.38 - Fix pam directory for the staging package. - Add util-linux-rpmlintrc removing unneeded warnings. OBS-URL: https://build.opensuse.org/request/show/1003033 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=473 --- util-linux-rpmlintrc | 7 +++++++ util-linux.changes | 6 ++++++ util-linux.spec | 33 +++++++++++++++++++-------------- 3 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 util-linux-rpmlintrc diff --git a/util-linux-rpmlintrc b/util-linux-rpmlintrc new file mode 100644 index 0000000..3b75ec2 --- /dev/null +++ b/util-linux-rpmlintrc @@ -0,0 +1,7 @@ +# False positives. Libraries outside LD_LIBRARY_PATH use RPATH to find libraries, not ldconfig. +addFilter("library-without-ldconfig-postun /usr/libexec/build/staging/.*") +addFilter("postin-without-ldconfig /usr/libexec/build/staging/.*") +# Not applicable for multi flavor build. +addFilter("invalid-spec-name") +# Not important, and it simplifies packaging. +addFilter("non-etc-or-var-file-marked-as-conffile /usr/libexec/build/staging/.*") diff --git a/util-linux.changes b/util-linux.changes index 7debb7b..a226af3 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 12 18:45:58 UTC 2022 - Stanislav Brabec + +- Fix pam directory for the staging package. +- Add util-linux-rpmlintrc removing unneeded warnings. + ------------------------------------------------------------------- Mon Aug 29 02:41:41 UTC 2022 - Stanislav Brabec diff --git a/util-linux.spec b/util-linux.spec index f19bfb9..6666d32 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -80,8 +80,8 @@ %define uldocdir %{uldatadir}/doc %define uldistconfdir %{ulprefix}/etc %define ulsysconfdir %{ulprefix}/etc -# HACK: We have to provide a non-functional PAM directory to make packages non-conflicting. -%define ulpamdir %{ulsysconfdir}/pam.d +# HACK: We have to make a possible conflict here. But hopefully, equal files don't conflict in RPM. +%define ulpamdir %{_pam_vendordir} %endif %if "%ulbuild" == "base" @@ -105,6 +105,7 @@ License: GPL-2.0-or-later URL: https://www.kernel.org/pub/linux/utils/util-linux/ Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-%{version}.tar.xz Source2: util-linux-login_defs-check.sh +Source3: util-linux-rpmlintrc Source6: etc_filesystems Source7: baselibs.conf Source8: login.pamd @@ -145,6 +146,7 @@ BuildRequires: zlib-devel %ifarch ppc ppc64 ppc64le BuildRequires: librtas-devel %endif +PreReq: permissions %if "%ulmode" == "full" BuildRequires: bash-completion BuildRequires: file-devel @@ -156,7 +158,7 @@ BuildRequires: rubygem(asciidoctor) Requires: adjtimex Requires: time Requires: which -PreReq: %install_info_prereq permissions +PreReq: %install_info_prereq %systemd_requires %endif %if "%ulbuild" == "base" @@ -566,8 +568,12 @@ cd .. # There is a limitation: python module needs to build much more, and install even more. Delete it. rm -r %{buildroot}{%{ulbindir},%{ulmandir},%{uldatadir},%{ulincludedir},%{ullibdir}/{lib,pkg}*} %endif -# link duplicate manpages or python bindings +# Link duplicate manpages or python bindings. %fdupes -s %{buildroot}%{ulprefix} +%if "%ulmode" == "bootstrap" +# Does not work for files installed by %%doc. +%fdupes -s %{buildroot}%{_prefix} +%endif %if "%ulbuild" == "base" %if "%ulmode" == "full" @@ -634,8 +640,8 @@ done # # If outdated PAM file is detected, issue a warning. for PAM_FILE in login remote runuser runuser-l su su-l ; do - if test -f %{ulsysconfdir}/pam.d/$PAM_FILE.rpmnew ; then - echo "Your %{ulsysconfdir}/pam.d/$PAM_FILE is outdated. Please check %{ulsysconfdir}/pam.d/$PAM_FILE.rpmnew!" >&2 + if test -f %{ulpamdir}/$PAM_FILE.rpmnew ; then + echo "Your %{ulpamdir}/$PAM_FILE is outdated. Please check %{ulpamdir}/$PAM_FILE.rpmnew!" >&2 fi done # @@ -744,12 +750,12 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{uldistconfdir}/default/runuser %{uldistconfdir}/default/su %else -%config(noreplace) %{ulsysconfdir}/pam.d/login -%config(noreplace) %{ulsysconfdir}/pam.d/remote -%config(noreplace) %{ulsysconfdir}/pam.d/runuser -%config(noreplace) %{ulsysconfdir}/pam.d/runuser-l -%config(noreplace) %{ulsysconfdir}/pam.d/su -%config(noreplace) %{ulsysconfdir}/pam.d/su-l +%config(noreplace) %{ulpamdir}/login +%config(noreplace) %{ulpamdir}/remote +%config(noreplace) %{ulpamdir}/runuser +%config(noreplace) %{ulpamdir}/runuser-l +%config(noreplace) %{ulpamdir}/su +%config(noreplace) %{ulpamdir}/su-l %config(noreplace) %{ulsysconfdir}/default/runuser %config(noreplace) %{ulsysconfdir}/default/su %endif @@ -905,7 +911,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{ulsbindir}/readprofile %{uldatadir}/bash-completion/completions/* %if "%ulmode" == "bootstrap" -/etc/profile.d/%{name}.sh +%config /etc/profile.d/%{name}.sh %endif # # Common files for all archs not intended for mini package @@ -1089,7 +1095,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %dir %{uldatadir}/bash-completion/completions %dir %{ulsysconfdir} %dir %{ulsysconfdir}/default -%dir %{ulsysconfdir}/pam.d %endif %if "%ulmode" == "full"