[nspr/f16] Update to NSPR_4_9_1_RTM
Elio Maldonado
emaldonado at fedoraproject.org
Sun Jul 8 23:37:19 UTC 2012
commit 911975aedb40e29b6de5dd55a3bd6ac055d92663
Author: Elio Maldonado <emaldona at redhat.com>
Date: Sun Jul 8 16:38:16 2012 -0700
Update to NSPR_4_9_1_RTM
- cherry-pick from master
- regenerated nspr-config-pc.patch for upstream changes
- remove files that are no longer needed
.gitignore | 2 +-
nspr-config-pc.patch | 52 ++++++++++++++++++++++---------------------------
nspr-config-vars.in | 2 -
nspr.pc.in | 10 ---------
nspr.spec | 27 ++++---------------------
sources | 2 +-
6 files changed, 30 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0154d3c..5618f50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-nspr-4.9.tar.bz2
+/nspr-4.9.1.tar.bz2
diff --git a/nspr-config-pc.patch b/nspr-config-pc.patch
index 332b03a..7f49853 100644
--- a/nspr-config-pc.patch
+++ b/nspr-config-pc.patch
@@ -1,7 +1,11 @@
-diff -up ./mozilla/nsprpub/config/nspr-config-pc.in.x123 ./mozilla/nsprpub/config/nspr-config-pc.in
---- ./mozilla/nsprpub/config/nspr-config-pc.in.x123 2012-02-29 16:00:54.108691393 -0800
-+++ ./mozilla/nsprpub/config/nspr-config-pc.in 2012-02-29 16:00:54.111691416 -0800
-@@ -98,7 +98,7 @@ if test -z "$includedir"; then
+Index: ./mozilla/nsprpub/config/nspr-config.in
+===================================================================
+RCS file: /cvsroot/mozilla/nsprpub/config/nspr-config.in,v
+retrieving revision 1.8
+diff -u -p -r1.8 nspr-config.in
+--- ./mozilla/nsprpub/config/nspr-config.in 6 Mar 2012 13:13:39 -0000 1.8
++++ ./mozilla/nsprpub/config/nspr-config.in 22 Jun 2012 02:36:56 -0000
+@@ -102,7 +102,7 @@ if test -z "$includedir"; then
includedir=@includedir@
fi
if test -z "$libdir"; then
@@ -10,7 +14,7 @@ diff -up ./mozilla/nsprpub/config/nspr-config-pc.in.x123 ./mozilla/nsprpub/confi
fi
if test "$echo_prefix" = "yes"; then
-@@ -132,12 +132,12 @@ if test "$echo_libs" = "yes"; then
+@@ -136,12 +136,12 @@ if test "$echo_libs" = "yes"; then
if test -n "$lib_nspr"; then
libdirs="$libdirs -lnspr${major_version}"
fi
@@ -25,27 +29,17 @@ diff -up ./mozilla/nsprpub/config/nspr-config-pc.in.x123 ./mozilla/nsprpub/confi
+ echo $libdirs `pkg-config --variable=os_libs nspr`
fi
-diff -up ./mozilla/nsprpub/configure.in.x123 ./mozilla/nsprpub/configure.in
---- ./mozilla/nsprpub/configure.in.x123 2012-02-14 11:06:00.000000000 -0800
-+++ ./mozilla/nsprpub/configure.in 2012-02-29 16:00:54.113691431 -0800
-@@ -3357,6 +3357,8 @@ MAKEFILES="
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+ config/nspr-config-pc
-+ config/nspr-config-vars
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
-diff -up ./mozilla/nsprpub/configure.x123 ./mozilla/nsprpub/configure
---- ./mozilla/nsprpub/configure.x123 2012-02-29 16:03:11.006689991 -0800
-+++ ./mozilla/nsprpub/configure 2012-02-29 16:05:15.646599889 -0800
-@@ -6694,6 +6694,8 @@ MAKEFILES="
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+ config/nspr-config-pc
-+ config/nspr-config-vars
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
+Index: ./mozilla/nsprpub/config/nspr.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/nsprpub/config/nspr.pc.in,v
+retrieving revision 1.1
+diff -u -p -r1.1 nspr.pc.in
+--- ./mozilla/nsprpub/config/nspr.pc.in 18 May 2012 22:26:17 -0000 1.1
++++ ./mozilla/nsprpub/config/nspr.pc.in 22 Jun 2012 02:36:56 -0000
+@@ -6,5 +8,5 @@ includedir=@includedir@
+ Name: NSPR
+ Description: The Netscape Portable Runtime
+ Version: @MOD_MAJOR_VERSION at .@MOD_MINOR_VERSION at .@MOD_PATCH_VERSION@
+-Libs: -L at libdir@ -lplds at MOD_MAJOR_VERSION@ -lplc at MOD_MAJOR_VERSION@ -lnspr at MOD_MAJOR_VERSION@
++Libs: -L at libdir@ -lplds at MOD_MAJOR_VERSION@ -lplc at MOD_MAJOR_VERSION@ -lnspr at MOD_MAJOR_VERSION@ @OS_LIBS@
+ Cflags: -I at includedir@
diff --git a/nspr.spec b/nspr.spec
index 89f191c..71b5331 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,7 +1,7 @@
Summary: Netscape Portable Runtime
Name: nspr
-Version: 4.9
-Release: 2%{?dist}
+Version: 4.9.1
+Release: 1%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/nspr/
Group: System Environment/Libraries
@@ -11,8 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
# When CVS tag based snapshots are being used, refer to CVS documentation on
# mozilla.org and check out subdirectory mozilla/nsprpub.
Source0: %{name}-%{version}.tar.bz2
-Source1: nspr.pc.in
-Source2: nspr-config-vars.in
Patch1: nspr-config-pc.patch
@@ -45,8 +43,6 @@ Header files for doing development with the Netscape Portable Runtime.
cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config-pc.in
%patch1 -p0
-cp %{SOURCE2} ./mozilla/nsprpub/config/
-
%build
# partial RELRO support as a security enhancement
@@ -92,22 +88,6 @@ NSPR_CFLAGS=`./config/nspr-config --cflags`
NSPR_VERSION=`./config/nspr-config --version`
%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-cat ./config/nspr-config-vars > \
- $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
-
-cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
- -e "s,%%prefix%%,%{_prefix},g" \
- -e "s,%%exec_prefix%%,%{_prefix},g" \
- -e "s,%%includedir%%,%{_includedir}/nspr4,g" \
- -e "s,%%NSPR_VERSION%%,$NSPR_VERSION,g" \
- -e "s,%%FULL_NSPR_LIBS%%,$NSPR_LIBS,g" \
- -e "s,%%FULL_NSPR_CFLAGS%%,$NSPR_CFLAGS,g" >> \
- $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
-
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
-%{__cp} ./config/nspr-config-pc $RPM_BUILD_ROOT/%{_bindir}/nspr-config
-
# Get rid of the things we don't want installed (per upstream)
%{__rm} -rf \
$RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \
@@ -148,6 +128,9 @@ done
%{_bindir}/nspr-config
%changelog
+* Sun Jul 08 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.1-1
+- Update to NSPR_4_9_1_RTM
+
* Wed Mar 28 2012 Elio Maldonado <emaldona at redhat.com> - 4.9-2
- Resolves: Bug 805672 - Library needs partial RELRO support added
diff --git a/sources b/sources
index 1417be9..03e36d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b4a71a23305f57b10558752e989b4769 nspr-4.9.tar.bz2
+13710cf1d7086215bee8ec3114298378 nspr-4.9.1.tar.bz2
More information about the scm-commits
mailing list