rpms/thunderbird
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Sync with Mozilla latest RC1 build

Browse Source
This commit is contained in:
Jan Horak 2009-11-25 10:56:33 +00:00
parent 784954b70c
commit 0a72502f6c
1 changed files with 87 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
thunderbird.spec
View File

@ -17,6 +17,7 @@
%define mozappdir %{_libdir}/thunderbird-%{version} %define mozappdir %{_libdir}/thunderbird-%{version}
%define official_branding 1 %define official_branding 1
%define include_debuginfo 0
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
@ -37,15 +38,16 @@ Source1: thunderbird-langpacks-%{version_internal}-20091118.tar.bz2
Source10: thunderbird-mozconfig Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded Source11: thunderbird-mozconfig-branded
Source12: thunderbird-redhat-default-prefs.js Source12: thunderbird-redhat-default-prefs.js
Source13: thunderbird-mozconfig-debuginfo
Source20: thunderbird.desktop Source20: thunderbird.desktop
Source21: thunderbird.sh.in Source21: thunderbird.sh.in
Source22: thunderbird.png
Source30: thunderbird-open-browser.sh Source30: thunderbird-open-browser.sh
Source100: find-external-requires Source100: find-external-requires
Patch1: mozilla-jemalloc.patch Patch1: mozilla-jemalloc.patch
Patch2: thunderbird-shared-error.patch Patch2: thunderbird-shared-error.patch
#Patch3: fix-include.patch Patch3: thunderbird-debuginfo-fix-include.patch
Patch4: thunderbird-clipboard-crash.patch
%if %{official_branding} %if %{official_branding}
# Required by Mozilla Corporation # Required by Mozilla Corporation
@ -96,37 +98,37 @@ AutoProv: 0
%description %description
Mozilla Thunderbird is a standalone mail and newsgroup client. Mozilla Thunderbird is a standalone mail and newsgroup client.
%package devel #%package devel
Summary: Development files for Thunderbird #Summary: Development files for Thunderbird
Group: Development/Libraries #Group: Development/Libraries
Provides: thunderbird-devel = %{version} #Provides: thunderbird-devel = %{version}
#
Requires: thunderbird = %{version}-%{release} #Requires: thunderbird = %{version}-%{release}
Requires: nspr-devel >= %{nspr_version} #Requires: nspr-devel >= %{nspr_version}
Requires: nss-devel >= %{nss_version} #Requires: nss-devel >= %{nss_version}
Requires: cairo-devel >= %{cairo_version} #Requires: cairo-devel >= %{cairo_version}
Requires: libjpeg-devel #Requires: libjpeg-devel
Requires: bzip2-devel #Requires: bzip2-devel
Requires: zlib-devel #Requires: zlib-devel
Requires: libIDL-devel #Requires: libIDL-devel
Requires: gtk2-devel #Requires: gtk2-devel
Requires: gnome-vfs2-devel #Requires: gnome-vfs2-devel
Requires: libgnome-devel #Requires: libgnome-devel
Requires: libgnomeui-devel #Requires: libgnomeui-devel
Requires: krb5-devel #Requires: krb5-devel
Requires: pango-devel #Requires: pango-devel
Requires: freetype-devel >= %{freetype_version} #Requires: freetype-devel >= %{freetype_version}
Requires: libXt-devel #Requires: libXt-devel
Requires: libXrender-devel #Requires: libXrender-devel
Requires: hunspell-devel #Requires: hunspell-devel
#TEMP Requires: sqlite-devel #Requires: sqlite-devel
Requires: startup-notification-devel #Requires: startup-notification-devel
Requires: alsa-lib-devel #Requires: alsa-lib-devel
#Requires: libnotify-devel #Requires: libnotify-devel
%description devel #%description devel
Thunderbird development files. #Thunderbird development files.
#
#=============================================================================== #===============================================================================
%prep %prep
@ -135,7 +137,12 @@ cd %{tarballdir}
%patch1 -p0 -b .jemalloc %patch1 -p0 -b .jemalloc
%patch2 -p1 -b .shared-error %patch2 -p1 -b .shared-error
#%patch3 -p1 -b .fix-include
%if %{include_debuginfo}
%patch3 -p1 -b .fix-include
%endif
%patch4 -p1 -b .clipboard-crash
%if %{official_branding} %if %{official_branding}
# Required by Mozilla Corporation # Required by Mozilla Corporation
@ -153,6 +160,9 @@ cd %{tarballdir}
%if %{official_branding} %if %{official_branding}
%{__cat} %{SOURCE11} >> .mozconfig %{__cat} %{SOURCE11} >> .mozconfig
%endif %endif
%if %{include_debuginfo}
%{__cat} %{SOURCE13} >> .mozconfig
%endif
#=============================================================================== #===============================================================================
@ -179,8 +189,10 @@ export MAKE="gmake %{moz_make_flags}"
make -f client.mk build make -f client.mk build
# create debuginfo for crash-stats.mozilla.com # create debuginfo for crash-stats.mozilla.com
#cd %{moz_objdir} %if %{include_debuginfo}
#make buildsymbols cd %{moz_objdir}
make buildsymbols
%endif
#=============================================================================== #===============================================================================
@ -191,10 +203,29 @@ cd %{tarballdir}
cd %{moz_objdir} cd %{moz_objdir}
DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT make install
# install icons
cd - cd -
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications,%{_datadir}/icons/hicolor/48x48/apps} %{__cp} other-licenses/branding/%{name}/mailicon16.png \
$RPM_BUILD_ROOT/%{mozappdir}/icons/
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
%{__cp} other-licenses/branding/%{name}/mailicon16.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/thunderbird.png
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps
%{__cp} other-licenses/branding/%{name}/mailicon22.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps/thunderbird.png
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
%{__cp} other-licenses/branding/%{name}/mailicon24.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/thunderbird.png
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
%{__cp} other-licenses/branding/%{name}/mailicon32.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/thunderbird.png
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
%{__cp} other-licenses/branding/%{name}/mailicon48.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/thunderbird.png
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps
%{__cp} other-licenses/branding/%{name}/mailicon256.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/thunderbird.png
%{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
desktop-file-install --vendor mozilla \ desktop-file-install --vendor mozilla \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@ -284,9 +315,11 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
# Add debuginfo for crash-stats.mozilla.com # Add debuginfo for crash-stats.mozilla.com
#cp mozilla/dist/thunderbird-%{version_internal}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir} TODO arch %if %{include_debuginfo}
#%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} cp mozilla/dist/thunderbird-%{version_internal}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
#%{__cp} %{moz_objdir}/mozilla/dist/thunderbird-%{version_internal}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir} mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
cp %{moz_objdir}/mozilla/dist/thunderbird-%{version_internal}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
%endif
%clean %clean
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
@ -309,7 +342,6 @@ fi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%attr(755,root,root) %{_bindir}/thunderbird %attr(755,root,root) %{_bindir}/thunderbird
%attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
%attr(644,root,root) %{_datadir}/pixmaps/thunderbird.png
%dir %{mozappdir} %dir %{mozappdir}
%doc %{mozappdir}/LICENSE %doc %{mozappdir}/LICENSE
%{mozappdir}/chrome %{mozappdir}/chrome
@ -334,9 +366,6 @@ fi
%{mozappdir}/thunderbird %{mozappdir}/thunderbird
%{mozappdir}/updater %{mozappdir}/updater
%{mozappdir}/*.so %{mozappdir}/*.so
#%{mozappdir}/crashreporter
#%{mozappdir}/crashreporter.ini
#%{mozappdir}/Throbber-small.gif
%dir %{mozappdir}/modules %dir %{mozappdir}/modules
%{mozappdir}/modules/*.jsm %{mozappdir}/modules/*.jsm
%{mozappdir}/modules/*.js %{mozappdir}/modules/*.js
@ -348,11 +377,20 @@ fi
%{mozappdir}/platform.ini %{mozappdir}/platform.ini
%{mozappdir}/updater.ini %{mozappdir}/updater.ini
%{mozappdir}/application.ini %{mozappdir}/application.ini
#%exclude %{mozappdir}/LICENSE.txt
#%exclude %{mozappdir}/license.html
%exclude %{mozappdir}/dependentlibs.list %exclude %{mozappdir}/dependentlibs.list
%exclude %{mozappdir}/removed-files %exclude %{mozappdir}/removed-files
%{mozappdir}/update.locale %{mozappdir}/update.locale
%{_datadir}/icons/hicolor/16x16/apps/thunderbird.png
%{_datadir}/icons/hicolor/22x22/apps/thunderbird.png
%{_datadir}/icons/hicolor/24x24/apps/thunderbird.png
%{_datadir}/icons/hicolor/256x256/apps/thunderbird.png
%{_datadir}/icons/hicolor/32x32/apps/thunderbird.png
%{_datadir}/icons/hicolor/48x48/apps/thunderbird.png
%if %{include_debuginfo}
%{mozappdir}/crashreporter
%{mozappdir}/crashreporter.ini
%{mozappdir}/Throbber-small.gif
%endif
# TODO: devel package # TODO: devel package
#%files devel #%files devel
@ -366,7 +404,10 @@ fi
#=============================================================================== #===============================================================================
%changelog %changelog
* Thu Nov 19 2009 Jan Horak <jhorak@redhat.com> - 3.0-3.10.rc1 * Wed Nov 25 2009 Jan Horak <jhorak@redhat.com> - 3.0-3.12.rc1
- Sync with Mozilla latest RC1 build
* Thu Nov 19 2009 Jan Horak <jhorak@redhat.com> - 3.0-3.11.rc1
- Update to RC1 - Update to RC1
* Thu Sep 17 2009 Christopher Aillon <caillon@redhat.com> - 3.0-3.9.b4 * Thu Sep 17 2009 Christopher Aillon <caillon@redhat.com> - 3.0-3.9.b4