rpms/nss-util/devel nss-util.spec,1.14,1.15

[Elio Maldonado]

Author: emaldonado

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

Modified Files:
	nss-util.spec 
Log Message:
single copy of shared libraries, no rpath-link, nolocalsql patch subset for util


Index: nss-util.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-util/devel/nss-util.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nss-util.spec	4 Sep 2009 20:51:16 -0000	1.14
+++ nss-util.spec	5 Sep 2009 21:33:38 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 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
@@ -32,6 +32,7 @@ Source1:          nss-split-util.sh
 Source2:          nss-util.pc.in
 Source3:          nss-util-config.in
 
+Patch2:           nss-nolocalsql.patch
 
 %description
 Utilities for Network Security Services and the Softoken module
@@ -53,6 +54,8 @@ Header and library files for doing devel
 %prep
 %setup -q
 
+%patch2 -p0
+
 %build
 
 # Enable compiler optimizations and disable debugging code
@@ -126,13 +129,9 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-u
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
 
-# FIXME - Bug 521155
-# Will fix later for stability reasons
-# Copy the binary libraries we want
 for file in libnssutil3.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
 
 # Copy the include files we want
@@ -161,9 +160,6 @@ done
 
 %files devel
 %defattr(-,root,root)
-# FIXME - bug 521155, will fix later for stability
-# this is a symbolic link to the shared library in "%"{_lib}
-%{_libdir}/libnssutil3.so
 # package configuration files
 %{_libdir}/pkgconfig/nss-util.pc
 %{_bindir}/nss-util-config
@@ -204,6 +200,11 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Sat Sep 05 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-3
+- Remove symbolic links to shared libraries from devel - 521155
+- Apply nss-nolocalsql patch subset for nss-util
+- No rpath-link in nss-util-config
+
 * Fri Sep 04 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-2
 - Retagging for a chained build
 
@@ -218,7 +219,7 @@ done
 - Cleanup nss-util-config.in
 
 * Thu Aug 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-13
-nss-util-devel doesn't require nss-devel
+- nss-util-devel doesn't require nss-devel
 
 * Wed Aug 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-12
 - bump to unique nvr