+++ /dev/null
---- mozilla/calendar/lightning/install.rdf~ 2011-08-12 15:52:04.000000000 +0200
-+++ mozilla/calendar/lightning/install.rdf 2011-09-17 15:22:37.326572866 +0200
-@@ -28,7 +28,7 @@
- <em:id>@XPI_EM_ID@</em:id>
- <em:name>Lightning</em:name>
- <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ -->
-- <em:description>An integrated calendar for Thunderbird</em:description>
-+ <em:description>An integrated calendar for Icedove</em:description>
- #ifdef LIGHTNING_PRERELEASE_VERSION
- <em:developer>Build ID: @GRE_BUILDID@</em:developer>
- #endif
---- mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties~ 2011-08-12 15:52:04.000000000 +0200
-+++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2011-09-17 15:23:40.476566690 +0200
-@@ -39,7 +39,7 @@
-
- # addon description:
- extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Lightning
--extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Thunderbird
-+extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Icedove
- extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
-
- # Lightning branding
---- 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=Instantbird
-+Name=Icedove
- Version=@APP_VERSION@
- BuildID=@GRE_BUILDID@
- #ifdef MOZ_SOURCE_REPO
---- 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", "aus4.mozilla.org");
-
- // Whether or not app updates are enabled
--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
-@@ -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.
--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", "");
-
-@@ -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%/");
-
- // Show error messages in error console.
- pref("javascript.options.showInConsole", true);
-@@ -178,20 +177,20 @@ pref("extensions.autoDisableScopes", 15);
- // 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%");
--pref("extensions.getAddons.getWithPerformance.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.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
--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%/%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%");
-+pref("extensions.getAddons.getWithPerformance.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.link.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/");
-+pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
-+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%/%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);
- pref("extensions.blocklist.interval", 86400);
- 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://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
-+pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/");
-+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);
-@@ -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.switchPending", false); // Non-dynamic switch pending after next
-
- 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.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:
-@@ -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%");
-+pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
-
- // Serif fonts look dated. Switching those language families to sans-serif
- // where we think it makes sense. Worth investigating for other font families
-@@ -751,7 +751,7 @@ pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
-
- 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%");
-
- // 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 @@
- <!ENTITY changeSettings.label "Change Settings">
- <!ENTITY changeSettings.accesskey "S">
-
--<!ENTITY contactYourProvider.description "&brandShortName; can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the Thunderbird FAQ for more information.">
-+<!ENTITY contactYourProvider.description "&brandShortName; can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the Icedove FAQ for more information.">
-
- <!ENTITY insecureServer.tooltip.title "Warning! This is an insecure server.">
- <!ENTITY insecureServer.tooltip.details "Click circle for more details.">
---- mozilla/mail/confvars.sh~ 2011-08-12 15:52:05.000000000 +0200
-+++ mozilla/mail/confvars.sh 2011-09-17 15:34:33.613167078 +0200
-@@ -6,8 +6,8 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
--MOZ_APP_BASENAME=Thunderbird
--MOZ_APP_NAME=thunderbird
-+MOZ_APP_BASENAME=Icedove
-+MOZ_APP_NAME=icedove
- MOZ_UPDATER=1
- MOZ_THUNDERBIRD=1
- MOZ_CHROME_FILE_FORMAT=omni
-@@ -30,7 +30,7 @@
-
- MOZ_UA_BUILDID=20100101
-
--MOZ_BRANDING_DIRECTORY=mail/branding/aurora
-+MOZ_BRANDING_DIRECTORY=icedove/branding
- MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
- MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
- # This should usually be the same as the value MAR_CHANNEL_ID.
%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
%endif
-Summary: Icedove - email client
-Summary(pl.UTF-8): Icedove - klient poczty
-Name: icedove
+Summary: Thunderbird - email client
+Summary(pl.UTF-8): Thunderbird - klient poczty
+Name: thunderbird
Version: 45.8.0
Release: 0.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.xz
+Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/%{name}-%{version}.source.tar.xz
# Source0-md5: 4e04b1618273f946f00f8ea547578895
-Source2: %{name}-branding.tar.xz
-# Source2-md5: 66753bc5c924d7492b6b5c9bdc3e4b5b
Source4: %{name}.desktop
Source5: %{name}.sh
-Patch0: %{name}-branding.patch
Patch2: %{name}-prefs.patch
Patch5: %{name}-extensiondir.patch
Patch6: no-subshell.patch
Patch8: enable-addons.patch
Patch9: mozilla-1269171-badalloc.patch
-URL: http://www.pld-linux.org/Packages/Icedove
+URL: http://www.mozilla.org/projects/thunderbird/
BuildRequires: GConf2-devel >= 1.2.1
BuildRequires: alsa-lib-devel
BuildRequires: automake
BuildRequires: libjpeg-turbo-devel
BuildRequires: libpng-devel >= 1.4.1
BuildRequires: libstdc++-devel
+BuildRequires: libvpx-devel >= 1.3.0
BuildRequires: mozldap-devel
BuildRequires: nspr-devel >= 1:%{nspr_ver}
BuildRequires: nss-devel >= 1:%{nss_ver}
BuildRequires: pango-devel >= 1:1.22.0
BuildRequires: perl-base >= 1:5.6
-BuildRequires: python-virtualenv
BuildRequires: pkgconfig
BuildRequires: python >= 1:2.5
+BuildRequires: python-virtualenv
BuildRequires: sed >= 4.0
BuildRequires: sqlite3-devel >= 3.8.4.2
BuildRequires: startup-notification-devel >= 0.8
-BuildRequires: libvpx-devel >= 1.3.0
BuildRequires: virtualenv
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: yasm
BuildRequires: zip
%if %{with xulrunner}
-BuildRequires: xulrunner-devel >= %{xulrunner_ver}
BuildRequires: xulrunner-devel < 2:32
+BuildRequires: xulrunner-devel >= %{xulrunner_ver}
%else
Requires: glib2 >= 1:2.20
%{!?with_gtk3:Requires: gtk+2 >= 2:2.14}
Requires: libjpeg-turbo
Obsoletes: mozilla-thunderbird
Obsoletes: mozilla-thunderbird-dictionary-en-US
-Conflicts: icedove-lang-resources < %{version}
+Conflicts: thunderbird-lang-resources < %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+
-# iceweasel/icedove/iceape provide their own versions
+# firefox/thunderbird/seamonkey provide their own versions
%define _noautoprovfiles %{_libdir}/%{name}/components
%if %{without xulrunner}
# we don't want these to satisfy packages depending on xulrunner
%define objdir %{topdir}/obj-%{_target_cpu}
%description
-Icedove is an open-source, fast and portable email client.
+Thunderbird is an open-source, fast and portable email client.
%description -l pl.UTF-8
-Icedove jest mającym otwarte źródła, szybkim i przenośnym klientem
+Thunderbird jest mającym otwarte źródła, szybkim i przenośnym klientem
poczty.
%package addon-lightning
-Summary: An integrated calendar for Icedove
-Summary(pl.UTF-8): Zintegrowany kalendarz dla Icedove
+Summary: An integrated calendar for Thunderbird
+Summary(pl.UTF-8): Zintegrowany kalendarz dla Thunderbird
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 Icedove email client.
+Lightning is an calendar extension to Thunderbird email client.
%description addon-lightning -l pl.UTF-8
-Lightning to rozszerzenie do klienta poczty Icedove dodające
+Lightning to rozszerzenie do klienta poczty Thunderbird dodające
funkcjonalność kalendarza.
%prep
-%setup -q -n thunderbird-%{version} -a2
-%patch0 -p1
+%setup -q
%patch2 -p1
%patch5 -p2
%patch6 -p1
ac_add_options --enable-system-cairo
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
-ac_add_options --with-branding=icedove/branding
ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
ac_add_options --with-distribution-id=org.pld-linux
%if %{with xulrunner}
installdir=%{_libdir}/%{name} \
PKG_SKIP_STRIP=1
-%{__make} -C icedove/branding install \
- DESTDIR=$RPM_BUILD_ROOT
+cp -a dist/thunderbird/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
-cp -a dist/icedove/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
-
%if %{with xulrunner}
# needed to find mozilla runtime
ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
%endif
-
+
# Enable crash reporter for Thunderbird application
%if %{with crashreporter}
%{__sed} -i -e 's/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/' $RPM_BUILD_ROOT%{_libdir}/%{name}/application.ini
ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
%endif
-%{__sed} -e "s|%MOZAPPDIR%|%{_libdir}/%{name}|" \
- -e "s|%MOZ_APP_DISPLAYNAME%|Icedove|" \
- %{topdir}/mozilla/mozilla/build/unix/mozilla.in > $RPM_BUILD_ROOT%{_libdir}/%{name}/icedove
+#%{__sed} -e "s|%MOZAPPDIR%|%{_libdir}/%{name}|" \
+# -e "s|%MOZ_APP_DISPLAYNAME%|Thunderbird|" \
+# %{topdir}/mozilla/mozilla/build/unix/mozilla.in > $RPM_BUILD_ROOT%{_libdir}/%{name}/thunderbird
-%{__sed} -e 's,@LIBDIR@,%{_libdir},' %{SOURCE5} > $RPM_BUILD_ROOT%{_bindir}/icedove
+%{__sed} -e 's,@LIBDIR@,%{_libdir},' %{SOURCE5} > $RPM_BUILD_ROOT%{_bindir}/thunderbird
ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/thunderbird
ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
-# install icons and desktop file
-cp -p %{topdir}/mozilla/icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-for i in 16 32 48 64 128 256; do
- install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps
- cp -a %{topdir}/mozilla/icedove/branding/icedove${i}.png \
- $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps/icedove.png
-done
-install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps
-cp -a %{topdir}/mozilla/icedove/branding/icedove.svg $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/icedove.svg
-
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
# files created by regxpcom -register in post
# also TMPDIR could be pointing to sudo user's homedir so we reset that too.
t=$(mktemp -d)
%{__rm} -f %{_libdir}/%{name}/components/{compreg,xpti}.dat
-TMPDIR= TMP= HOME=$t %{_libdir}/%{name}/icedove -register
+TMPDIR= TMP= HOME=$t %{_libdir}/%{name}/thunderbird -register
rm -rf $t
EOF
chmod a+rx $RPM_BUILD_ROOT%{_libdir}/%{name}/register
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/icedove
+%attr(755,root,root) %{_bindir}/thunderbird
%attr(755,root,root) %{_bindir}/mozilla-thunderbird
%attr(755,root,root) %{_bindir}/thunderbird
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/components/components.manifest
%attr(755,root,root) %{_libdir}/%{name}/*.sh
%attr(755,root,root) %{_libdir}/%{name}/*-bin
-%attr(755,root,root) %{_libdir}/%{name}/icedove
+%attr(755,root,root) %{_libdir}/%{name}/thunderbird
%attr(755,root,root) %{_libdir}/%{name}/register
%{_libdir}/%{name}/omni.ja
%if %{without xulrunner}
%{_libdir}/%{name}/dictionaries
%endif
-%{_pixmapsdir}/icedove.png
-%{_desktopdir}/icedove.desktop
+%{_pixmapsdir}/thunderbird.png
+%{_desktopdir}/thunderbird.desktop
%dir %{_datadir}/%{name}
%dir %{_libdir}/%{name}/distribution
%ghost %{_libdir}/%{name}/components/compreg.dat
%ghost %{_libdir}/%{name}/components/xpti.dat
-%{_iconsdir}/hicolor/*/apps/icedove.*
+%{_iconsdir}/hicolor/*/apps/thunderbird.*
%if %{with lightning}
%files addon-lightning