Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:11.4 checked in at Wed Mar 14 17:36:59 CET 2012. -------- --- old-versions/11.4/UPDATES/all/mozilla-nspr/mozilla-nspr.changes 2011-08-12 22:28:25.000000000 +0200 +++ 11.4/mozilla-nspr/mozilla-nspr.changes 2012-02-17 09:34:28.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Feb 16 08:22:35 UTC 2012 - wr@rosenauer.org + +- update to version 4.9 RTM +- added testsuite in %check + +------------------------------------------------------------------- +Wed Sep 21 09:01:27 UTC 2011 - wr@rosenauer.org + +- some spec file cleanup +- override the build time detection and use the last change time + instead to incorporate into the build + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- nspr-4.8.9.tar.bz2 New: ---- nspr-4.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.6JTafj/_old 2012-03-14 17:36:45.000000000 +0100 +++ /var/tmp/diff_new_pack.6JTafj/_new 2012-03-14 17:36:45.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package mozilla-nspr # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2011 Wolfgang Rosenauer +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 2006-2012 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: mozilla-nspr -BuildRequires: gcc-c++ pkg-config -License: MPLv1.1 or GPLv2+ or LGPLv2.1+ -Version: 4.8.9 -Release: 1.<RELEASE2> +Version: 4.9.0 +Release: 0.<RELEASE2> Summary: Netscape Portable Runtime +License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ +Group: System/Libraries Url: http://www.mozilla.org/projects/nspr/ +BuildRequires: gcc-c++ +BuildRequires: pkg-config # bug437293 %ifarch ppc64 Obsoletes: mozilla-nspr-64bit %endif # -Group: System/Libraries Source: ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar.bz2 Source1: baselibs.conf -Patch3: pkgconfig.patch +Patch: pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,7 +45,7 @@ %package devel -License: MPLv1.1 or GPLv2+ or LGPLv2.1+ + Summary: Netscape Portable Runtime development files Group: Development/Libraries/Other Requires: mozilla-nspr = %{version} @@ -65,11 +65,16 @@ %prep %setup -n nspr-%{version} -q cd mozilla -%patch3 -p2 +%patch -p2 %build +# set buildtime to "last-modification-time" +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +BUILD_STRING="$(date -u -d "${modified}" "+%%F %%T")" +BUILD_TIME="$(date -u -d "${modified}" "+%%s000000")" +# cd mozilla/nsprpub -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" ./configure --enable-optimize="$CFLAGS" \ --disable-debug \ %ifarch x86_64 @@ -78,23 +83,33 @@ --libdir=%{_libdir} \ --includedir=%{_includedir}/nspr4 \ --prefix=%{_prefix} -make %{?jobs:-j%jobs} +make SH_DATE="$BUILD_STRING" SH_NOW="$BUILD_TIME" %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/nspr -mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig -mkdir -p $RPM_BUILD_ROOT%{_includedir}/nspr4 -cp mozilla/nsprpub/config/nspr-config $RPM_BUILD_ROOT%{_bindir}/ -cp mozilla/nsprpub/config/nspr.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig -cp -L mozilla/nsprpub/dist/lib/*.so $RPM_BUILD_ROOT/%{_libdir} -cp -L mozilla/nsprpub/dist/lib/*.a $RPM_BUILD_ROOT/%{_libdir}/nspr/ -cp -rL mozilla/nsprpub/dist/include/nspr/* $RPM_BUILD_ROOT/%{_includedir}/nspr4/ +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_libdir}/nspr +mkdir -p %{buildroot}%{_libdir}/pkgconfig +mkdir -p %{buildroot}%{_includedir}/nspr4 +cp mozilla/nsprpub/config/nspr-config %{buildroot}%{_bindir}/ +cp mozilla/nsprpub/config/nspr.pc %{buildroot}%{_libdir}/pkgconfig +cp -L mozilla/nsprpub/dist/lib/*.so %{buildroot}%{_libdir} +cp -L mozilla/nsprpub/dist/lib/*.a %{buildroot}%{_libdir}/nspr/ +cp -rL mozilla/nsprpub/dist/include/nspr/* %{buildroot}%{_includedir}/nspr4/ # #31667 -chmod -x $RPM_BUILD_ROOT/%{_includedir}/nspr4/prvrsion.h +chmod -x %{buildroot}%{_includedir}/nspr4/prvrsion.h + +%check +# Run test suite +perl ./mozilla/nsprpub/pr/tests/runtests.pl 2>&1 | tee output.log +TEST_FAILURES=`grep -c FAILED ./output.log` || : +if [ $TEST_FAILURES -ne 0 ]; then + echo "error: test suite returned failure(s)" + exit 1 +fi +echo "test suite completed" %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig ++++++ nspr-4.8.9.tar.bz2 -> nspr-4.9.0.tar.bz2 ++++++ ++++ 8052 lines of diff (skipped) ++++++ pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.6JTafj/_old 2012-03-14 17:36:46.000000000 +0100 +++ /var/tmp/diff_new_pack.6JTafj/_new 2012-03-14 17:36:46.000000000 +0100 @@ -1,7 +1,7 @@ -diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in nspr-4.5.99/mozilla/nsprpub/config/Makefile.in ---- nspr-4.5.99.old/mozilla/nsprpub/config/Makefile.in 2005-05-03 11:16:45.000000000 +0200 -+++ nspr-4.5.99/mozilla/nsprpub/config/Makefile.in 2005-05-18 12:05:53.000000000 +0200 -@@ -52,9 +52,9 @@ +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/config/Makefile.in nspr-4.9.0.new/mozilla/nsprpub/config/Makefile.in +--- nspr-4.9.0/mozilla/nsprpub/config/Makefile.in 2009-05-20 21:54:24.000000000 +0200 ++++ nspr-4.9.0.new/mozilla/nsprpub/config/Makefile.in 2012-02-04 11:24:45.216139811 +0100 +@@ -52,9 +52,9 @@ VISIBILITY_FLAGS = # autoconf.mk must be deleted last (from the top-level directory) # because it is included by every makefile. @@ -13,7 +13,7 @@ include $(topsrcdir)/config/config.mk -@@ -139,6 +139,7 @@ +@@ -135,6 +135,7 @@ endef export:: $(TARGETS) rm -f $(dist_bindir)/nspr-config @@ -21,9 +21,9 @@ ifdef WRAP_SYSTEM_INCLUDES export:: -diff -urN nspr-4.5.99.old/mozilla/nsprpub/config/nspr.pc.in nspr-4.5.99/mozilla/nsprpub/config/mozilla-nspr.pc.in ---- nspr-4.5.99.old/mozilla/nsprpub/config/nspr.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ nspr-4.5.99/mozilla/nsprpub/config/nspr.pc.in 2005-05-18 12:03:36.000000000 +0200 +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/config/nspr.pc.in nspr-4.9.0.new/mozilla/nsprpub/config/nspr.pc.in +--- nspr-4.9.0/mozilla/nsprpub/config/nspr.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ nspr-4.9.0.new/mozilla/nsprpub/config/nspr.pc.in 2012-02-04 11:24:45.216139811 +0100 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -37,25 +37,25 @@ +Cflags: -I${includedir} + + -diff -urN nspr-4.5.99.old/mozilla/nsprpub/configure nspr-4.5.99/mozilla/nsprpub/configure ---- nspr-4.5.99.old/mozilla/nsprpub/configure 2005-05-13 09:33:07.000000000 +0200 -+++ nspr-4.5.99/mozilla/nsprpub/configure 2005-05-18 12:07:00.000000000 +0200 -@@ -5718,6 +5718,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -urN nspr-4.5.99.old/mozilla/nsprpub/configure.in nspr-4.5.99/mozilla/nsprpub/configure.in ---- nspr-4.5.99.old/mozilla/nsprpub/configure.in 2005-05-13 09:33:07.000000000 +0200 -+++ nspr-4.5.99/mozilla/nsprpub/configure.in 2005-05-18 12:06:42.000000000 +0200 -@@ -2569,6 +2569,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/configure nspr-4.9.0.new/mozilla/nsprpub/configure +--- nspr-4.9.0/mozilla/nsprpub/configure 2012-02-04 10:59:12.000000000 +0100 ++++ nspr-4.9.0.new/mozilla/nsprpub/configure 2012-02-04 11:26:29.135863171 +0100 +@@ -6694,6 +6694,7 @@ MAKEFILES=" + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++ config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +diff -uprN '--exclude=CVS' nspr-4.9.0/mozilla/nsprpub/configure.in nspr-4.9.0.new/mozilla/nsprpub/configure.in +--- nspr-4.9.0/mozilla/nsprpub/configure.in 2012-02-04 10:59:12.000000000 +0100 ++++ nspr-4.9.0.new/mozilla/nsprpub/configure.in 2012-02-04 11:26:01.873276991 +0100 +@@ -3357,6 +3357,7 @@ MAKEFILES=" + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++ config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org