rpms/nss/devel .cvsignore, 1.13, 1.14 nss-config.in, 1.2, 1.3 nss.pc.in, 1.2, 1.3 nss.spec, 1.34, 1.35 sources, 1.14, 1.15 nss-create-obj.patch, 1.3, NONE nss-unix_rand.patch, 1.1, NONE
Kai Engert (kengert)
fedora-extras-commits at redhat.com
Fri Jan 25 12:29:50 UTC 2008
Author: kengert
Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19111
Modified Files:
.cvsignore nss-config.in nss.pc.in nss.spec sources
Removed Files:
nss-create-obj.patch nss-unix_rand.patch
Log Message:
* Thu Jan 24 2008 Kai Engert <kengert at redhat.com> - 3.11.99.3-1
* NSS 3.12 Beta 1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 Dec 2007 17:28:52 -0000 1.13
+++ .cvsignore 25 Jan 2008 12:29:12 -0000 1.14
@@ -1,3 +1,2 @@
-nss-3.11.99.2-stripped.tar.bz2
-nss-pem.tar.gz
-nss-3.11.99.2b-stripped.tar.bz2
+nss-3.11.99.3-stripped.tar.bz2
+nss-pem-20080124.tar.bz2
Index: nss-config.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nss-config.in 26 May 2006 23:28:21 -0000 1.2
+++ nss-config.in 25 Jan 2008 12:29:12 -0000 1.3
@@ -20,6 +20,7 @@
[--cflags]
Dynamic Libraries:
nss
+ nssutil
ssl
smime
EOF
@@ -33,6 +34,7 @@
lib_ssl=yes
lib_smime=yes
lib_nss=yes
+lib_nssutil=yes
while test $# -gt 0; do
case "$1" in
@@ -83,6 +85,9 @@
nss)
lib_nss=yes
;;
+ nssutil)
+ lib_nssutil=yes
+ ;;
*)
usage 1 1>&2
;;
@@ -132,6 +137,9 @@
if test -n "$lib_nss"; then
libdirs="$libdirs -lnss${major_version}"
fi
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
echo $libdirs
fi
Index: nss.pc.in
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.pc.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nss.pc.in 15 Dec 2005 21:50:37 -0000 1.2
+++ nss.pc.in 25 Jan 2008 12:29:12 -0000 1.3
@@ -7,5 +7,5 @@
Description: Network Security Services
Version: %NSS_VERSION%
Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
Cflags: -I${includedir}
Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nss.spec 8 Jan 2008 05:07:23 -0000 1.34
+++ nss.spec 25 Jan 2008 12:29:12 -0000 1.35
@@ -3,8 +3,8 @@
Summary: Network Security Services
Name: nss
-Version: 3.11.99.2b
-Release: 3%{?dist}
+Version: 3.11.99.3
+Release: 1%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -26,13 +26,11 @@
Source4: blank-key3.db
Source5: blank-secmod.db
Source8: nss-prelink.conf
-Source12: %{name}-pem.tar.gz
+Source12: %{name}-pem-20080124.tar.bz2
Patch1: nss-no-rpath.patch
Patch2: nss-nolocalsql.patch
-Patch3: nss-unix_rand.patch
Patch6: nss-enable-pem.patch
-Patch7: nss-create-obj.patch
%description
@@ -87,9 +85,7 @@
%patch1 -p0
%patch2 -p0
-%patch3 -p0
%patch6 -p0 -b .libpem
-%patch7 -p0 -b .create-obj
%build
@@ -170,7 +166,8 @@
%{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
# Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
+for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
+ libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
do
%{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
done
@@ -205,18 +202,6 @@
%{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done
-# For now, we don't want any pkix files to be public
-for file in mozilla/dist/public/nss/pkix*.h
-do
- rm $file
-done
-
-# For now, we don't want these files to be public
-for file in sdb.h sftkdbt.h
-do
- rm mozilla/dist/public/nss/$file
-done
-
# Copy the include files we want
for file in mozilla/dist/public/nss/*.h
do
@@ -241,6 +226,7 @@
%files
%defattr(-,root,root)
/%{_lib}/libnss3.so
+/%{_lib}/libnssutil3.so
/%{_lib}/libnssdbm3.so
/%{_lib}/libssl3.so
/%{_lib}/libsmime3.so
@@ -368,6 +354,7 @@
%{_includedir}/nss3/sslerr.h
%{_includedir}/nss3/sslproto.h
%{_includedir}/nss3/sslt.h
+%{_includedir}/nss3/utilrename.h
%{_includedir}/nss3/watcomfx.h
@@ -388,6 +375,9 @@
%changelog
+* Thu Jan 24 2008 Kai Engert <kengert at redhat.com> - 3.11.99.3-1
+* NSS 3.12 Beta 1
+
* Mon Jan 07 2008 Kai Engert <kengert at redhat.com> - 3.11.99.2b-3
- move .so files to /lib
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 12 Dec 2007 17:28:52 -0000 1.14
+++ sources 25 Jan 2008 12:29:12 -0000 1.15
@@ -1,2 +1,2 @@
-d656d49b02fe756bae4942acc90f61a4 nss-pem.tar.gz
-0c946e2c95e6896e9f9792a9596afeb6 nss-3.11.99.2b-stripped.tar.bz2
+8edfbf85d062c648da0acd146b45db0a nss-3.11.99.3-stripped.tar.bz2
+084675e4f793ed82e1ba78f76745ada8 nss-pem-20080124.tar.bz2
--- nss-create-obj.patch DELETED ---
--- nss-unix_rand.patch DELETED ---
More information about the fedora-extras-commits
mailing list