[seamonkey] Update to 2.11

Martin Stransky stransky at fedoraproject.org
Tue Jul 17 11:16:03 UTC 2012


commit 62b8d85997f703b2d1786d10e1cb01a93d8f94bd
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Jul 17 13:15:50 2012 +0200

    Update to 2.11

 .gitignore                                     |    2 ++
 seamonkey-idl-parser-cachepath.patch           |   17 +++++++++--------
 seamonkey-nspr-prtime-header-path.patch        |   11 -----------
 seamonkey-package-manifest-file-removals.patch |   11 -----------
 seamonkey.spec                                 |   15 ++++++---------
 sources                                        |    4 ++--
 6 files changed, 19 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06838d9..07096d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,5 @@ seamonkey-2.0.6.source.tar.bz2
 /seamonkey-langpacks-2.10-20120607.tar.xz
 /seamonkey-langpacks-2.10.1-20120621.tar.xz
 /seamonkey-2.10.1.source.tar.bz2
+/seamonkey-2.11.source.tar.bz2
+/seamonkey-langpacks-2.11-20120717.tar.xz
diff --git a/seamonkey-idl-parser-cachepath.patch b/seamonkey-idl-parser-cachepath.patch
index d4a6318..8454964 100644
--- a/seamonkey-idl-parser-cachepath.patch
+++ b/seamonkey-idl-parser-cachepath.patch
@@ -1,17 +1,19 @@
---- mozilla/xpcom/idl-parser/Makefile.in.orig	2012-06-07 15:08:55.192504035 -0400
-+++ mozilla/xpcom/idl-parser/Makefile.in	2012-06-07 15:09:03.105850394 -0400
-@@ -61,7 +61,7 @@
+diff -up seamonkey-2.11/comm-release/mozilla/xpcom/idl-parser/Makefile.in.idl-parser-cachepath seamonkey-2.11/comm-release/mozilla/xpcom/idl-parser/Makefile.in
+--- seamonkey-2.11/comm-release/mozilla/xpcom/idl-parser/Makefile.in.idl-parser-cachepath	2012-07-15 14:01:03.000000000 +0200
++++ seamonkey-2.11/comm-release/mozilla/xpcom/idl-parser/Makefile.in	2012-07-17 13:06:23.001074077 +0200
+@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS)
  	$(PYTHON_PATH) \
- 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  $(PLY_INCLUDE) \
  	  -I$(topsrcdir)/xpcom/idl-parser \
 -	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
 +	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=cache --regen
  
  check::
  	$(PYTHON_PATH) \
---- mozilla/xpcom/typelib/xpidl/Makefile.in.orig	2012-06-07 17:05:20.594538497 -0400
-+++ mozilla/xpcom/typelib/xpidl/Makefile.in	2012-06-07 17:05:35.930599502 -0400
-@@ -48,8 +48,8 @@
+diff -up seamonkey-2.11/comm-release/mozilla/xpcom/typelib/xpidl/Makefile.in.idl-parser-cachepath seamonkey-2.11/comm-release/mozilla/xpcom/typelib/xpidl/Makefile.in
+--- seamonkey-2.11/comm-release/mozilla/xpcom/typelib/xpidl/Makefile.in.idl-parser-cachepath	2012-07-15 14:01:03.000000000 +0200
++++ seamonkey-2.11/comm-release/mozilla/xpcom/typelib/xpidl/Makefile.in	2012-07-17 12:57:00.267062098 +0200
+@@ -48,8 +48,8 @@ SDK_BINARY = \
    $(topsrcdir)/xpcom/idl-parser/xpidl.py \
    $(topsrcdir)/xpcom/idl-parser/header.py \
    $(topsrcdir)/xpcom/idl-parser/typelib.py \
@@ -22,4 +24,3 @@
    $(NULL)
  
  ifndef MOZ_SYSTEM_PLY
-
diff --git a/seamonkey.spec b/seamonkey.spec
index d297815..20e0e49 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -15,14 +15,14 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.10.1
+Version:        2.11
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
 
 Source0:        seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
-Source1:        seamonkey-langpacks-%{version}-20120621.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20120717.tar.xz
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
 Source7:        seamonkey-make-package.pl
@@ -37,8 +37,6 @@ Source100:      find-external-requires
 Patch1:         xulrunner-10.0-gcc47.patch
 Patch5:         seamonkey-8.0-enable-addons.patch
 Patch10:        seamonkey-idl-parser-cachepath.patch
-Patch11:        seamonkey-nspr-prtime-header-path.patch
-Patch12:        seamonkey-package-manifest-file-removals.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -108,11 +106,7 @@ cd ..
 
 %patch5 -p2 -b .addons
 pushd mozilla
-%patch10 -p1 -b .idl-parser-cachepath
-%patch11 -p1 -b .nspr-prtime-header-path
-popd
-pushd suite
-%patch12 -p1 -b .package-manifest-file-removals
+%patch10 -p3 -b .idl-parser-cachepath
 popd
 
 %{__rm} -f .mozconfig
@@ -414,6 +408,9 @@ fi
 
 
 %changelog
+* Tue Jul 27 2012 Martin Stransky <stransky at redhat.com> 2.11-1
+- Update to 2.11
+
 * Thu Jun 21 2012 Martin Stransky <stransky at redhat.com> 2.10.1-1
 - Update to 2.10.1
 
diff --git a/sources b/sources
index c625288..4da67fc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-418dfee0e894d7db6627520375ad8bbb  seamonkey-langpacks-2.10.1-20120621.tar.xz
-1c89d3657b5e2e9765391208c5f9bfda  seamonkey-2.10.1.source.tar.bz2
+807e8993f8fe4a3a42e8f63ecfb0f15d  seamonkey-2.11.source.tar.bz2
+104992ef5d30779e7d0ff63f65c0abb9  seamonkey-langpacks-2.11-20120717.tar.xz


More information about the scm-commits mailing list