- do not look (and mkdir) to /usr/{share,lib}/mozilla for extensions (we do not use...

Changed files:
    icedove-extensiondir.patch -> 1.1
    icedove.spec -> 1.91

diff --git a/icedove-extensiondir.patch b/icedove-extensiondir.patch
new file mode 100644 (file)
index 0000000..b8487b5
--- /dev/null
+++ b/icedove-extensiondir.patch
@@ -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,

diff --git a/icedove.spec b/icedove.spec
index 740d9f1e73dbf27580fb0faa8cc00eb7fd12a276..59d400f4ceeff7f53ff0964dad592bb9ba82e010 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -33,7 +33,7 @@ Summary:      Icedove - email client
 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
@@ -56,6 +56,7 @@ Patch6:               %{name}-prefs.patch
 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
@@ -175,6 +176,7 @@ cd mozilla
 %patch7 -p1
 %patch8 -p0
 %patch9 -p0
+%patch10 -p2
 
 %build
 cd mozilla