packages: icedove/icedove.spec, icedove/icedove-branding.patch, icedove/ice...

zawadaa zawadaa at pld-linux.org
Tue Feb 14 16:46:40 CET 2012 

Author: zawadaa                      Date: Tue Feb 14 15:46:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 10.0.1

---- Files affected:
packages/icedove:
   icedove.spec (1.142 -> 1.143) , icedove-branding.patch (1.22 -> 1.23) , icedove-install.patch (1.6 -> 1.7) , icedove-extensiondir.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.142 packages/icedove/icedove.spec:1.143
--- packages/icedove/icedove.spec:1.142	Mon Feb 13 06:53:57 2012
+++ packages/icedove/icedove.spec	Tue Feb 14 16:46:35 2012
@@ -21,13 +21,13 @@
 %undefine	crashreporter
 %endif
 
-%define		enigmail_ver	1.3.4
+%define		enigmail_ver	1.3.5
 %define		nspr_ver	4.8.8
 %define		nss_ver		3.12.10
 
 # convert firefox release number to platform version: 9.0.x -> 9.0.x
-%define		xulrunner_main	9.0
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#9.0})
+%define		xulrunner_main	10.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#10.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -37,14 +37,14 @@
 Summary:	Icedove - email client
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
-Version:	9.0.1
-Release:	2
+Version:	10.0.1
+Release:	1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
-# Source0-md5:	a5904751dbd33074682b438b732fdbab
+# Source0-md5:	623c32d9deae370383e1422b1ea48061
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5:	2b5f188791811d248b6ff1fc51a5806a
+# Source1-md5:	1b008b0d106e238c11e4bead08126bc0
 Source2:	%{name}-branding.tar.bz2
 # Source2-md5:	2da351522bdd7f4a3bd8aaff4c776976
 Source3:	%{name}-rm_nonfree.sh
@@ -59,7 +59,7 @@
 Patch6:		%{name}-prefs.patch
 Patch7:		system-mozldap.patch
 Patch8:		%{name}-makefile.patch
-Patch9:		%{name}-libpng.patch
+#Patch9:		%{name}-libpng.patch
 Patch10:	%{name}-extensiondir.patch
 Patch11:	crashreporter.patch
 Patch12:	no-subshell.patch
@@ -199,7 +199,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
-%patch9 -p1
+#%patch9 -p1
 %patch10 -p2
 %patch11 -p2
 %patch12 -p1
@@ -561,6 +561,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.143  2012/02/14 15:46:35  zawadaa
+- up to 10.0.1
+
 Revision 1.142  2012/02/13 05:53:57  arekm
 - release 2
 

================================================================
Index: packages/icedove/icedove-branding.patch
diff -u packages/icedove/icedove-branding.patch:1.22 packages/icedove/icedove-branding.patch:1.23
--- packages/icedove/icedove-branding.patch:1.22	Sat Sep 17 15:39:16 2011
+++ packages/icedove/icedove-branding.patch	Tue Feb 14 16:46:35 2012
@@ -64,19 +64,19 @@
  
  // Controls enabling of the extension system logging (can reduce performance)
  pref("extensions.logging.enabled", false);
-@@ -138,10 +138,10 @@
+@@ -145,10 +145,10 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
 -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
 -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
 +pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
 +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
-+pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
 +pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
- 
+
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
 @@ -165,7 +165,7 @@

================================================================
Index: packages/icedove/icedove-install.patch
diff -u packages/icedove/icedove-install.patch:1.6 packages/icedove/icedove-install.patch:1.7
--- packages/icedove/icedove-install.patch:1.6	Sat Aug 27 01:48:02 2011
+++ packages/icedove/icedove-install.patch	Tue Feb 14 16:46:35 2012
@@ -72,12 +72,3 @@
    -DAB_CD=$(AB_CD) \
    -DGRE_MILESTONE=$(GRE_MILESTONE) \
    -DGRE_BUILDID=$(GRE_BUILDID) \
-@@ -359,7 +359,7 @@
- endif
- 	mkdir -p $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
- 	rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
--	cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns
-+	cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/branding/$(MOZ_APP_NAME).icns
- 	printf APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
- #       remove CVS dirs from packaged app
- 	find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;

================================================================
Index: packages/icedove/icedove-extensiondir.patch
diff -u packages/icedove/icedove-extensiondir.patch:1.1 packages/icedove/icedove-extensiondir.patch:1.2
--- packages/icedove/icedove-extensiondir.patch:1.1	Tue Aug 17 14:51:47 2010
+++ packages/icedove/icedove-extensiondir.patch	Tue Feb 14 16:46:35 2012
@@ -1,17 +1,17 @@
 --- icedove-3.1.2/mozilla/mozilla/toolkit/xre/nsXREDirProvider.cpp~	2010-08-03 02:28:31.000000000 +0300
 +++ icedove-3.1.2/mozilla/mozilla/toolkit/xre/nsXREDirProvider.cpp	2010-08-17 15:46:17.972676534 +0300
-@@ -320,7 +320,7 @@
- #endif
+@@ -328,7 +328,7 @@
  #if defined(XP_UNIX) && !defined(XP_MACOSX)
    else if (!strcmp(aProperty, XRE_SYS_SHARE_EXTENSION_PARENT_DIR)) {
+ #ifdef ENABLE_SYSTEM_EXTENSION_DIRS
 -    static const char *const sysLExtDir = "/usr/share/mozilla/extensions";
 +    static const char *const sysLExtDir = "/usr/share/icedove/extensions";
      return NS_NewNativeLocalFile(nsDependentCString(sysLExtDir),
-                                  PR_FALSE, (nsILocalFile**)(nsIFile**) aFile);
-   }
-@@ -1231,9 +1231,9 @@
+                                  false, (nsILocalFile**)(nsIFile**) aFile);
+ #else
+@@ -1129,9 +1129,9 @@
  #elif defined(XP_UNIX)
-   static const char *const sysSExtDir = 
+   static const char *const sysSExtDir =
  #ifdef HAVE_USR_LIB64_DIR
 -    "/usr/lib64/mozilla/extensions";
 +    "/usr/lib64/icedove/extensions";
@@ -19,5 +19,6 @@
 -    "/usr/lib/mozilla/extensions";
 +    "/usr/lib/icedove/extensions";
  #endif
- 
-   rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), PR_FALSE,
+
+   rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), false,
+  rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), PR_FALSE,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.142&r2=1.143&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove-branding.patch?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove-install.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove-extensiondir.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list