Author: qboosh Date: Tue Mar 20 14:09:41 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- merged update to 10.0.2 from icedove.spec
---- Files affected:
packages/mozilla-thunderbird:
mozilla-thunderbird-enigmail-shared.patch (1.1 -> 1.2) ,
mozilla-thunderbird-fonts.patch (1.2 -> 1.3) ,
mozilla-thunderbird-install.patch (1.1 -> 1.2) , mozilla-thunderbird.desktop
(1.7 -> 1.8) , mozilla-thunderbird.spec (1.131 -> 1.132) ,
mozilla-thunderbird-crashreporter.patch (NONE -> 1.1) (NEW),
mozilla-thunderbird-hunspell.patch (NONE -> 1.1) (NEW),
mozilla-thunderbird-makefile.patch (NONE -> 1.1) (NEW),
mozilla-thunderbird-no-subshell.patch (NONE -> 1.1) (NEW),
mozilla-thunderbird-prefs.patch (NONE -> 1.1) (NEW),
mozilla-thunderbird-system-mozldap.patch (NONE -> 1.1) (NEW),
mozilla-thunderbird-enigmail.manifest (1.1 -> NONE) (REMOVED),
mozilla-thunderbird-gcc.patch (1.1 -> NONE) (REMOVED),
mozilla-thunderbird-lib_path.patch (1.1 -> NONE) (REMOVED),
mozilla-thunderbird-myspell.patch (1.5 -> NONE) (REMOVED),
mozilla-thunderbird-regionNames.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird-enigmail-shared.patch
diff -u
packages/mozilla-thunderbird/mozilla-thunderbird-enigmail-shared.patch:1.1
packages/mozilla-thunderbird/mozilla-thunderbird-enigmail-shared.patch:1.2
--- packages/mozilla-thunderbird/mozilla-thunderbird-enigmail-shared.patch:1.1
Sat Jan 21 17:04:46 2006
+++ packages/mozilla-thunderbird/mozilla-thunderbird-enigmail-shared.patch
Tue Mar 20 15:09:35 2012
@@ -10,7 +10,7 @@
CPPSRCS = \
--- mozilla/mailnews/extensions/enigmail/build/Makefile.in.orig
2005-10-04 20:12:03.000000000 +0200
+++ mozilla/mailnews/extensions/enigmail/build/Makefile.in 2005-10-04
20:12:35.000000000 +0200
-@@ -51,9 +51,10 @@
+@@ -51,7 +51,7 @@
LIBRARY_NAME = enigmime
SHORT_LIBNAME = enigmime
@@ -18,10 +18,7 @@
+#MODULE_NAME = EnigModule
IS_COMPONENT = 1
-+FORCE_SHARED_LIB = 1
-
- ifdef USE_XPCOM_GLUE
- # Ensure that the xpcom classes that we build
+ FORCE_SHARED_LIB = 1
--- mozilla/mailnews/extensions/enigmail/src/Makefile.in.orig 2006-01-11
20:54:23.000000000 +0100
+++ mozilla/mailnews/extensions/enigmail/src/Makefile.in 2006-01-11
20:54:43.000000000 +0100
@@ -94,6 +94,7 @@
================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird-fonts.patch
diff -u packages/mozilla-thunderbird/mozilla-thunderbird-fonts.patch:1.2
packages/mozilla-thunderbird/mozilla-thunderbird-fonts.patch:1.3
--- packages/mozilla-thunderbird/mozilla-thunderbird-fonts.patch:1.2 Tue Aug
1 15:12:00 2006
+++ packages/mozilla-thunderbird/mozilla-thunderbird-fonts.patch Tue Mar
20 15:09:35 2012
@@ -1,72 +1,61 @@
---- mozilla.orig/modules/libpref/src/init/all.js 2006-05-08
22:22:51.000000000 +0200
-+++ mozilla/modules/libpref/src/init/all.js 2006-07-25 07:44:06.744790000
+0200
-@@ -1886,33 +1886,33 @@
-
- // th
-
--pref("font.name.serif.tr", "Times");
--pref("font.name.sans-serif.tr", "Helvetica");
--pref("font.name.monospace.tr", "Courier");
+diff -ur comm-1.9.1/mozilla/modules/libpref/src/init/all.js
comm-1.9.1.new/mozilla/modules/libpref/src/init/all.js
+--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-12-05
02:56:20.000000000 +0100
++++ comm-1.9.1.new/mozilla/modules/libpref/src/init/all.js 2009-12-21
09:16:41.372169512 +0100
+@@ -1240,9 +1240,9 @@
+ pref("font.name.monospace.th", "Tahoma");
+ pref("font.name.cursive.th", "Tahoma");
+
+-pref("font.name.serif.tr", "Times New Roman");
+-pref("font.name.sans-serif.tr", "Arial");
+-pref("font.name.monospace.tr", "Courier New");
+pref("font.name.serif.tr", "serif");
+pref("font.name.sans-serif.tr", "sans-serif");
+pref("font.name.monospace.tr", "monospace");
+ pref("font.name.cursive.tr", "Comic Sans MS");
- pref("font.name.serif.x-baltic", "serif");
- pref("font.name.sans-serif.x-baltic", "sans-serif");
- pref("font.name.monospace.x-baltic", "monospace");
-
--pref("font.name.serif.x-central-euro", "Times");
--pref("font.name.sans-serif.x-central-euro", "Helvetica");
--pref("font.name.monospace.x-central-euro", "Courier");
+ pref("font.name.serif.x-baltic", "Times New Roman");
+@@ -1250,9 +1250,9 @@
+ pref("font.name.monospace.x-baltic", "Courier New");
+ pref("font.name.cursive.x-baltic", "Comic Sans MS");
+
+-pref("font.name.serif.x-central-euro", "Times New Roman");
+-pref("font.name.sans-serif.x-central-euro", "Arial");
+-pref("font.name.monospace.x-central-euro", "Courier New");
+pref("font.name.serif.x-central-euro", "serif");
+pref("font.name.sans-serif.x-central-euro", "sans-serif");
+pref("font.name.monospace.x-central-euro", "monospace");
+ pref("font.name.cursive.x-central-euro", "Comic Sans MS");
- pref("font.name.serif.x-cyrillic", "serif");
- pref("font.name.sans-serif.x-cyrillic", "sans-serif");
- pref("font.name.monospace.x-cyrillic", "monospace");
-
--pref("font.name.serif.x-unicode", "Times");
--pref("font.name.sans-serif.x-unicode", "Helvetica");
--pref("font.name.monospace.x-unicode", "Courier");
--
--pref("font.name.serif.x-user-def", "Times");
--pref("font.name.sans-serif.x-user-def", "Helvetica");
--pref("font.name.monospace.x-user-def", "Courier");
--
--pref("font.name.serif.x-western", "Times");
--pref("font.name.sans-serif.x-western", "Helvetica");
--pref("font.name.monospace.x-western", "Courier");
+ pref("font.name.serif.x-cyrillic", "Times New Roman");
+@@ -1260,9 +1260,9 @@
+ pref("font.name.monospace.x-cyrillic", "Courier New");
+ pref("font.name.cursive.x-cyrillic", "Comic Sans MS");
+
+-pref("font.name.serif.x-unicode", "Times New Roman");
+-pref("font.name.sans-serif.x-unicode", "Arial");
+-pref("font.name.monospace.x-unicode", "Courier New");
+pref("font.name.serif.x-unicode", "serif");
+pref("font.name.sans-serif.x-unicode", "sans-serif");
+pref("font.name.monospace.x-unicode", "monospace");
-+
-+pref("font.name.serif.x-user-def", "serif");
-+pref("font.name.sans-serif.x-user-def", "sans-serif");
-+pref("font.name.monospace.x-user-def", "monospace");
-+
-+pref("font.name.serif.x-western", "serif");
-+pref("font.name.sans-serif.x-western", "sans-serif");
-+pref("font.name.monospace.x-western", "monospace");
-
- pref("font.name.serif.zh-CN", "serif");
- pref("font.name.sans-serif.zh-CN", "sans-serif");
-@@ -1989,63 +1989,63 @@
+ pref("font.name.cursive.x-unicode", "Comic Sans MS");
+
+ pref("font.name.serif.x-western", "Times New Roman");
+@@ -1396,23 +1396,23 @@
pref("font.default.ar", "sans-serif");
pref("font.size.variable.ar", 16);
--pref("font.size.fixed.ar", 12);
+-pref("font.size.fixed.ar", 13);
+pref("font.size.fixed.ar", 14);
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
pref("font.size.variable.el", 16);
--pref("font.size.fixed.el", 12);
+-pref("font.size.fixed.el", 13);
+pref("font.size.fixed.el", 14);
pref("font.default.he", "sans-serif");
pref("font.size.variable.he", 16);
--pref("font.size.fixed.he", 12);
+-pref("font.size.fixed.he", 13);
+pref("font.size.fixed.he", 14);
pref("font.default.ja", "sans-serif");
@@ -79,62 +68,94 @@
-pref("font.size.fixed.ko", 16);
+pref("font.size.fixed.ko", 14);
+ pref("font.default.th", "serif");
+ pref("font.size.variable.th", 16);
+@@ -1856,22 +1856,22 @@
+ pref("font.size.variable.ko", 16);
+ pref("font.size.fixed.ko", 16);
+
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
pref("font.size.variable.th", 16);
--pref("font.size.fixed.th", 12);
+-pref("font.size.fixed.th", 13);
+pref("font.size.fixed.th", 14);
+ pref("font.minimum-size.th", 10);
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
pref("font.size.variable.tr", 16);
--pref("font.size.fixed.tr", 12);
+-pref("font.size.fixed.tr", 13);
+pref("font.size.fixed.tr", 14);
+ pref("font.default.x-armn", "serif");
+ pref("font.size.variable.x-armn", 16);
+ pref("font.size.fixed.x-armn", 13);
+
-pref("font.default.x-baltic", "serif");
+pref("font.default.x-baltic", "sans-serif");
pref("font.size.variable.x-baltic", 16);
--pref("font.size.fixed.x-baltic", 12);
+-pref("font.size.fixed.x-baltic", 13);
+pref("font.size.fixed.x-baltic", 14);
+ pref("font.default.x-beng", "serif");
+ pref("font.size.variable.x-beng", 16);
+@@ -1881,9 +1881,9 @@
+ pref("font.size.variable.x-cans", 16);
+ pref("font.size.fixed.x-cans", 13);
+
-pref("font.default.x-central-euro", "serif");
+pref("font.default.x-central-euro", "sans-serif");
pref("font.size.variable.x-central-euro", 16);
--pref("font.size.fixed.x-central-euro", 12);
+-pref("font.size.fixed.x-central-euro", 13);
+pref("font.size.fixed.x-central-euro", 14);
+ pref("font.default.x-cyrillic", "serif");
+ pref("font.size.variable.x-cyrillic", 16);
+@@ -2126,9 +2126,9 @@
+ pref("font.size.variable.x-central-euro", 16);
+ pref("font.size.fixed.x-central-euro", 13);
+
-pref("font.default.x-cyrillic", "serif");
+pref("font.default.x-cyrillic", "sans-serif");
pref("font.size.variable.x-cyrillic", 16);
--pref("font.size.fixed.x-cyrillic", 12);
+-pref("font.size.fixed.x-cyrillic", 13);
+pref("font.size.fixed.x-cyrillic", 14);
+ pref("font.default.x-devanagari", "serif");
+ pref("font.size.variable.x-devanagari", 16);
+@@ -2138,25 +2138,25 @@
+ pref("font.size.variable.x-tamil", 16);
+ pref("font.size.fixed.x-tamil", 13);
+
-pref("font.default.x-unicode", "serif");
+pref("font.default.x-unicode", "sans-serif");
pref("font.size.variable.x-unicode", 16);
--pref("font.size.fixed.x-unicode", 12);
+-pref("font.size.fixed.x-unicode", 13);
+pref("font.size.fixed.x-unicode", 14);
-pref("font.default.x-western", "serif");
+pref("font.default.x-western", "sans-serif");
pref("font.size.variable.x-western", 16);
--pref("font.size.fixed.x-western", 12);
+-pref("font.size.fixed.x-western", 13);
+pref("font.size.fixed.x-western", 14);
- pref("font.default.zh-CN", "sans-serif");
+-pref("font.default.zh-CN", "serif");
++pref("font.default.zh-CN", "sans-serif");
pref("font.size.variable.zh-CN", 16);
-pref("font.size.fixed.zh-CN", 16);
+pref("font.size.fixed.zh-CN", 14);
- pref("font.default.zh-TW", "sans-serif");
+-pref("font.default.zh-TW", "serif");
++pref("font.default.zh-TW", "sans-serif");
pref("font.size.variable.zh-TW", 16);
-pref("font.size.fixed.zh-TW", 16);
+pref("font.size.fixed.zh-TW", 14);
- pref("font.default.zh-HK", "sans-serif");
+-pref("font.default.zh-HK", "serif");
++pref("font.default.zh-HK", "sans-serif");
pref("font.size.variable.zh-HK", 16);
-pref("font.size.fixed.zh-HK", 16);
+pref("font.size.fixed.zh-HK", 14);
- // below a certian pixel size outline scaled fonts produce poor results
- pref("font.scale.outline.min", 6);
+ pref("netinst.profile.show_profile_wizard", true);
+
================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird-install.patch
diff -u packages/mozilla-thunderbird/mozilla-thunderbird-install.patch:1.1
packages/mozilla-thunderbird/mozilla-thunderbird-install.patch:1.2
--- packages/mozilla-thunderbird/mozilla-thunderbird-install.patch:1.1 Mon Feb
26 14:35:45 2007
+++ packages/mozilla-thunderbird/mozilla-thunderbird-install.patch Tue Mar
20 15:09:35 2012
@@ -1,29 +1,74 @@
---- mozilla/toolkit/mozapps/installer/packager.mk~ 2006-12-28
22:23:47.000000000 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk 2007-02-26
15:31:13.000000000 +0200
-@@ -307,7 +307,7 @@
+--- ./mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-03-19
00:34:12.000000000 +0100
++++ ./mozilla/toolkit/mozapps/installer/packager.mk 2011-03-22
23:53:43.877485659 +0100
+@@ -496,30 +496,30 @@
+ endif
+
+ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
+- @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar
$(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
++ @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR)
$(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg
$@ $(EXCLUDE_LIST)
# NOTE: this must be a tar now that dist links into the tree so that we
# do not strip the binaries actually in the tree.
@echo "Creating package directory..."
-- @mkdir $(DIST)/$(MOZ_PKG_APPNAME)
-+ @mkdir $(DESTDIR)$(MOZ_PKG_APPDIR)
+- @mkdir $(DIST)/$(MOZ_PKG_DIR)
++ @mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR)
+ ifndef UNIVERSAL_BINARY
+ # If UNIVERSAL_BINARY, the package will be made from an already-prepared
+ # STAGEPATH
ifdef MOZ_PKG_MANIFEST
- $(RM) -rf $(DIST)/xpt
- $(call PACKAGER_COPY, "$(DIST)",\
-@@ -322,7 +322,7 @@
- @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME)
$(MOZ_PKG_APPNAME)
- endif
+ $(RM) -rf $(DIST)/xpt $(DIST)/manifests
+ $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
++ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
+ "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+- $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
++ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
+ $(patsubst
%,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
+ $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
+ $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+- printf "manifest components/interfaces.manifest\nmanifest
components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest
chrome/localized.manifest\n" >
$(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
++ printf "manifest components/interfaces.manifest\nmanifest
components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest
chrome/localized.manifest\n" >
$(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
+ else # !MOZ_PKG_MANIFEST
+ ifeq ($(MOZ_PKG_FORMAT),DMG)
+ ifndef STAGE_SDK
+@@ -529,10 +529,10 @@
+ @$(NSINSTALL) -D $(DIST)/xpt
+ @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp
$(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces
$(MOZ_PKG_APPNAME).xpt\n"
>$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest)
|| echo No *.xpt files found in:
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd
../$(MOZ_PKG_APPNAME); tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif # DMG
- endif # MOZ_PKG_MANIFEST
- ifndef PKG_SKIP_STRIP
-@@ -354,7 +354,7 @@
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
endif
- @echo "Removing unpackaged files..."
- ifdef NO_PKG_FILES
-- cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH); rm -rf
$(NO_PKG_FILES)
-+ cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
+ else
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
+ @echo "Linking XPT files..."
+ @rm -rf $(DIST)/xpt
+ @$(NSINSTALL) -D $(DIST)/xpt
+@@ -620,7 +620,7 @@
+ cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
endif
- ifdef MOZ_PKG_REMOVALS
- $(SYSINSTALL) $(MOZ_PKG_REMOVALS_GEN)
$(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)
+ $(NSINSTALL) -D $(DESTDIR)$(installdir)
+- (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
++ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(installdir) && tar -xf -)
+ $(NSINSTALL) -D $(DESTDIR)$(bindir)
+ $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
+--- comm-1.9.1/mail/app/Makefile.in.orig 2009-12-18 14:49:43.990647725
+0100
++++ comm-1.9.1/mail/app/Makefile.in 2009-12-18 14:49:53.830739781 +0100
+@@ -48,7 +48,7 @@
+ GRE_BUILDID = $(shell $(PYTHON)
$(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini
Build BuildID)
+
+ DEFINES += \
+- -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
++ -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD)
\
+ -DAB_CD=$(AB_CD) \
+ -DGRE_MILESTONE=$(GRE_MILESTONE) \
+ -DGRE_BUILDID=$(GRE_BUILDID) \
================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird.desktop
diff -u packages/mozilla-thunderbird/mozilla-thunderbird.desktop:1.7
packages/mozilla-thunderbird/mozilla-thunderbird.desktop:1.8
--- packages/mozilla-thunderbird/mozilla-thunderbird.desktop:1.7 Wed Dec
26 14:39:43 2007
+++ packages/mozilla-thunderbird/mozilla-thunderbird.desktop Tue Mar 20
15:09:35 2012
@@ -12,4 +12,5 @@
Terminal=false
Type=Application
Categories=GTK;Network;Email;
+MimeType=message/rfc822;x-scheme-handler/mailto;
# vi: encoding=utf-8
================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird.spec
diff -u packages/mozilla-thunderbird/mozilla-thunderbird.spec:1.131
packages/mozilla-thunderbird/mozilla-thunderbird.spec:1.132
--- packages/mozilla-thunderbird/mozilla-thunderbird.spec:1.131 Sun Feb 28
02:10:45 2010
+++ packages/mozilla-thunderbird/mozilla-thunderbird.spec Tue Mar 20
15:09:35 2012
@@ -3,77 +3,123 @@
# - we use icedove in pld linux
#
# TODO:
-# - CHECK all features of enigmail
# - separate spec for enigmail
+# - build with system mozldap
#
# Conditional builds
%bcond_without enigmail # don't build enigmail - GPG/PGP support
%bcond_without gnomeui # disable gnomeui support
-%bcond_without gnomevfs # disable GNOME comp. (gconf+libgnome+gnomevfs)
and gnomevfs ext.
-%bcond_without gnome # disable all GNOME components
(gnome+gnomeui+gnomevfs)
+%bcond_without gnome # alias for gnomeui
%bcond_without ldap # disable e-mail address lookups in LDAP
directories
-#
+%bcond_without lightning # disable Sunbird/Lightning calendar
+%bcond_without xulrunner # build with xulrunner
+%bcond_with crashreporter # report crashes to crash-stats.mozilla.com
+
%if %{without gnome}
%undefine with_gnomeui
-%undefine with_gnomevfs
%endif
-%define enigmail_ver 0.95.6
-%define thunderbird_ver 2.0.0.14
+
+%if 0%{?_enable_debug_packages} != 1
+%undefine crashreporter
+%endif
+
+%define enigmail_ver 1.3.5
+%define nspr_ver 4.8.8
+%define nss_ver 3.12.10
+
+%if %{without xulrunner}
+# The actual sqlite version (see RHBZ#480989):
+%define sqlite_build_version %(pkg-config --silence-errors
--modversion sqlite3 2>/dev/null || echo ERROR)
+%endif
Summary: Thunderbird Community Edition - email client
Summary(pl.UTF-8): Thunderbird Community Edition - klient poczty
Name: mozilla-thunderbird
-Version: %{thunderbird_ver}
-Release: 2
+Version: 10.0.2
+Release: 1
License: MPL 1.1 or GPL v2+ or LGPL v2.1+
-Group: Applications/Networking
-Source0:
http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}-source.tar.bz2
-# Source0-md5: e304510d08f7e226bbfff8e7e549232f
+Group: X11/Applications/Networking
+Source0:
http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
+# Source0-md5: 624bef982d7ac610b1175737d9905150
Source1:
http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5: cfbe6ff77f80a349b396829757ad952a
-Source2: %{name}.desktop
-Source3: %{name}.sh
-Source4: %{name}-enigmail.manifest
-Source5: %{name}.png
-Patch1: %{name}-lib_path.patch
-Patch2: %{name}-enigmail-shared.patch
-Patch3: %{name}-gcc.patch
-Patch4: %{name}-fonts.patch
-Patch5: %{name}-install.patch
-Patch6: %{name}-myspell.patch
-Patch7: %{name}-regionNames.patch
+# Source1-md5: 1b008b0d106e238c11e4bead08126bc0
+Source2: %{name}.png
+Source4: %{name}.desktop
+Source5: %{name}.sh
+#Source4: %{name}-enigmail.manifest
+#Patch1: %{name}-lib_path.patch
+Patch1: %{name}-enigmail-shared.patch
+#Patch2: %{name}-gcc.patch
+Patch3: %{name}-fonts.patch
+Patch4: %{name}-install.patch
+#Patch6: %{name}-myspell.patch
+Patch5: %{name}-hunspell.patch
+Patch6: %{name}-prefs.patch
+#Patch7: %{name}-regionNames.patch
+Patch7: %{name}-system-mozldap.patch
+Patch8: %{name}-makefile.patch
+Patch11: %{name}-crashreporter.patch
+Patch12: %{name}-no-subshell.patch
URL: http://www.mozilla.org/projects/thunderbird/
%{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1}
+BuildRequires: alsa-lib-devel
BuildRequires: automake
+BuildRequires: bzip2-devel
+BuildRequires: cairo-devel >= 1.10
+BuildRequires: dbus-glib-devel >= 0.60
BuildRequires: freetype-devel >= 1:2.1.8
-%{?with_gnomevfs:BuildRequires: gnome-vfs2-devel >= 2.0}
-BuildRequires: gtk+2-devel >= 1:2.0.0
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: gtk+2-devel >= 2:2.10.0
+BuildRequires: hunspell-devel
BuildRequires: libIDL-devel >= 0.8.0
-%{?with_gnomevfs:BuildRequires: libgnome-devel >= 2.0}
+%{?with_gnomeui:BuildRequires: libgnome-devel >= 2.0}
+%{?with_gnomeui:BuildRequires: libgnome-keyring-devel}
%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
+BuildRequires: libiw-devel
BuildRequires: libjpeg-devel >= 6b
-BuildRequires: libpng-devel >= 1.2.0
+BuildRequires: libnotify-devel >= 0.4
+BuildRequires: libpng-devel >= 1.4.1
BuildRequires: libstdc++-devel
-BuildRequires: myspell-devel
-BuildRequires: nspr-devel >= 1:4.6.1
-BuildRequires: nss-devel >= 1:3.11.3
+BuildRequires: nspr-devel >= 1:%{nspr_ver}
+BuildRequires: nss-devel >= 1:%{nss_ver}
BuildRequires: pango-devel >= 1:1.1.0
+BuildRequires: perl-base >= 1:5.6
+BuildRequires: pkgconfig
+BuildRequires: python >= 1:2.5
BuildRequires: sed >= 4.0
+BuildRequires: sqlite3-devel >= 3.7.4
+BuildRequires: startup-notification-devel >= 0.8
BuildRequires: xorg-lib-libXext-devel
-BuildRequires: xorg-lib-libXft-devel >= 2.1
BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libXp-devel
BuildRequires: xorg-lib-libXt-devel
+BuildRequires: yasm
+BuildRequires: zip
+%if %{with xulrunner}
+BuildRequires: xulrunner-devel >= 2:%{version}
+%else
Requires: myspell-common
-Requires: nspr >= 1:4.6.1
-Requires: nss >= 1:3.11.3
+Requires: nspr >= 1:%{nspr_ver}
+Requires: nss >= 1:%{nss_ver}
+Requires: sqlite3 >= %{sqlite_build_version}
+%endif
+Requires(post): mktemp >= 1.5-18
+%if %{with xulrunner}
+%requires_eq_to xulrunner xulrunner-devel
+%endif
Obsoletes: mozilla-thunderbird-dictionary-en-US
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+
+
# don't satisfy other packages (don't use %{name} here)
-%define _noautoprovfiles %{_libdir}/mozilla-thunderbird
+%define _noautoprovfiles
%{_libdir}/mozilla-thunderbird/components
+# we don't want these to satisfy xulrunner-devel
+%define _noautoprov libmozjs.so libxpcom.so
libxul.so
# and as we don't provide them, don't require either
-%define _noautoreq libgfxpsshar.so libgkgfx.so
libgtkembedmoz.so libgtkxtbin.so libldap50.so libmozjs.so libprldap50.so
libssldap50.so libxpcom.so libxpcom_compat.so libxpcom_core.so
+%define _noautoreq libmozjs.so libxpcom.so
libxul.so
+
+%define topdir %{_builddir}/%{name}-%{version}
+%define objdir %{topdir}/obj-%{_target_cpu}
%description
Thunderbird Community Edition is an open-source,fast and portable
@@ -83,13 +129,29 @@
Thunderbird Community Edition jest open sourcowym, szybkim i
przenośnym klientem poczty.
+%package addon-lightning
+Summary: An integrated calendar for Mozilla Thunderbird
+Summary(pl.UTF-8): Zintegrowany kalendarz dla Icedove
+License: MPL 1.1 or GPL v2+ or LGPL v2.1+
+Group: Applications/Networking
+Requires: %{name} = %{version}-%{release}
+
+%description addon-lightning
+Lightning is an calendar extension to Mozilla Thunderbird email
+client.
+
+%description addon-lightning -l pl.UTF-8
+Lightning to rozszerzenie do klienta poczty Mozilla Thunderbird
+dodające funkcjonalność kalendarza.
+
%package addon-enigmail
Summary: Extension for the authentication and encryption features
provided by GnuPG
Summary(pl.UTF-8): Rozszerzenie do uwierzytelniania i szyfrowania
zapewnianego przez GnuPG
License: MPL/LGPL
Group: Applications/Networking
URL: http://enigmail.mozdev.org/
-Requires: %{name} = %{thunderbird_ver}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: gnupg
%description addon-enigmail
Enigmail is an extension to the mail client of Mozilla Thunderbird
@@ -120,29 +182,40 @@
%prep
%setup -q -c
+mv comm-release mozilla
cd mozilla
-%{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
-%patch1 -p1
-%{?with_enigmail:%patch2 -p1}
+%{?with_enigmail:%{__gzip} -dc %{SOURCE1} | %{__tar} xf - -C
mailnews/extensions}
+%{?with_enigmail:%patch1 -p1}
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p2
+%patch11 -p2
+%patch12 -p1
-:> config/gcc_hidden.h
+#:> config/gcc_hidden.h
%build
cd mozilla
-export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr
--cflags-only-I`"
-export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr
--cflags-only-I`"
+cp -f %{_datadir}/automake/config.* mozilla/build/autoconf
+cp -f %{_datadir}/automake/config.* mozilla/nsprpub/build/autoconf
+cp -f %{_datadir}/automake/config.* ldap/sdks/c-sdk/config/autoconf
+
+install -d libxul-sdk
+ln -snf %{_libdir}/xulrunner-sdk libxul-sdk/sdk
-cp -f %{_datadir}/automake/config.* build/autoconf
-cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
-cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
+cat << EOF > .mozconfig
+mk_add_options MOZ_OBJDIR=%{objdir}
-cat << 'EOF' > .mozconfig
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-thunderbird/mozilla-thunderbird-enigmail-shared.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-thunderbird/mozilla-thunderbird-fonts.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-thunderbird/mozilla-thunderbird-install.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-thunderbird/mozilla-thunderbird.desktop?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-thunderbird/mozilla-thunderbird.spec?r1=1.131&r2=1.132&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
