packages: iceape/iceape.spec, iceape/iceape-branding.patch - 2.10 - updated...

[baggins]

Author: baggins                      Date: Wed Jun  6 15:39:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.10
- updated rebranding

---- Files affected:
packages/iceape:
   iceape.spec (1.44 -> 1.45) , iceape-branding.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/iceape/iceape.spec
diff -u packages/iceape/iceape.spec:1.44 packages/iceape/iceape.spec:1.45
--- packages/iceape/iceape.spec:1.44	Wed Jun  6 11:24:19 2012
+++ packages/iceape/iceape.spec	Wed Jun  6 17:39:48 2012
@@ -17,7 +17,7 @@
 %define		enigmail_ver	1.4.2
 %define		nspr_ver	4.9
 %define		nss_ver		3.13.3
-%define		xulrunner_ver	12.0
+%define		xulrunner_ver	13.0
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -29,16 +29,16 @@
 Summary(pl.UTF-8):	Iceape - przeglądarka WWW
 Summary(pt_BR.UTF-8):	Navegador Iceape
 Name:		iceape
-Version:	2.9.1
+Version:	2.10
 Release:	1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/seamonkey-%{version}.source.tar.bz2
-# Source0-md5:	8dd18d93a6570c3c9f3873bb177ccc6b
+# Source0-md5:	c2c41a12107a67e5eedef06d50e26c56
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5:	ed608e1cd4cd20b96f7f5afdbf081141
 Source2:	%{name}-branding.tar.bz2
-# Source2-md5:	6cbf2f0e62c042946bf351f1e2d1b256
+# Source2-md5:	a18e5112591404f3feb358d410c08c53
 Source3:	%{name}-rm_nonfree.sh
 Source4:	%{name}.desktop
 Source5:	%{name}-composer.desktop
@@ -53,6 +53,7 @@
 Patch4:		system-mozldap.patch
 Patch5:		makefile.patch
 Patch6:		system-cairo.patch
+Patch7:		system-libs.patch
 URL:		http://www.pld-linux.org/Packages/Iceape
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	OpenGL-devel
@@ -264,6 +265,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p2
 
 %build
 cd comm-release
@@ -639,18 +641,13 @@
 %endif
 
 %{_libdir}/%{name}/components/nsAbout.js
-%{_libdir}/%{name}/components/nsAboutCertError.js
-%{_libdir}/%{name}/components/nsAboutData.js
-%{_libdir}/%{name}/components/nsAboutFeeds.js
-%{_libdir}/%{name}/components/nsAboutLife.js
-%{_libdir}/%{name}/components/nsAboutRights.js
-%{_libdir}/%{name}/components/nsAboutSessionRestore.js
-%{_libdir}/%{name}/components/nsAboutSyncTabs.js
 %{_libdir}/%{name}/components/nsComposerCmdLineHandler.js
 %{_libdir}/%{name}/components/nsSuiteDownloadManagerUI.js
 %{_libdir}/%{name}/components/nsSuiteGlue.js
 %{_libdir}/%{name}/components/nsTypeAheadFind.js
 %{_libdir}/%{name}/components/smileApplication.js
+%{_libdir}/%{name}/components/ContactManager.js
+%{_libdir}/%{name}/components/messageWakeupService.js
 
 %if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
@@ -791,6 +788,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2012/06/06 15:39:48  baggins
+- 2.10
+- updated rebranding
+
 Revision 1.44  2012/06/06 09:24:19  baggins
 - rel 1
 

================================================================
Index: packages/iceape/iceape-branding.patch
diff -u packages/iceape/iceape-branding.patch:1.8 packages/iceape/iceape-branding.patch:1.9
--- packages/iceape/iceape-branding.patch:1.8	Tue Jun  5 15:08:39 2012
+++ packages/iceape/iceape-branding.patch	Wed Jun  6 17:39:48 2012
@@ -122,3 +122,14 @@
      <em:description>A contemporary theme for all components.</em:description>
  
      <!-- EXTENSION AUTHORS!
+--- comm-release/suite/installer/package-manifest.in~	2012-06-05 07:50:28.000000000 +0200
++++ comm-release/suite/installer/package-manifest.in	2012-06-06 14:55:27.764056749 +0200
+@@ -480,8 +480,6 @@
+ @BINPATH@/chrome/icons/default/main-window.png
+ @BINPATH@/chrome/icons/default/main-window16.png
+ @BINPATH@/chrome/icons/default/main-window48.png
+- at 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/iceape/iceape.spec?r1=1.44&r2=1.45
    http://cvs.pld-linux.org/packages/iceape/iceape-branding.patch?r1=1.8&r2=1.9