rpms/nss/devel nss-fix-tests.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 nss.spec, 1.41, 1.42 sources, 1.16, 1.17 bug432146.patch, 1.1, NONE
Kai Engert (kengert)
fedora-extras-commits at redhat.com
Mon Mar 17 20:59:18 UTC 2008
Author: kengert
Update of /cvs/extras/rpms/nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23400
Modified Files:
.cvsignore nss.spec sources
Added Files:
nss-fix-tests.patch
Removed Files:
bug432146.patch
Log Message:
* Mon Mar 17 2008 Kai Engert <kengert at redhat.com> - 3.11.99.5-1
- Update to NSS_3_12_BETA3
nss-fix-tests.patch:
--- NEW FILE nss-fix-tests.patch ---
diff -up ./mozilla/security/nss/tests/header.prex ./mozilla/security/nss/tests/header
--- ./mozilla/security/nss/tests/header.prex 2008-03-17 21:36:11.000000000 +0100
+++ ./mozilla/security/nss/tests/header 2008-03-17 21:36:47.000000000 +0100
@@ -1114,8 +1114,8 @@ qa_stat_get_sysinfo()
set_objdir()
{
Debug "set object dir"
- OBJDIR=`cd ${TESTSCRIPTDIR}/common; gmake objdir_name`
- OS_ARCH=`cd ${TESTSCRIPTDIR}/common; gmake os_arch`
+ OBJDIR=`cd ${TESTSCRIPTDIR}/common; gmake --no-print-directory objdir_name`
+ OS_ARCH=`cd ${TESTSCRIPTDIR}/common; gmake --no-print-directory os_arch`
#at this point $MASTERBUILD needs to be either NT or unix
diff -up ./mozilla/security/nss/tests/nsspath.prex ./mozilla/security/nss/tests/nsspath
--- ./mozilla/security/nss/tests/nsspath.prex 2008-03-17 21:37:10.000000000 +0100
+++ ./mozilla/security/nss/tests/nsspath 2008-03-17 21:37:23.000000000 +0100
@@ -2,7 +2,7 @@
set PWD=`pwd`
source /u/sonmi/bin/nssdir $*
-set OBJDIR=`(cd mozilla/security/nss/tests/common; gmake objdir_name)`
+set OBJDIR=`(cd mozilla/security/nss/tests/common; gmake --no-print-directory objdir_name)`
setenv PATH `perl /u/sonmi/bin/path_uniq -s "${PATH}:${UXDIST}/${OBJDIR}/bin"`
if ( `uname -n` == "iws-perf" ) then
setenv LD_LIBRARY_PATH "${UXDIST}/${OBJDIR}/lib:/opt/nfast/toolkits/pkcs11"
diff -up ./mozilla/security/nss/tests/common/init.sh.prex ./mozilla/security/nss/tests/common/init.sh
--- ./mozilla/security/nss/tests/common/init.sh.prex 2008-03-17 21:37:32.000000000 +0100
+++ ./mozilla/security/nss/tests/common/init.sh 2008-03-17 21:38:52.000000000 +0100
@@ -269,10 +269,10 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
DIST=${DIST-${MOZILLA_ROOT}/dist}
SECURITY_ROOT=${SECURITY_ROOT-${MOZILLA_ROOT}/security/nss}
TESTDIR=${TESTDIR-${MOZILLA_ROOT}/tests_results/security}
- OBJDIR=`(cd $COMMON; $MAKE objdir_name)`
- OS_ARCH=`(cd $COMMON; $MAKE os_arch)`
- DLL_PREFIX=`(cd $COMMON; $MAKE dll_prefix)`
- DLL_SUFFIX=`(cd $COMMON; $MAKE dll_suffix)`
+ OBJDIR=`(cd $COMMON; $MAKE --no-print-directory objdir_name)`
+ OS_ARCH=`(cd $COMMON; $MAKE --no-print-directory os_arch)`
+ DLL_PREFIX=`(cd $COMMON; $MAKE --no-print-directory dll_prefix)`
+ DLL_SUFFIX=`(cd $COMMON; $MAKE --no-print-directory dll_suffix)`
OS_NAME=`uname -s | sed -e "s/-[0-9]*\.[0-9]*//" | sed -e "s/-WOW64//"`
BINDIR="${DIST}/${OBJDIR}/bin"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 22 Feb 2008 18:15:54 -0000 1.15
+++ .cvsignore 17 Mar 2008 20:58:41 -0000 1.16
@@ -1,2 +1,2 @@
nss-pem-20080124.tar.bz2
-nss-3.11.99.4-stripped.tar.gz
+nss-3.11.99.5-stripped.tar.gz
Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- nss.spec 22 Feb 2008 18:15:54 -0000 1.41
+++ nss.spec 17 Mar 2008 20:58:41 -0000 1.42
@@ -3,7 +3,7 @@
Summary: Network Security Services
Name: nss
-Version: 3.11.99.4
+Version: 3.11.99.5
Release: 1%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
@@ -33,8 +33,7 @@
Patch1: nss-no-rpath.patch
Patch2: nss-nolocalsql.patch
Patch6: nss-enable-pem.patch
-Patch7: bug432146.patch
-
+patch7: nss-fix-tests.patch
%description
Network Security Services (NSS) is a set of libraries designed to
@@ -89,7 +88,7 @@
%patch1 -p0
%patch2 -p0
%patch6 -p0 -b .libpem
-%patch7 -p0
+%patch7 -p0 -b .prex
%build
@@ -445,6 +444,8 @@
%changelog
+* Mon Mar 17 2008 Kai Engert <kengert at redhat.com> - 3.11.99.5-1
+- Update to NSS_3_12_BETA3
* 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: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 22 Feb 2008 18:15:54 -0000 1.16
+++ sources 17 Mar 2008 20:58:41 -0000 1.17
@@ -1,2 +1,2 @@
084675e4f793ed82e1ba78f76745ada8 nss-pem-20080124.tar.bz2
-9ea13b934c57ac3efd1d823fe4d74959 nss-3.11.99.4-stripped.tar.gz
+37ab35ff45c5f1473fcd4fbe85491756 nss-3.11.99.5-stripped.tar.gz
--- bug432146.patch DELETED ---
More information about the fedora-extras-commits
mailing list