From 3a30e2d72b7fa4799d8dbfbb0494479a2fc49ae6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 29 Nov 2015 16:49:42 +0100 Subject: [PATCH] - updated to 38.4.0 --- bump-nss-req.patch | 8 +++--- enable-addons.patch | 25 +++++++++-------- freetype-2.6.patch | 8 ++++++ icedove-branding.patch | 62 ++++++++++++++++++++++-------------------- icedove-makefile.patch | 28 +++++++++---------- icedove-prefs.patch | 10 +++++++ icedove-rm_nonfree.sh | 1 - icedove.spec | 58 ++++++++++++++++++--------------------- system-mozldap.patch | 16 ----------- 9 files changed, 108 insertions(+), 108 deletions(-) diff --git a/bump-nss-req.patch b/bump-nss-req.patch index 92c2b78..a1d34f4 100644 --- a/bump-nss-req.patch +++ b/bump-nss-req.patch @@ -4,8 +4,8 @@ _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.16.2.3, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) -+ AM_PATH_NSS(3.17.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +- AM_PATH_NSS(3.19.2.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.20.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi if test -n "$MOZ_NATIVE_NSS"; then @@ -15,8 +15,8 @@ echo "$ac_t""no" 1>&6 fi -- min_nss_version=3.16.2.3 -+ min_nss_version=3.17.0 +- min_nss_version=3.19.2.1 ++ min_nss_version=3.20.0 echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6 echo "configure:15231: checking for NSS - version >= $min_nss_version" >&5 diff --git a/enable-addons.patch b/enable-addons.patch index 5f62b44..9b18db8 100644 --- a/enable-addons.patch +++ b/enable-addons.patch @@ -5,23 +5,26 @@ // default. This does not include the application directory. See the SCOPE // constants in AddonManager.jsm for values to use here -pref("extensions.autoDisableScopes", 15); -+pref("extensions.autoDisableScopes", 0); ++pref("extensions.autoDisableScopes", 3); // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); --- comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2011-11-21 11:28:32.000000000 +0100 +++ comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2011-12-14 12:43:42.461184351 +0100 -@@ -1591,8 +1591,8 @@ var XPIProvider = { - this.showUpgradeUI(); - flushCaches = true; - } -- else if (aAppChanged === undefined) { +@@ -2102,11 +2102,9 @@ var XPIProvider = { + + AddonManagerPrivate.markProviderSafe(this); + +- if (aAppChanged === undefined) { - // For new profiles we will never need to show the add-on selection UI -+ else { + // For all profiles we will never need to show the add-on selection UI Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); - } - +- } +- else if (aAppChanged && !this.allAppGlobal && ++ if (aAppChanged && !this.allAppGlobal && + Preferences.get(PREF_EM_SHOW_MISMATCH_UI, true)) { + if (!Preferences.get(PREF_SHOWN_SELECTION_UI, false)) { + // Flip a flag to indicate that we interrupted startup with an interactive prompt --- comm-release/suite/browser/browser-prefs.js~ 2013-11-06 19:54:38.789734061 +0100 +++ comm-release/suite/browser/browser-prefs.js 2013-11-06 20:55:33.765611935 +0100 @@ -616,7 +616,7 @@ @@ -29,7 +32,7 @@ // default. This does not include the application directory. See the SCOPE // constants in AddonManager.jsm for values to use here. -pref("extensions.autoDisableScopes", 15); -+pref("extensions.autoDisableScopes", 0); ++pref("extensions.autoDisableScopes", 3); // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations @@ -40,7 +43,7 @@ // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.jsm for values to use here. -pref("extensions.autoDisableScopes", 15); -+pref("extensions.autoDisableScopes", 0); ++pref("extensions.autoDisableScopes", 3); // Dictionary download preference pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); diff --git a/freetype-2.6.patch b/freetype-2.6.patch index b1eb20a..ffa8f57 100644 --- a/freetype-2.6.patch +++ b/freetype-2.6.patch @@ -1,5 +1,13 @@ --- mozilla/mozilla/config/system-headers~ 2015-05-25 23:28:44.000000000 +0200 +++ mozilla/mozilla/config/system-headers 2015-06-11 23:07:35.000000000 +0200 +@@ -454,6 +454,7 @@ + frame/log.h + frame/req.h + freetype/freetype.h ++freetype/ftfntfmt.h + freetype/ftcache.h + freetype/ftglyph.h + freetype/ftsynth.h @@ -471,6 +470,7 @@ freetype/ftxf86.h freetype.h diff --git a/icedove-branding.patch b/icedove-branding.patch index 1e80572..88f0082 100644 --- a/icedove-branding.patch +++ b/icedove-branding.patch @@ -20,13 +20,13 @@ extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project # Lightning branding ---- mozilla/mail/app/application.ini~ 2011-08-12 15:52:04.000000000 +0200 -+++ mozilla/mail/app/application.ini 2011-09-17 15:24:45.833226544 +0200 +--- mozilla/im/app/application.ini~ 2011-08-12 15:52:04.000000000 +0200 ++++ mozilla/im/app/application.ini 2011-09-17 15:24:45.833226544 +0200 @@ -37,7 +37,7 @@ #filter substitution [App] --Name=Thunderbird +-Name=Instantbird +Name=Icedove Version=@APP_VERSION@ BuildID=@GRE_BUILDID@ @@ -34,33 +34,33 @@ --- mozilla/mail/app/profile/all-thunderbird.js.orig 2012-03-13 03:37:11.000000000 +0100 +++ mozilla/mail/app/profile/all-thunderbird.js 2012-03-24 21:42:35.608437888 +0100 @@ -84,7 +84,7 @@ - pref("app.update.certs.2.commonName", "aus3.mozilla.org"); + pref("app.update.certs.2.commonName", "aus4.mozilla.org"); // Whether or not app updates are enabled --pref("app.update.enabled", true); -+pref("app.update.enabled", false); +-pref("app.update.enabled", true); ++pref("app.update.enabled", false); // This preference turns on app.update.mode and allows automatic download and - // install to take place. We use a separate boolean toggle for this to make -@@ -117,7 +117,7 @@ + // install to take place. We use a separate boolean toggle for this to make +@@ -120,7 +119,7 @@ pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%B pref("app.update.url.manual", "http://www.getthunderbird.com"); // A default value for the "More information about this update" link - // supplied in the "An update is available" page of the update wizard. + // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/%APP%/releases/"); +pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/thunderbird/releases/"); // User-settable override to app.update.url for testing purposes. //pref("app.update.url.override", ""); -@@ -139,7 +139,7 @@ - #endif +@@ -149,7 +148,7 @@ pref("toolkit.crashreporter.infoURL", + "http://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter");"); // Base URL for web-based support pages. -pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/"); +pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/"); - // Controls enabling of the extension system logging (can reduce performance) - pref("extensions.logging.enabled", false); -@@ -161,18 +161,18 @@ + // Show error messages in error console. + pref("javascript.options.showInConsole", true); +@@ -178,18 +177,18 @@ pref("extensions.autoDisableScopes", 15); // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); @@ -78,33 +78,35 @@ // Blocklist preferences pref("extensions.blocklist.enabled", true); pref("extensions.blocklist.interval", 86400); - pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); + pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); -pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/"); --pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%"); +-pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%"); +pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/"); -+pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%"); ++pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%"); - // Enables some extra Extension System Logging (can reduce performance) - pref("extensions.logging.enabled", false); -@@ -208,6 +207,7 @@ pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/Ve + // Enables some extra Extension System Logging (can reduce performance) + pref("extensions.logging.enabled", false); +@@ -209,7 +208,8 @@ pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla pref("extensions.update.interval", 86400); // Check for updates to Extensions and // Themes every day +-pref("extensions.dss.enabled", false); // Dynamic Skin Switching +pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/"); - pref("extensions.dss.enabled", false); // Dynamic Skin Switching ++pref("extensions.dss.enabled", false); // Dynamic Skin Switching pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next -@@ -391,7 +391,7 @@ + pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://messenger/locale/messenger.properties"); +@@ -424,7 +424,7 @@ pref("browser.helperApps.deleteTempFileOnExit", true); pref("spellchecker.dictionary", ""); // Dictionary download preference -pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/"); -+pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/dictionaries/"); ++pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/"); // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular - // mail application without any user intervention. Possible values are: -@@ -540,7 +540,7 @@ - pref("mailnews.database.global.logging.console", true); + // mail application without any user intervention. Possible values are: +@@ -559,7 +559,7 @@ pref("mailnews.database.global.logging.console", true); + pref("mailnews.database.global.search.msg.limit", 1000); // page to load to find good header add-ons -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%"); @@ -112,15 +114,15 @@ // Serif fonts look dated. Switching those language families to sans-serif // where we think it makes sense. Worth investigating for other font families -@@ -764,7 +764,7 @@ +@@ -751,7 +751,7 @@ pref("plugins.hide_infobar_for_carbon_failure_plugin", false); - pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/"); + pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/"); pref("plugins.update.notifyUser", false); -pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); +pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - // Windows taskbar support - #ifdef XP_WIN + // Click-to-play has not been ported for TB yet, see bug 814168. + // The default plugin state should be changed to "ask to activate" when this --- mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd~ +++ mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd @@ -78,7 +78,7 @@ diff --git a/icedove-makefile.patch b/icedove-makefile.patch index 19143c4..4588322 100644 --- a/icedove-makefile.patch +++ b/icedove-makefile.patch @@ -1,30 +1,30 @@ ---- icedove-6.0/mozilla/Makefile.in~ 2011-08-12 16:52:03.000000000 +0300 -+++ icedove-6.0/mozilla/Makefile.in 2011-08-26 13:00:59.373870016 +0300 -@@ -26,21 +26,7 @@ +--- icedove-6.0/mozilla/mozilla/Makefile.in~ 2011-08-12 16:52:03.000000000 +0300 ++++ icedove-6.0/mozilla/mozilla/Makefile.in 2011-08-26 13:00:59.373870016 +0300 +@@ -26,22 +26,6 @@ + @exit 1 + endif - include $(topsrcdir)/config/config.mk - --default alldep all:: $(topsrcdir)/configure config.status -- -$(topsrcdir)/configure: $(topsrcdir)/configure.in +-$(topsrcdir)/js/src/configure: $(topsrcdir)/js/src/configure.in +-$(topsrcdir)/configure $(topsrcdir)/js/src/configure: - @echo "STOP! configure.in has changed, and your configure is out of date." - @echo "Please rerun autoconf and configure." - @echo "To ignore this message, touch 'configure' in the source directory." - @exit 1 - -config.status: $(topsrcdir)/configure +-js/src/config.status: $(topsrcdir)/js/src/configure +-config.status js/src/config.status: - @echo "STOP! configure has changed and needs to be run in this build directory." - @echo "Please rerun configure." - @echo "To ignore this message, touch 'config.status' in the build directory." - @exit 1 - --default export libs clean realclean distclean alldep \ -+default export libs clean realclean distclean \ - maybe_clobber_profiledbuild uploadsymbols all:: $(SUBMAKEFILES) - $(MAKE) -C mozilla $@ - ---- icedove-6.0/mozilla/client.mk~ 2011-08-26 13:10:08.000000000 +0300 -+++ icedove-6.0/mozilla/client.mk 2011-08-26 13:10:11.365956960 +0300 + # Regenerate the build backend if it is out of date. We only have this rule in + # this main make file because having it in rules.mk and applied to partial tree + # builds resulted in a world of hurt. Gory details are in bug 877308. +--- icedove-6.0/mozilla/mozilla/client.mk~ 2011-08-26 13:10:08.000000000 +0300 ++++ icedove-6.0/mozilla/mozilla/client.mk 2011-08-26 13:10:11.365956960 +0300 @@ -278,8 +278,8 @@ $(TOPSRCDIR)/mozilla/js/src/aclocal.m4 \ $(NULL) diff --git a/icedove-prefs.patch b/icedove-prefs.patch index 51954b9..61c8a4b 100644 --- a/icedove-prefs.patch +++ b/icedove-prefs.patch @@ -18,3 +18,13 @@ // If phishing detection is enabled, allow fine grained control // of the local, static tests pref("mail.phishing.detection.ipaddresses", true); +--- mozilla.orig/mozilla/modules/libpref/init/all.js ++++ mozilla/mozilla/modules/libpref/init/all.js +@@ -1053,6 +1053,7 @@ pref("javascript.options.ion.offthread_compilation", true); + // memory, but makes things like Function.prototype.toSource() + // fail. + pref("javascript.options.discardSystemSource", false); ++pref("javascript.options.showInConsole", true); + // This preference limits the memory usage of javascript. + // If you want to change these values for your device, + // please find Bug 417052 comment 17 and Bug 456721 diff --git a/icedove-rm_nonfree.sh b/icedove-rm_nonfree.sh index f58cfbb..52aaf3c 100644 --- a/icedove-rm_nonfree.sh +++ b/icedove-rm_nonfree.sh @@ -92,7 +92,6 @@ rm -fv ./suite/themes/modern/communicator/brand/throbber16-anim.png rm -fv ./suite/themes/modern/communicator/brand/throbber16-single.png rm -fvr ./other-licenses/ rm -fvr ./mozilla/other-licenses/7zstub -rm -fvr ./mozilla/other-licenses/atk-1.0 rm -fvr ./mozilla/other-licenses/branding rm -fvr ./mozilla/other-licenses/bsdiff rm -fvr ./mozilla/other-licenses/ia2 diff --git a/icedove.spec b/icedove.spec index cd28b9b..e0fa9af 100644 --- a/icedove.spec +++ b/icedove.spec @@ -15,7 +15,7 @@ %endif %define nspr_ver 4.10.6 -%define nss_ver 3.17.0 +%define nss_ver 3.19.2.1 %define xulrunner_ver 2:31.3.0 @@ -27,15 +27,14 @@ Summary: Icedove - email client Summary(pl.UTF-8): Icedove - klient poczty Name: icedove -Version: 31.7.0 +Version: 38.4.0 Release: 1 License: MPL v2.0 Group: X11/Applications/Mail Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 -# Source0-md5: dcf14a6d4aaba2f695a1ec30c296e356 +# Source0-md5: 483373b1485cf2edea77c75a69602870 Source2: %{name}-branding.tar.xz -# Source2-md5: 85992ebd22e36ba69743b06b4c53fb2a -Source3: %{name}-rm_nonfree.sh +# Source2-md5: 66753bc5c924d7492b6b5c9bdc3e4b5b Source4: %{name}.desktop Source5: %{name}.sh Patch0: %{name}-branding.patch @@ -49,7 +48,6 @@ Patch6: no-subshell.patch Patch7: system-virtualenv.patch Patch8: enable-addons.patch Patch9: bump-nss-req.patch -Patch10: libvpx2.patch Patch11: freetype-2.6.patch URL: http://www.pld-linux.org/Packages/Icedove BuildRequires: GConf2-devel >= 1.2.1 @@ -152,21 +150,19 @@ funkcjonalność kalendarza. %prep %setup -qc -%{__mv} comm-esr31 mozilla +%{__mv} comm-esr38 mozilla %setup -q -T -D -a2 cd mozilla -/bin/sh %{SOURCE3} %patch0 -p1 -%patch1 -p1 +#%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p2 +#%patch4 -p2 %patch5 -p2 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p2 -%patch10 -p1 %patch11 -p1 %build @@ -304,7 +300,7 @@ cd %{objdir} %{__make} -C icedove/branding install \ DESTDIR=$RPM_BUILD_ROOT -cp -a mozilla/dist/icedove/* $RPM_BUILD_ROOT%{_libdir}/%{name}/ +cp -a dist/icedove/* $RPM_BUILD_ROOT%{_libdir}/%{name}/ %if %{with xulrunner} # needed to find mozilla runtime @@ -317,13 +313,9 @@ ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner # Add debuginfo for crash-stats.mozilla.com install -d $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{_libdir}/%{name} -cp -a mozilla/dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/%{name} +cp -a dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/%{name} %endif -# copy manually lightning files, somewhy they are not installed by make -cp -a mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions - # move arch independant ones to datadir mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins @@ -419,7 +411,6 @@ exit 0 %attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so %{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so} %attr(755,root,root) %{_libdir}/%{name}/libxul.so -%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client %attr(755,root,root) %{_libdir}/%{name}/plugin-container %endif @@ -438,6 +429,8 @@ exit 0 %{_desktopdir}/icedove.desktop %dir %{_datadir}/%{name} +%dir %{_libdir}/%{name}/distribution +%dir %{_libdir}/%{name}/distribution/extensions %{_datadir}/%{name}/extensions %{_datadir}/%{name}/searchplugins @@ -459,18 +452,19 @@ exit 0 %if %{with lightning} %files addon-lightning %defattr(644,root,root,755) -%dir %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/application.ini -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf -%dir %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components -%attr(755,root,root) %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.so -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.js -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.manifest -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.xpt -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones.sqlite +%dir %{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/app.ini +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.jar +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf +%dir %{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components +%attr(755,root,root) %{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.so +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.js +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*manifest +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.xpt +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js +%dir %{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones +%{_libdir}/%{name}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones/zones.json %endif diff --git a/system-mozldap.patch b/system-mozldap.patch index 6f38f72..d62c015 100644 --- a/system-mozldap.patch +++ b/system-mozldap.patch @@ -1,19 +1,3 @@ ---- mozilla/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 -+++ mozilla/configure.in 2010-07-06 11:14:54.350499449 +0200 -@@ -134,6 +134,13 @@ - AC_MSG_RESULT([no]) - fi - -+dnl system LDAP Support -+dnl ======================================================== -+MOZ_ARG_WITH_STRING(system-ldap, -+[ --with-system-ldap[=PFX] -+ Use system mozldap [installed at prefix PFX]], -+ MOZ_LDAP_DIR=$withval) -+ - dnl ======================================================== - dnl = Trademarked Branding - dnl ======================================================== --- mozilla/mail/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 +++ mozilla/mail/configure.in 2010-07-06 11:14:54.350499449 +0200 @@ -59,7 +59,12 @@ -- 2.43.0