[seamonkey] Update to 2.10

Martin Stransky stransky at fedoraproject.org
Wed Jun 13 07:23:08 UTC 2012 

commit 3b007045be8ddf16902c5c7a0443f2b71aeb94d2
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Wed Jun 13 09:23:01 2012 +0200

    Update to 2.10

 mozilla-733867-x.patch                         |  265 ------------------------
 mozilla-file.patch                             |   26 ---
 seamonkey-idl-parser-cachepath.patch           |   25 +++
 seamonkey-nspr-prtime-header-path.patch        |   11 +
 seamonkey-package-manifest-file-removals.patch |   45 ++++
 seamonkey.spec                                 |   27 ++-
 6 files changed, 100 insertions(+), 299 deletions(-)
---
diff --git a/seamonkey-idl-parser-cachepath.patch b/seamonkey-idl-parser-cachepath.patch
new file mode 100644
index 0000000..d4a6318
--- /dev/null
+++ b/seamonkey-idl-parser-cachepath.patch
@@ -0,0 +1,25 @@
+--- 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 @@
+ 	$(PYTHON_PATH) \
+ 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  -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 @@
+   $(topsrcdir)/xpcom/idl-parser/xpidl.py \
+   $(topsrcdir)/xpcom/idl-parser/header.py \
+   $(topsrcdir)/xpcom/idl-parser/typelib.py \
+-  $(DEPTH)/xpcom/idl-parser/xpidllex.py \
+-  $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \
++  $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \
++  $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \
+   $(NULL)
+ 
+ ifndef MOZ_SYSTEM_PLY
+
diff --git a/seamonkey-nspr-prtime-header-path.patch b/seamonkey-nspr-prtime-header-path.patch
new file mode 100644
index 0000000..abfa096
--- /dev/null
+++ b/seamonkey-nspr-prtime-header-path.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..66887c0
--- /dev/null
+++ b/seamonkey-package-manifest-file-removals.patch
@@ -0,0 +1,45 @@
+--- suite/installer/package-manifest.in.orig	2012-06-07 17:52:41.640238133 -0400
++++ suite/installer/package-manifest.in	2012-06-07 17:54:32.007774715 -0400
+@@ -61,9 +61,6 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX at mozjs@DLL_SUFFIX@
+ #endif
+- at BINPATH@/@DLL_PREFIX at nspr4@DLL_SUFFIX@
+- at BINPATH@/@DLL_PREFIX at plc4@DLL_SUFFIX@
+- at BINPATH@/@DLL_PREFIX at plds4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX at xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+@@ -245,7 +242,6 @@
+ @BINPATH@/components/necko_strconv.xpt
+ @BINPATH@/components/necko_viewsource.xpt
+ @BINPATH@/components/necko_websocket.xpt
+- at BINPATH@/components/necko_wifi.xpt
+ @BINPATH@/components/necko_wyciwyg.xpt
+ #ifdef MOZ_ENABLE_GNOMEVFS
+ @BINPATH@/components/@DLL_PREFIX at nkgnomevfs@DLL_SUFFIX@
+@@ -481,7 +477,6 @@
+ @BINPATH@/chrome/icons/default/main-window16.png
+ @BINPATH@/chrome/icons/default/main-window48.png
+ @BINPATH@/chrome/icons/default/seamonkey.png
+- at BINPATH@/icons/updater.png
+ #elifdef WIN_OR_OS2
+ @BINPATH@/chrome/icons/default/bmPropsWindow.ico
+ @BINPATH@/chrome/icons/default/bookmark-window.ico
+@@ -575,16 +570,6 @@
+ ; NSS libraries are signed in the staging directory,
+ ; meaning their .chk files are created there directly.
+ ;
+- at BINPATH@/@DLL_PREFIX at freebl3@DLL_SUFFIX@
+- at BINPATH@/@DLL_PREFIX at nss3@DLL_SUFFIX@
+- at BINPATH@/@DLL_PREFIX at nssckbi@DLL_SUFFIX@
+-#ifndef NSS_DISABLE_DBM
+- at BINPATH@/@DLL_PREFIX at nssdbm3@DLL_SUFFIX@
+-#endif
+- at BINPATH@/@DLL_PREFIX at nssutil3@DLL_SUFFIX@
+- at BINPATH@/@DLL_PREFIX at smime3@DLL_SUFFIX@
+- at BINPATH@/@DLL_PREFIX at softokn3@DLL_SUFFIX@
+- at BINPATH@/@DLL_PREFIX at ssl3@DLL_SUFFIX@
+ @BINPATH@/chrome/pippki at JAREXT@
+ @BINPATH@/chrome/pippki.manifest
+ @BINPATH@/components/pipboot.xpt
diff --git a/seamonkey.spec b/seamonkey.spec
index 65e7b3b..53dca29 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.9.1
-Release:        4%{?dist}
+Version:        2.10
+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}-20120502.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20120607.tar.xz
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
 Source7:        seamonkey-make-package.pl
@@ -36,8 +36,9 @@ Source100:      find-external-requires
 
 Patch1:         xulrunner-10.0-gcc47.patch
 Patch5:         seamonkey-8.0-enable-addons.patch
-Patch8:         mozilla-733867-x.patch
-Patch9:         mozilla-file.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}
@@ -107,9 +108,12 @@ cd ..
 
 %patch5 -p2 -b .addons
 pushd mozilla
-%patch9 -p1 -b .file
+%patch10 -p1 -b .idl-parser-cachepath
+%patch11 -p1 -b .nspr-prtime-header-path
+popd
+pushd suite
+%patch12 -p1 -b .package-manifest-file-removals
 popd
-%patch8 -p1 -b .733867
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -226,7 +230,7 @@ echo > ../%{name}.lang
 %{__mkdir_p} $RPM_BUILD_ROOT/%{mozdir}/extensions
 %{__tar} xf %{SOURCE1}
 for langpack in `ls seamonkey-langpacks/*.xpi`; do
-  language=$(basename $langpack .xpi | sed 's/^seamonkey-//' | sed 's/\.langpack$//' | sed 's/\([0-9]\.\)*//')
+  language=$(basename $langpack .xpi | sed 's/^seamonkey-//' | sed 's/\.langpack$//' | sed 's/\([0-9]\{1,2\}\.\)*//')
   extensiondir=$RPM_BUILD_ROOT/%{mozdir}/extensions/langpack-$language at seamonkey.mozilla.org
   %{__mkdir_p} $extensiondir
   unzip $langpack -d $extensiondir
@@ -410,6 +414,13 @@ fi
 
 
 %changelog
+* Thu Jun 7 2012 Allen Hewes <allen at decisiv.net> 2.10-1
+- Update to 2.10
+- change sed string for version number to support 2 digits
+- remove specific .so's from installer manifest
+- fix the cache path for header.py and associated files when building
+  in srcdir (vs using seperate objdir)
+
 * Mon May 7 2012 Martin Stransky <stransky at redhat.com> 2.9.1-4
 - Fixed #717242 - does not adhere to Static Library Packaging Guidelines

More information about the scm-commits mailing list