diff --git a/.gitignore b/.gitignore index 08745af..5a1a007 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/nspr-4.9.6.tar.bz2 +/nspr-4.10.tar.bz2 diff --git a/nspr-config-pc.patch b/nspr-config-pc.patch index 7f49853..2c1fe87 100644 --- a/nspr-config-pc.patch +++ b/nspr-config-pc.patch @@ -1,10 +1,6 @@ -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 +diff -up nspr/config/nspr-config.in.flags nspr/config/nspr-config.in +--- nspr/config/nspr-config.in.flags 2013-05-29 13:46:34.147971410 -0700 ++++ nspr/config/nspr-config.in 2013-05-29 14:17:10.990838914 -0700 @@ -102,7 +102,7 @@ if test -z "$includedir"; then includedir=@includedir@ fi @@ -29,14 +25,10 @@ diff -u -p -r1.8 nspr-config.in + echo $libdirs `pkg-config --variable=os_libs nspr` fi -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@ +diff -up nspr/config/nspr.pc.in.flags nspr/config/nspr.pc.in +--- nspr/config/nspr.pc.in.flags 2013-05-29 13:48:15.026643570 -0700 ++++ nspr/config/nspr.pc.in 2013-05-29 13:49:47.795202949 -0700 +@@ -6,5 +6,5 @@ includedir=@includedir@ Name: NSPR Description: The Netscape Portable Runtime Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ diff --git a/nspr.spec b/nspr.spec index 0533829..ab151d1 100644 --- a/nspr.spec +++ b/nspr.spec @@ -1,6 +1,6 @@ Summary: Netscape Portable Runtime Name: nspr -Version: 4.9.6 +Version: 4.10 Release: 1%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/nspr/ @@ -42,8 +42,8 @@ Header files for doing development with the Netscape Portable Runtime. # However, we need to use original nspr-config to produce some variables # that go into nspr.pc for pkg-config. -cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config-pc.in -%patch1 -p0 +cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in +%patch1 -p0 -b flags %build @@ -51,7 +51,7 @@ cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config- LDFLAGS+=-Wl,-z,relro export LDFLAGS -./mozilla/nsprpub/configure \ +./nspr/configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --includedir=%{_includedir}/nspr4 \ @@ -69,7 +69,7 @@ make %check # Run test suite. -perl ./mozilla/nsprpub/pr/tests/runtests.pl 2>&1 | tee output.log +perl ./nspr/pr/tests/runtests.pl 2>&1 | tee output.log TEST_FAILURES=`grep -c FAILED ./output.log` || : if [ $TEST_FAILURES -ne 0 ]; then @@ -120,6 +120,9 @@ NSPR_VERSION=`./config/nspr-config --version` %{_bindir}/nspr-config %changelog +* Wed May 29 2013 Elio Maldonado - 4.10-1 +- Update to NSPR_4_10_RTM + * Mon May 06 2013 Elio Maldonado - 4.9.6-1 - Update to NSPR_4_9_6_RTM diff --git a/sources b/sources index 73b94ae..dfd94f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e92339955ae8e5b238f860bd79cf784 nspr-4.9.6.tar.bz2 +200acfebeec7cf5055d47f09b5e705e7 nspr-4.10.tar.bz2