Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pam_userpass for openSUSE:Factory
checked in at 2021-11-24 23:54:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam_userpass (Old)
and /work/SRC/openSUSE:Factory/.pam_userpass.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_userpass"
Wed Nov 24 23:54:30 2021 rev:20 rq:933442 version:1.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/pam_userpass/pam_userpass.changes
2019-11-28 10:17:45.647639379 +0100
+++ /work/SRC/openSUSE:Factory/.pam_userpass.new.1895/pam_userpass.changes
2021-11-24 23:54:57.100382516 +0100
@@ -1,0 +2,13 @@
+Tue Oct 26 15:07:15 UTC 2021 - Josef M??llers <josef.moell...@suse.com>
+
+- Split the install section into an install and a check section.
+ Otherwise i[345]86 will not build.
+
+-------------------------------------------------------------------
+Mon Oct 4 11:30:28 UTC 2021 - Josef M??llers <josef.moell...@suse.com>
+
+- Use the %_pam_moduledir macro in pam_userpass.spec in order to
+ have the package follow UsrMerge.
+ [bsc#1190962, pam_userpass.spec]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam_userpass.spec ++++++
--- /var/tmp/diff_new_pack.b5nPNK/_old 2021-11-24 23:54:57.700380502 +0100
+++ /var/tmp/diff_new_pack.b5nPNK/_new 2021-11-24 23:54:57.704380488 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pam_userpass
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
Patch0: pam_userpass-1.0.diff
BuildRequires: pam-devel
Requires: pam
-Provides: pam-modules:/%{_lib}/security/pam_userpass.so
+Provides: pam-modules:%{_pam_moduledir}/pam_userpass.so
%description
PAM (Pluggable Authentication Modules) is a system security tool that
@@ -46,22 +46,15 @@
make %{?_smp_mflags} CFLAGS="%{optflags} $EXTRA_CFLAGS -fPIC -DHAVE_SHADOW
-DLINUX_PAM"
%install
-mkdir -p %{buildroot}/%{_lib}/security
-%make_install
-#
-# Remove stuff we don't wish to have now:
-#
-rm -rf %{buildroot}%{_prefix}/{include,lib}
-find %{buildroot} -type f -name "*.la" -delete -print
-#
-# On 64bit archs, we need to move same libraries ourself:
-#
-if [ %{_lib} = lib64 ]; then
- mv %{buildroot}/lib/security/* %{buildroot}/%{_lib}/security/
-fi
+make DESTDIR=%{buildroot} SHARED_LIBDIR=/"%{_lib}" DEVEL_LIBDIR="%{_libdir}"
SECUREDIR="%{_pam_moduledir}" install
+# Remove stuff we don't wish to have now. Note that "make" seems to install
library files in /usr/lib!
+rm -rf %{buildroot}%{_prefix}/include/security/*.h %{buildroot}/usr/lib/lib*
+
+%check
# Check for module problems. Specifically, check that every module we just
# installed can actually be loaded by a minimal PAM-aware application.
-for module in %{buildroot}/%{_lib}/security/pam*.so ; do
+export LD_LIBRARY_PATH="%{buildroot}/%{_lib}/"
+for module in %{buildroot}%{_pam_moduledir}/pam*.so ; do
if ! sh $RPM_SOURCE_DIR/dlopen.sh -lpam -ldl ${module} ; then
exit 1
fi
@@ -71,6 +64,6 @@
%defattr(-,root,root,755)
%license LICENSE
%doc README conf/*
-%attr(755,root,root) /%{_lib}/security/pam_*.so
+%attr(755,root,root) %{_pam_moduledir}/pam_*.so
%changelog
