--- linux-pam.spec.orig 2004-05-05 19:27:32 +0400 +++ linux-pam.spec 2004-07-26 18:46:25 +0400 @@ -1,6 +1,6 @@ Name: pam Version: 0.75 -Release: alt26 +Release: alt27 %define rhver 48 %define helperdir /sbin @@ -20,7 +20,7 @@ %define set_pam_name() %global pam_name %(n='%{1}'; s="${n#pam_}"; [ "$n" = "$s" ] && echo -n "$n" || echo -n "pam%{_pam_name_suffix}_$s") # Linux-PAM modules directory. -%define _pam_modules_dir /lib/security +%define _pam_modules_dir /%_lib/security # Linux-PAM library soname suffix. %define _pam_so_suffix %{nil} @@ -368,7 +368,7 @@ %configure \ --prefix=/ \ --exec-prefix=/ \ - --libdir=/lib \ + --libdir=/%_lib \ --sbindir=/sbin \ --enable-static-libpam \ --disable-read-both-confs \ @@ -388,27 +388,27 @@ for d in modules/pam_*; do if [ -d "$d" ]; then m="${d##*/}" - if ! ls -1 "$RPM_BUILD_ROOT/lib/security/$m"*.so 2>/dev/null; then + if ! ls -1 "$RPM_BUILD_ROOT/%_lib/security/$m"*.so 2>/dev/null; then echo "ERROR: $m module did not build." exit 1 fi fi done -# Relocate development libraries from /lib/ to %_libdir/. +# Relocate development libraries from /%_lib/ to %_libdir/. %__mkdir_p $RPM_BUILD_ROOT%_libdir -%__mv $RPM_BUILD_ROOT/lib/*.*a $RPM_BUILD_ROOT%_libdir/ +%__mv $RPM_BUILD_ROOT/%_lib/*.*a $RPM_BUILD_ROOT%_libdir/ -/sbin/ldconfig -nv $RPM_BUILD_ROOT/lib -for f in $RPM_BUILD_ROOT/lib/*.so; do +/sbin/ldconfig -nv $RPM_BUILD_ROOT/%_lib +for f in $RPM_BUILD_ROOT/%_lib/*.so; do t=`objdump -p "$f" |awk '/SONAME/ {print $2}'` [ -n "$t" ] - %__ln_s ../../lib/"$t" "$RPM_BUILD_ROOT%_libdir/${f##*/}" + %__ln_s ../../%_lib/"$t" "$RPM_BUILD_ROOT%_libdir/${f##*/}" %__rm -f "$f" done -%__chmod a-x $RPM_BUILD_ROOT/lib{,/security}/*.so* -%add_findprov_lib_path /lib/security +%__chmod a-x $RPM_BUILD_ROOT/%_lib{,/security}/*.so* +%add_findprov_lib_path /%_lib/security # Linux-PAM-specific rpm macros. %__install -pD -m644 %SOURCE5 $RPM_BUILD_ROOT%_sysconfdir/rpm/macros.d/pam @@ -457,9 +457,9 @@ %files -n %libpam %config %_sysconfdir/buildreqs/packages/substitute.d/%libpam -/lib/*.so.* -/lib/security/pam_deny.so -/lib/security/pam_permit.so +/%_lib/*.so.* +/%_lib/security/pam_deny.so +/%_lib/security/pam_permit.so %dir %docdir %docdir/[A-Z]* @@ -482,12 +482,12 @@ %config(noreplace) %_secdir/group.conf %config(noreplace) %_secdir/limits.conf %config(noreplace) %_secdir/pam_env.conf -/lib/security/* -%exclude /lib/security/pam_deny.so -%exclude /lib/security/pam_permit.so -%exclude /lib/security/pam_console.so -%exclude /lib/security/pam_timestamp.so -%exclude /lib/security/pam_stack.so +/%_lib/security/* +%exclude /%_lib/security/pam_deny.so +%exclude /%_lib/security/pam_permit.so +%exclude /%_lib/security/pam_console.so +%exclude /%_lib/security/pam_timestamp.so +%exclude /%_lib/security/pam_stack.so %_mandir/man[58]/*.* %exclude %_mandir/man[58]/*console* %exclude %_mandir/man[58]/pam_timestamp.* @@ -497,17 +497,17 @@ %attr(600,root,root) %config(noreplace) %_secdir/console.perms %attr(711,root,root) %dir %_secdir/console.apps %attr(700,root,root) %helperdir/pam_console_apply -/lib/security/pam_console.so +/%_lib/security/pam_console.so %_mandir/man[58]/*console* %dir %attr(711,root,root) /var/run/console %files -n %{make_pam_name timestamp} %attr(700,root,root) %helperdir/pam_timestamp_check -/lib/security/pam_timestamp.so +/%_lib/security/pam_timestamp.so %_mandir/man[58]/pam_timestamp.* %files -n %{make_pam_name stack} -/lib/security/pam_stack.so +/%_lib/security/pam_stack.so %_mandir/man[58]/pam_stack.* %files doc @@ -515,6 +515,9 @@ %docdir/[a-z]* %changelog +* Mon Jul 26 2004 Kachalov Anton 0.75-alt27 +- Change /lib to /%_lib to make compile on x86_64 + * Wed May 05 2004 Dmitry V. Levin 0.75-alt26 - console.perms: added /dev/dri/* to (#2507). - console.perms: fixed typo in (#3343).