Attachment 593122 Details for Bug 833149 – For the record: the changes made for the nspr 4.9.1 update

[patch] For the record: the changes made for the nspr 4.9.1 update

nspr-rebase-changes.txt (text/plain), 5.74 KB, created by Elio Maldonado Batiz on 2012-06-20 04:44:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-06-20 04:44:07 UTC

Size: 5.74 KB

patch

obsolete

>diff --git a/.gitignore b/.gitignore
>index 85d1566..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..18431ab 100644
>--- a/nspr-config-pc.patch
>+++ b/nspr-config-pc.patch
>@@ -1,51 +1,10 @@
>-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
>-     includedir=@includedir@
>- fi
>- if test -z "$libdir"; then
>--    libdir=@libdir@
>-+    libdir=`pkg-config --variable=libdir nspr`
>- fi
>- 
>- if test "$echo_prefix" = "yes"; then
>-@@ -132,12 +132,12 @@ if test "$echo_libs" = "yes"; then
>-       if test -n "$lib_nspr"; then
>- 	libdirs="$libdirs -lnspr${major_version}"
>-       fi
>--      os_ldflags="@LDFLAGS@"
>-+      os_ldflags=`pkg-config --variable=ldflags nspr`
>-       for i in $os_ldflags ; do
>- 	if echo $i | grep \^-L >/dev/null; then
>- 	  libdirs="$libdirs $i"
>-         fi
>-       done
>--      echo $libdirs @OS_LIBS@
>-+      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
>+diff -up ./mozilla/nsprpub/config/nspr.pc.in.extralibs ./mozilla/nsprpub/config/nspr.pc.in
>+--- ./mozilla/nsprpub/config/nspr.pc.in.extralibs	2012-06-16 11:02:11.846447511 -0700
>++++ ./mozilla/nsprpub/config/nspr.pc.in	2012-06-16 11:05:30.578619641 -0700
>+@@ -6,5 +6,5 @@ includedir=@includedir@
>+ Name: NSPR
>+ 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: -L@libdir@/nspr4 -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@
>+ Cflags: -I@includedir@
>diff --git a/nspr-config-vars.in b/nspr-config-vars.in
>deleted file mode 100644
>index ebf0aa4..0000000
>--- a/nspr-config-vars.in
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-ldflags=@LDFLAGS@
>-os_libs=@OS_LIBS@
>diff --git a/nspr.pc.in b/nspr.pc.in
>deleted file mode 100644
>index 1d8f4a0..0000000
>--- a/nspr.pc.in
>+++ /dev/null
>@@ -1,10 +0,0 @@
>-prefix=%prefix%
>-exec_prefix=%exec_prefix%
>-libdir=%libdir%
>-includedir=%includedir%
>-
>-Name: NSPR
>-Description: The Netscape Portable Runtime
>-Version: %NSPR_VERSION%
>-Libs: %FULL_NSPR_LIBS%
>-Cflags: %FULL_NSPR_CFLAGS%
>diff --git a/nspr.spec b/nspr.spec
>index 33299e6..6b6fd3f 100644
>--- a/nspr.spec
>+++ b/nspr.spec
>@@ -1,6 +1,6 @@
> Summary:        Netscape Portable Runtime
> Name:           nspr
>-Version:        4.9
>+Version:        4.9.1
> Release:        1%{?dist}
> License:        MPLv1.1 or GPLv2+ or LGPLv2+
> URL:            http://www.mozilla.org/projects/nspr/
>@@ -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
> Patch2:         nspr-561901.patch
>@@ -47,8 +45,6 @@ cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config-
> %patch1 -p0
> %patch2 -p0
> 
>-cp %{SOURCE2} ./mozilla/nsprpub/config/
>-
> %build
> 
> # partial RELRO support as a security enhancement
>@@ -91,21 +87,7 @@ 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 \
>@@ -147,6 +129,9 @@ done
> %{_bindir}/nspr-config
> 
> %changelog
>+* Wed Jun 20 2012 Elio Maldonado <emaldona@redhat.com> - 4.9.1-1
>+- Resolves: rhbz#833149 - Update to NSPR_4_9_1_RTM
>+
> * Thu Mar 01 2012 Elio Maldonado <emaldona@redhat.com> - 4.9-1
> - Resolves: rhbz#799193 - Update to 4.9
> 
>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

Actions: View | Diff

Attachments on bug 833149: 593122