rpms/nss-softokn/devel nss-softokn.spec,1.19,1.20

[Elio Maldonado]

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26288

Modified Files:
	nss-softokn.spec 
Log Message:
single copy of shared libraries, apply nss-nolocalsql patch, no rpath-link in nss-softokn-config


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nss-softokn.spec	4 Sep 2009 20:27:10 -0000	1.19
+++ nss-softokn.spec	5 Sep 2009 21:38:08 -0000	1.20
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -51,6 +51,8 @@ Source2:          nss-softokn.pc.in
 Source3:          nss-softokn-config.in
 Source4:          nss-softokn-prelink.conf
 
+Patch2:           nss-nolocalsql.patch
+
 %description
 Network Security Services Softoken Cryptographic Module
 
@@ -84,6 +86,8 @@ Header and Library files for doing devel
 %prep
 %setup -q
 
+%patch2 -p0
+
 %build
 
 FREEBL_NO_DEPEND=1
@@ -184,19 +188,9 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
 
-# FIXME - bug 521155, will fix later for stability
-# Copy the binary libraries we want
 for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
 do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
-  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
-
-# FIXME - bug 521155, will fix later for stability
-# Make sure chk files can be found in both places
-for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
-do
-  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
 # install our prelink configuration file
@@ -246,15 +240,13 @@ done
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
-[ $1 > 0 ] then;
+if [ $1 > 0 ] then;
   %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 fi
 exit 0
 
 %files
 %defattr(-,root,root)
-# FIXME - bug 521155, will fix later for stability
-# this would be replaced with the ones in devel
 /%{_lib}/libnssdbm3.so
 /%{_lib}/libnssdbm3.chk
 /%{_lib}/libsoftokn3.so
@@ -277,14 +269,6 @@ exit 0
 
 %files devel
 %defattr(-,root,root)
-# FIXME - bug 521155, will fix later for stability
-# these ar currently symbloc links to the libraries in "%"{_lib}
-%{_libdir}/libsoftokn3.so
-%{_libdir}/libsoftokn3.chk
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreebl3.chk
-%{_libdir}/libnssdbm3.so
-%{_libdir}/libnssdbm3.chk
 %{_libdir}/pkgconfig/nss-softokn.pc
 %{_bindir}/nss-softokn-config
 
@@ -308,6 +292,11 @@ exit 0
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
+- Remove symblic links to shared libraries from devel - 521155
+- Apply the nss-nolocalsql patch
+- No rpath-link in nss-softokn-config
+
 * Fri Sep 04 2009 serstring=Elio Maldonado<emaldona at redhat.cpm> - 3.12.4-2
 - Retagging to pick up the correct .cvsignore