diff --git a/.cvsignore b/.cvsignore index a844a48..c423f96 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -nspr-4.7.3.tar.bz2 +nspr-4.7.4.tar.bz2 diff --git a/nspr-bug-487844.patch b/nspr-bug-487844.patch deleted file mode 100644 index 5cdc1dd..0000000 --- a/nspr-bug-487844.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: mozilla/nsprpub/pr/src/misc/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/Makefile.in,v -retrieving revision 1.20 -diff -u -u -8 -r1.20 Makefile.in ---- mozilla/nsprpub/pr/src/misc/Makefile.in 7 Feb 2009 03:37:28 -0000 1.20 -+++ mozilla/nsprpub/pr/src/misc/Makefile.in 4 Mar 2009 00:50:16 -0000 -@@ -95,16 +95,31 @@ - @$(MAKE_OBJDIR) - ifeq (,$(filter-out 1100 1200 1300 1310,$(MSC_VER))) - $(CC) -Fo$@ -c $(CFLAGS) -Op $(call abspath,$<) - else - $(CC) -Fo$@ -c $(CFLAGS) -fp:precise $(call abspath,$<) - endif - endif - -+# Need -fno-strict-aliasing because prdtoa.c violates strict aliasing rules -+# (bug 439144). -+# -+# The dtoa.c test program won't pass without -ffloat-store in optimized -+# builds, but I don't know why (may be related to bug 270502). -+ifeq ($(OS_TARGET),Linux) -+$(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c -+ @$(MAKE_OBJDIR) -+ifdef NEED_ABSOLUTE_PATH -+ $(CC) -o $@ -c $(CFLAGS) -ffloat-store -fno-strict-aliasing $(call abspath,$<) -+else -+ $(CC) -o $@ -c $(CFLAGS) -ffloat-store -fno-strict-aliasing $< -+endif -+endif -+ - # - # Generate prerr.h, prerr.c, and prerr.properties from prerr.et. - # - build_prerr: - cd $(srcdir); $(PERL) compile-et.pl prerr.et - - export:: $(TARGETS) - diff --git a/nspr.spec b/nspr.spec index ca4b522..71acf9d 100644 --- a/nspr.spec +++ b/nspr.spec @@ -1,7 +1,7 @@ Summary: Netscape Portable Runtime Name: nspr -Version: 4.7.3 -Release: 5%{?dist} +Version: 4.7.4 +Release: 1%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/nspr/ Group: System Environment/Libraries @@ -15,7 +15,6 @@ Source1: nspr.pc.in Source2: nspr-config-vars.in Patch1: nspr-config-pc.patch -Patch2: nspr-bug-487844.patch %description NSPR provides platform independence for non-GUI operating system @@ -45,7 +44,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 -%patch2 -p0 cp %{SOURCE2} ./mozilla/nsprpub/config/ @@ -133,6 +131,9 @@ done %{_bindir}/nspr-config %changelog +* Fri Jun 05 2009 Kai Engert - 4.7.4-1 +- update to 4.7.4 + * Wed Mar 04 2009 Kai Engert - 4.7.3-5 - add a workaround for bug 487844 diff --git a/sources b/sources index c9bdb95..df70134 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb7726c78ebd4847463427102b4c11c2 nspr-4.7.3.tar.bz2 +468ee1c64ba80376c69f84143fa74b44 nspr-4.7.4.tar.bz2