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-nspr-prtime-header-path.patch b/seamonkey-nspr-prtime-header-path.patch deleted file mode 100644 index abfa096..0000000 --- a/seamonkey-nspr-prtime-header-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/hal/sandbox/PHal.ipdl.orig 2012-06-07 17:18:15.219021395 -0400 -+++ mozilla/hal/sandbox/PHal.ipdl 2012-06-07 17:18:03.958964097 -0400 -@@ -39,7 +39,7 @@ - - include protocol PContent; - include protocol PBrowser; --include "nspr/prtime.h"; -+include "prtime.h"; - include "mozilla/HalSensor.h"; - include "mozilla/HalTypes.h"; - diff --git a/seamonkey-package-manifest-file-removals.patch b/seamonkey-package-manifest-file-removals.patch deleted file mode 100644 index a2bb428..0000000 --- a/seamonkey-package-manifest-file-removals.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up suite/installer/package-manifest.in.package-manifest-file-removals suite/installer/package-manifest.in ---- suite/installer/package-manifest.in.package-manifest-file-removals 2012-06-15 14:00:35.000000000 +0200 -+++ suite/installer/package-manifest.in 2012-06-25 08:14:41.955305912 +0200 -@@ -249,7 +249,6 @@ - @BINPATH@/components/necko_strconv.xpt - @BINPATH@/components/necko_viewsource.xpt - @BINPATH@/components/necko_websocket.xpt --@BINPATH@/components/necko_wifi.xpt - @BINPATH@/components/necko_wyciwyg.xpt - #ifdef MOZ_ENABLE_GNOMEVFS - @BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ 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 2.11-1 +- Update to 2.11 + * Thu Jun 21 2012 Martin Stransky 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