From 9cf61a894ef7ac09fbd1dc814b2fe470f4a0eb6e Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Fri, 15 Apr 2011 17:12:23 -0700 Subject: [PATCH 1/7] Update scriptlets per the latest guidelines http://fedoraproject.org/wiki/Packaging/ScriptletSnippets --- thunderbird.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/thunderbird.spec b/thunderbird.spec index c810284..1c8408e 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -312,20 +312,18 @@ cp objdir-tb/mozilla/dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUI %post update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -#=============================================================================== +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + #=============================================================================== %files -f %{tarballdir}/%{name}.lang From a9f5f5cc2bf4ad6b6fc9c1d59a65cbfe344b5086 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Sat, 16 Apr 2011 09:57:06 -0700 Subject: [PATCH 2/7] Match up cd pairs --- thunderbird.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thunderbird.spec b/thunderbird.spec index 1c8408e..85b34ba 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -202,9 +202,9 @@ MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME} cd %{moz_objdir} DESTDIR=$RPM_BUILD_ROOT make install +cd - # install icons -cd - %{__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 From f034cca7c0ada8a4bd72bbca63eba7c0e5dad8de Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Sat, 16 Apr 2011 10:00:01 -0700 Subject: [PATCH 3/7] Simplify the icon install code --- thunderbird.spec | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/thunderbird.spec b/thunderbird.spec index 85b34ba..269b55c 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -205,24 +205,11 @@ DESTDIR=$RPM_BUILD_ROOT make install cd - # install 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 +for s in 16 22 24 32 48 256; do + %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps + %{__cp} other-licenses/branding/%{name}/mailicon${s}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/thunderbird.png +done desktop-file-install --vendor mozilla \ From 2d819a7fc0738a78459322200fca61325d7af170 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Sat, 16 Apr 2011 10:02:24 -0700 Subject: [PATCH 4/7] Preserve icon file timestamps --- thunderbird.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thunderbird.spec b/thunderbird.spec index 269b55c..eff5460 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -207,8 +207,8 @@ cd - # install icons for s in 16 22 24 32 48 256; do %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps - %{__cp} other-licenses/branding/%{name}/mailicon${s}.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/thunderbird.png + %{__cp} -p other-licenses/branding/%{name}/mailicon${s}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/thunderbird.png done From fa9d4b612f3e7562047aa253fad78736eb107af5 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 21 Apr 2011 14:38:20 -0700 Subject: [PATCH 5/7] Just use topsrcdir as our objdir This matches how most Fedora packages get built. It also matches what we do in xulrunner --- thunderbird-mozconfig | 2 +- thunderbird.spec | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig index 8db276b..6b5fc85 100644 --- a/thunderbird-mozconfig +++ b/thunderbird-mozconfig @@ -1,6 +1,6 @@ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@ mk_add_options AUTOCONF=autoconf-2.13 #ac_add_options --with-system-png diff --git a/thunderbird.spec b/thunderbird.spec index eff5460..79f2a30 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -5,7 +5,6 @@ %define sqlite_version 3.6.14 %define libnotify_version 0.4 %define build_langpacks 1 -%define moz_objdir objdir-tb %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} # The tarball is pretty inconsistent with directory structure. @@ -186,7 +185,6 @@ make -f client.mk build # create debuginfo for crash-stats.mozilla.com %if %{enable_mozilla_crashreporter} -cd %{moz_objdir} make buildsymbols %endif @@ -200,9 +198,7 @@ INTERNAL_GECKO=%{version_internal} INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO} MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME} -cd %{moz_objdir} DESTDIR=$RPM_BUILD_ROOT make install -cd - # install icons for s in 16 22 24 32 48 256; do @@ -292,7 +288,7 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat # Debug symbols are stored in /usr/lib even in x86_64 arch DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"` mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} -cp objdir-tb/mozilla/dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} +cp dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} %endif #=============================================================================== From 6f27a5fda229d54b55b752feb9da5a71680b6e24 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 21 Apr 2011 15:35:33 -0700 Subject: [PATCH 6/7] Split out mozilla crashreporter symbols to its own debuginfo package These are symbols for mozilla.org's crashreporter server, and aren't needed for normal debuginfo usage. --- thunderbird.spec | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/thunderbird.spec b/thunderbird.spec index 79f2a30..d31fd9f 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -108,6 +108,25 @@ AutoProv: 0 %description Mozilla Thunderbird is a standalone mail and newsgroup client. +%if %{enable_mozilla_crashreporter} +%global moz_debug_prefix %{_prefix}/lib/debug +%global moz_debug_dir %{moz_debug_prefix}%{mozappdir} +%global uname_m %(uname -m) +%global symbols_file_name %{name}-%{version}.en-US.%{_os}-%{uname_m}.crashreporter-symbols.zip +%global symbols_file_path %{moz_debug_dir}/%{symbols_file_name} +%global _find_debuginfo_opts -p %{symbols_file_path} -o debugcrashreporter.list +%global crashreporter_pkg_name mozilla-crashreporter-%{name}-debuginfo +%package -n %{crashreporter_pkg_name} +Summary: Debugging symbols used by Mozilla's crash reporter servers +Group: Development/Debug +%description -n %{crashreporter_pkg_name} +This package provides debug information for XULRunner, for use by +Mozilla's crash reporter servers. If you are trying to locally +debug %{name}, you want to install %{name}-debuginfo instead. +%files -n %{crashreporter_pkg_name} -f debugcrashreporter.list +%defattr(-,root,root) +%endif + %prep %setup -q -c @@ -285,10 +304,8 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat # Add debuginfo for crash-stats.mozilla.com %if %{enable_mozilla_crashreporter} -# Debug symbols are stored in /usr/lib even in x86_64 arch -DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"` -mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} -cp dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} +%{__mkdir_p} $RPM_BUILD_ROOT/%{moz_debug_dir} +%{__cp} dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir} %endif #=============================================================================== From 1b55117f69db4d15c6ef8655da0eac3bc34bdbf5 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 21 Apr 2011 15:40:35 -0700 Subject: [PATCH 7/7] Bump release to -7 --- thunderbird.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/thunderbird.spec b/thunderbird.spec index d31fd9f..2b0ccf5 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -29,7 +29,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 3.1.9 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -382,6 +382,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Thu Apr 21 2011 Christopher Aillon - 3.1.9-7 +- Make gvfs-open launch a compose window (salimma) +- Spec file cleanups (salimma, caillon) +- Split out mozilla crashreporter symbols to its own debuginfo package (caillon) + * Sat Apr 2 2011 Christopher Aillon - 3.1.9-6 - Drop gio support: the code hooks don't exist yet for TB 3.1.x