Author: qboosh Date: Sun Jun 3 08:10:18 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 4.9.1 - upstream now installs nspr.pc, so use it instead of additional source; added pc patch to provide Libs.private, include mozilla-nspr.pc symlink for compatibility
---- Files affected: packages/nspr: nspr.spec (1.73 -> 1.74) , nspr-pc.patch (NONE -> 1.1) (NEW), nspr-mozilla-nspr.pc (1.4 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/nspr/nspr.spec diff -u packages/nspr/nspr.spec:1.73 packages/nspr/nspr.spec:1.74 --- packages/nspr/nspr.spec:1.73 Wed Feb 22 20:22:44 2012 +++ packages/nspr/nspr.spec Sun Jun 3 10:10:13 2012 @@ -2,16 +2,16 @@ Summary: Netscape Portable Runtime (NSPR) Summary(pl.UTF-8): PrzenoĊne biblioteki uruchomieniowe Netscape Name: nspr -Version: 4.9 +Version: 4.9.1 Release: 1 Epoch: 1 License: MPL v1.1 or GPL v2+ or LGPL v2.1+ Group: Libraries Source0: http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz -# Source0-md5: aa0c960b23a9d66a3c30c3e6ba80a99a -Source1: %{name}-mozilla-nspr.pc +# Source0-md5: d36d7b65a38f5b43ebd50ad3ad227120 Patch0: %{name}-acfix.patch Patch1: %{name}-sparc64.patch +Patch2: %{name}-pc.patch URL: http://www.mozilla.org/projects/nspr/ BuildRequires: autoconf >= 2.12 BuildRequires: automake @@ -57,8 +57,7 @@ %setup -q %patch0 -p1 %patch1 -p0 - -install %{SOURCE1} mozilla/nsprpub/nspr-mozilla-nspr.pc.in +%patch2 -p1 # Win32-specific, requires autoconf2.13 %{__rm} mozilla/nsprpub/build/autoconf/acwinpaths.m4 \ @@ -81,8 +80,6 @@ %{__make} -./config.status --file=nspr-mozilla-nspr.pc - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_pkgconfigdir} @@ -90,9 +87,8 @@ %{__make} -C mozilla/nsprpub install \ DESTDIR=$RPM_BUILD_ROOT -install mozilla/nsprpub/nspr-mozilla-nspr.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nspr.pc - -ln -s mozilla-nspr.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/nspr.pc +# for compatibility (upstream installs only nspr.nc); to be dropped sometime? +ln -s nspr.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nspr.pc %{__rm} $RPM_BUILD_ROOT%{_bindir}/{compile-et.pl,prerr.properties} @@ -128,6 +124,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.74 2012/06/03 08:10:13 qboosh +- updated to 4.9.1 +- upstream now installs nspr.pc, so use it instead of additional source; + added pc patch to provide Libs.private, include mozilla-nspr.pc symlink for compatibility + Revision 1.73 2012/02/22 19:22:44 qboosh - updated to 4.9 - updated acfix patch ================================================================ Index: packages/nspr/nspr-pc.patch diff -u /dev/null packages/nspr/nspr-pc.patch:1.1 --- /dev/null Sun Jun 3 10:10:18 2012 +++ packages/nspr/nspr-pc.patch Sun Jun 3 10:10:13 2012 @@ -0,0 +1,8 @@ +--- nspr-4.9.1/mozilla/nsprpub/config/nspr.pc.in.orig 2012-05-19 00:26:17.000000000 +0200 ++++ nspr-4.9.1/mozilla/nsprpub/config/nspr.pc.in 2012-06-03 08:08:25.428360499 +0200 +@@ -7,4 +7,5 @@ + Description: The Netscape Portable Runtime + Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ + Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ ++Libs.private: -lpthread -ldl + Cflags: -I@includedir@ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/nspr/nspr.spec?r1=1.73&r2=1.74 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
