rpms/nss-softokn/F-12 nss-softokn-prelink.conf, 1.3, 1.4 nss-softokn.spec, 1.29, 1.30

[Elio Maldonado]

Author: emaldonado

Update of /cvs/pkgs/rpms/nss-softokn/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29072

Modified Files:
	nss-softokn-prelink.conf nss-softokn.spec 
Log Message:
Resolves: rhbz #561544 - Move libfreebl3.so and its .chk file to /lib{64}, keeping symbolic links in /usr/lib{64} to prevent breaking other packages


Index: nss-softokn-prelink.conf
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/F-12/nss-softokn-prelink.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nss-softokn-prelink.conf	23 Sep 2009 16:17:57 -0000	1.3
+++ nss-softokn-prelink.conf	6 Mar 2010 00:26:08 -0000	1.4
@@ -1,3 +1,4 @@
+-b /lib{,64}/libfreebl3.so
 -b /usr/lib{,64}/libfreebl3.so
 -b /usr/lib{,64}/libsoftokn3.so
 -b /usr/lib{,64}/libnssdbm3.so


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/F-12/nss-softokn.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- nss-softokn.spec	19 Jan 2010 02:12:39 -0000	1.29
+++ nss-softokn.spec	6 Mar 2010 00:26:08 -0000	1.30
@@ -1,5 +1,6 @@
-%global nspr_version 4.8
+%global nspr_version 4.8.2
 %global nss_name nss
+%global nss_softokn_fips_version 3.12.4
 %global nss_util_version 3.12.4
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
@@ -10,14 +11,14 @@
     %{__arch_install_post} \
     %{__os_install_post} \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
+    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
 %{nil}
 
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          14%{?dist}
+Release:          15%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -184,15 +185,33 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
 
-for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
+# Copy the binary libraries we want
+for file in libsoftokn3.so libnssdbm3.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
+# Because libcrypt depends on libfreebl3.so, it is special
+# so we install it in /lib{64}, keeping a symbolic link to it
+# back in /usr/lib{64} to keep everyone else working
+for file in libfreebl3.so
+do
+  %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+  ln -sf ../../%{_lib}/libfreebl3.so $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so
+done
+
+# Make sure chk files can be found in both places
+for file in libfreebl3.chk
+do
+  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+done
+
+
 # install our prelink configuration file
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
 %{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
@@ -262,6 +281,9 @@ done
 
 %files freebl
 %defattr(-,root,root)
+/%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk
+# and these symbolic links
 %{_libdir}/libfreebl3.so
 %{_libdir}/libfreebl3.chk
 
@@ -290,6 +312,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Fri Mar 05 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-15
+- Move libfreebl3.so and its .chk file to /lib{64} (rhbz#561544)
+
 * Mon Jan 18 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-14
 - Require util version according nss_util_version global