rpms/nss/devel .cvsignore, 1.14, 1.15 nss.spec, 1.40, 1.41 sources, 1.15, 1.16 bug417664.patch, 1.1, NONE

[Kai Engert (kengert)]

Author: kengert

Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23718

Modified Files:
	.cvsignore nss.spec sources 
Removed Files:
	bug417664.patch 
Log Message:
* Fri Feb 22 2008 Kai Engert <kengert at redhat.com> - 3.11.99.4-1
- NSS 3.12 Beta 2
- Use /usr/lib{64} as devel libdir, create symbolic links.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	25 Jan 2008 12:29:12 -0000	1.14
+++ .cvsignore	22 Feb 2008 18:15:54 -0000	1.15
@@ -1,2 +1,2 @@
-nss-3.11.99.3-stripped.tar.bz2
 nss-pem-20080124.tar.bz2
+nss-3.11.99.4-stripped.tar.gz


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- nss.spec	16 Feb 2008 05:38:51 -0000	1.40
+++ nss.spec	22 Feb 2008 18:15:54 -0000	1.41
@@ -1,10 +1,10 @@
-%define nspr_version 4.6.99
+%define nspr_version 4.7
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.11.99.3
-Release:          6%{?dist}
+Version:          3.11.99.4
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -20,7 +20,7 @@
 Provides:         mozilla-nss
 Obsoletes:        mozilla-nss
 
-Source0:          %{name}-%{version}-stripped.tar.bz2
+Source0:          %{name}-%{version}-stripped.tar.gz
 
 Source1:          nss.pc.in
 Source2:          nss-config.in
@@ -34,7 +34,6 @@
 Patch2:           nss-nolocalsql.patch
 Patch6:           nss-enable-pem.patch
 Patch7:           bug432146.patch
-Patch8:           bug417664.patch
 
 
 %description
@@ -91,7 +90,6 @@
 %patch2 -p0
 %patch6 -p0 -b .libpem
 %patch7 -p0
-%patch8 -p0
 
 
 %build
@@ -133,7 +131,7 @@
 
 # Set up our package file
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-%{__cat} %{SOURCE1} | sed -e "s,%%libdir%%,/%{_lib},g" \
+%{__cat} %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
@@ -150,7 +148,7 @@
 export NSS_VPATCH
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__cat} %{SOURCE2} | sed -e "s, at libdir@,/%{_lib},g" \
+%{__cat} %{SOURCE2} | sed -e "s, at libdir@,%{_libdir},g" \
                           -e "s, at prefix@,%{_prefix},g" \
                           -e "s, at exec_prefix@,%{_prefix},g" \
                           -e "s, at includedir@,%{_includedir}/nss3,g" \
@@ -226,11 +224,16 @@
             libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
 do
   %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
 done
 
 # These ghost files will be generated in the post step
-touch $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.chk
-touch $RPM_BUILD_ROOT/%{_lib}/libfreebl3.chk
+# Make sure chk files can be found in both places
+for file in libsoftokn3.chk libfreebl3.chk
+do
+  touch $RPM_BUILD_ROOT/%{_lib}/$file
+  ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+done
 
 # Install the empty NSS db files
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
@@ -326,6 +329,17 @@
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/libnss3.so
+%{_libdir}/libnssutil3.so
+%{_libdir}/libnssdbm3.so
+%{_libdir}/libssl3.so
+%{_libdir}/libsmime3.so
+%{_libdir}/libsoftokn3.so
+%{_libdir}/libsoftokn3.chk
+%{_libdir}/libnssckbi.so
+%{_libdir}/libnsspem.so
+%{_libdir}/libfreebl3.so
+%{_libdir}/libfreebl3.chk
 %{_libdir}/libcrmf.a
 %{_libdir}/pkgconfig/nss.pc
 %{_bindir}/nss-config
@@ -431,6 +445,9 @@
 
 
 %changelog
+* Fri Feb 22 2008 Kai Engert <kengert at redhat.com> - 3.11.99.4-1
+- NSS 3.12 Beta 2
+- Use /usr/lib{64} as devel libdir, create symbolic links.
 * Sat Feb 16 2008 Kai Engert <kengert at redhat.com> - 3.11.99.3-6
 - Apply upstream patch for bug 417664, enable test suite on pcc.
 * Fri Feb 15 2008 Kai Engert <kengert at redhat.com> - 3.11.99.3-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Jan 2008 12:29:12 -0000	1.15
+++ sources	22 Feb 2008 18:15:54 -0000	1.16
@@ -1,2 +1,2 @@
-8edfbf85d062c648da0acd146b45db0a  nss-3.11.99.3-stripped.tar.bz2
 084675e4f793ed82e1ba78f76745ada8  nss-pem-20080124.tar.bz2
+9ea13b934c57ac3efd1d823fe4d74959  nss-3.11.99.4-stripped.tar.gz


--- bug417664.patch DELETED ---