From 846b5c89ebe359ebd8500ffb16b42f33ac7f326cdf64bbcfcac937a2a589d36e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 28 Jul 2009 23:23:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=35 --- MozillaThunderbird.changes | 5 +++++ MozillaThunderbird.spec | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 3281d71..ee72a4b 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 28 12:59:23 CEST 2009 - wr@rosenauer.org + +- fixed wrong %exclude by removing unwanted files at %install stage + ------------------------------------------------------------------- Fri Jul 17 13:48:02 CEST 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 96e9286..b4d5d2b 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -30,7 +30,7 @@ BuildRequires: nss-shared-helper-devel License: GPL v2 or later ; LGPL v2.1 or later ; MPL .. %define mainversion 3.0b3 Version: %{mainversion} -Release: 1 +Release: 2 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -136,7 +136,7 @@ This package contains the Lightning calendar extension for Mozilla Thunderbird. %package -n enigmail Version: 0.95.99 -Release: 1 +Release: 2 License: GPL v2 or later ; MPL .. Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients @@ -343,6 +343,17 @@ for size in 16 22 24 32 48 256; do ln -sf %{progdir}/chrome/icons/default/default$size.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{progname}.png done %suse_update_desktop_file %{name} Network Email GTK +# excluded files +# excluded files +rm -f $RPM_BUILD_ROOT%{progdir}/thunderbird +rm -f $RPM_BUILD_ROOT%{progdir}/removed-files +rm -f $RPM_BUILD_ROOT%{progdir}/updater +rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini +rm -f $RPM_BUILD_ROOT%{progdir}/update.locale +rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US* +%if %lightning +rm -f $RPM_BUILD_ROOT%{progdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} +%endif # Some sites use different partitions for /usr/(lib|lib64) and /usr/share. Since you # can't create hardlinks across partitions, we'll do this more than once. %fdupes $RPM_BUILD_ROOT%{progdir} @@ -404,7 +415,6 @@ exit 0 %{progdir}/mozilla-xremote-client %{progdir}/platform.ini %{progdir}/run-mozilla.sh -%{progdir}/thunderbird %{progdir}/thunderbird-bin %{progdir}/components/ %{progdir}/modules/ @@ -426,16 +436,6 @@ exit 0 %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{progname}.png %{_bindir}/%{progname} -# excluded files -%exclude %{progdir}/thunderbird -%exclude %{progdir}/removed-files -%exclude %{progdir}/updater -%exclude %{progdir}/updater.ini -%exclude %{progdir}/update.locale -%exclude %{progdir}/dictionaries/en-US* -%if %lightning -%exclude %{progdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} -%endif %if %localize %files translations -f %{_tmppath}/translations.list