packages: icedove/icedove.spec, icedove/icedove-extensiondir.patch (NEW) - ...

[glen]

Author: glen                         Date: Tue Aug 17 12:51:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not look (and mkdir) to /usr/{share,lib}/mozilla for extensions (we do not use share place yet in pld)

---- Files affected:
packages/icedove:
   icedove.spec (1.90 -> 1.91) , icedove-extensiondir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.90 packages/icedove/icedove.spec:1.91
--- packages/icedove/icedove.spec:1.90	Tue Aug 17 13:51:31 2010
+++ packages/icedove/icedove.spec	Tue Aug 17 14:51:47 2010
@@ -34,7 +34,7 @@
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
 Version:	3.1.2
-Release:	0.4
+Release:	0.5
 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
@@ -57,6 +57,7 @@
 Patch7:		system-mozldap.patch
 Patch8:		%{name}-makefile.patch
 Patch9:		%{name}-libpng.patch
+Patch10:	%{name}-extensiondir.patch
 URL:		http://www.pld-linux.org/Packages/Icedove
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
@@ -176,6 +177,7 @@
 %patch7 -p1
 %patch8 -p0
 %patch9 -p0
+%patch10 -p2
 
 %build
 cd mozilla
@@ -456,6 +458,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2010/08/17 12:51:47  glen
+- do not look (and mkdir) to /usr/{share,lib}/mozilla for extensions (we do not use share place yet in pld)
+
 Revision 1.90  2010/08/17 11:51:31  glen
 - package enigmail files manually
 - add ghost .dat files

================================================================
Index: packages/icedove/icedove-extensiondir.patch
diff -u /dev/null packages/icedove/icedove-extensiondir.patch:1.1
--- /dev/null	Tue Aug 17 14:51:53 2010
+++ packages/icedove/icedove-extensiondir.patch	Tue Aug 17 14:51:47 2010
@@ -0,0 +1,23 @@
+--- 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
+ #if defined(XP_UNIX) && !defined(XP_MACOSX)
+   else if (!strcmp(aProperty, XRE_SYS_SHARE_EXTENSION_PARENT_DIR)) {
+-    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 @@
+ #elif defined(XP_UNIX)
+   static const char *const sysSExtDir = 
+ #ifdef HAVE_USR_LIB64_DIR
+-    "/usr/lib64/mozilla/extensions";
++    "/usr/lib64/icedove/extensions";
+ #else
+-    "/usr/lib/mozilla/extensions";
++    "/usr/lib/icedove/extensions";
+ #endif
+ 
+   rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), PR_FALSE,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.90&r2=1.91&f=u