Attachment 910794 Details for Bug 1110857 – changes needed to rebase to nspr-4.8.6 - in patch format

[patch] changes needed to rebase to nspr-4.8.6 - in patch format

nsprchanges.patch (text/plain), 2.02 KB, created by Elio Maldonado Batiz on 2014-06-20 14:39:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-06-20 14:39:34 UTC

Size: 2.02 KB

patch

obsolete

>diff --git a/.gitignore b/.gitignore
>index ce4ed80..f08262e 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1 @@
>-/nspr-4.10.2.tar.bz2
>+/nspr-4.10.6.tar.bz2
>diff --git a/nspr.spec b/nspr.spec
>index 8fe579b..7f8aae0 100644
>--- a/nspr.spec
>+++ b/nspr.spec
>@@ -1,18 +1,20 @@
> Summary:	Netscape Portable Runtime
> Name:		nspr
>-Version:	4.10.2
>-Release:	3%{?dist}
>+Version:	4.10.6
>+Release:	1%{?dist}
> License:	MPLv2.0
> URL:		http://www.mozilla.org/projects/nspr/
> Group:		System Environment/Libraries
> BuildRoot:	%{_tmppath}/%{name}-%{version}-root
> 
>-# Sources available at ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/
>-# 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
>+# Sources available at https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/
>+# When hg tag based snapshots are being used, refer to documentation at
>+# https://wiki.mozilla.org/NSS:UsingHG and check out https://hg.mozilla.org/projects/nspr
>+Source0:        %{name}-%{version}.tar.bz2
> 
> Patch1:         nspr-config-pc.patch
>+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=853902
>+Patch2:         nspr-561901.patch
> 
> Provides:	mozilla-nspr
> Obsoletes:	mozilla-nspr
>@@ -46,6 +48,7 @@ Header files for doing development with the Netscape Portable Runtime.
> 
> cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in
> %patch1 -p0 -b .flags
>+%patch2 -p0
> 
> %build
> 
>@@ -115,6 +118,10 @@ NSPR_VERSION=`./config/nspr-config --version`
> %{_bindir}/nspr-config
> 
> %changelog
>+* Wed Jun 18 2014 Elio Maldonado <emaldona@redhat.com> - 4.10.6-1
>+- Rebase to nspr-4.10.6
>+- Resolves: Bug 1110857 - Rebase nspr in RHEL 5.11 to NSPR 4.10.6 for FF31
>+
> * Sat Nov 23 2013 Elio Maldonado <emaldona@redhat.com> - 4.10.2-3
> - Retagging
> - Resolves: rhbz#1032468
>diff --git a/sources b/sources
>index 5f0f7cf..cd9711f 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-27680bf02c06afdf2dc2bec848685757  nspr-4.10.2.tar.bz2
>+14c0186ddf102577f02092164e4cde8e  nspr-4.10.6.tar.bz2

Actions: View | Diff

Attachments on bug 1110857: 910794