Author: mrl Date: Thu Feb 15 13:48:44 2007 New Revision: 121381 Removed: packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird.sh.in Modified: packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec
Log: - Use only startup script provided by upstream. Closes: #28051 - Dropped startup script adopted from Fedora. Upstream one seems better at all. - Bumped release. Modified: packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec ============================================================================== --- packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec (original) +++ packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec Thu Feb 15 13:48:44 2007 @@ -49,7 +49,7 @@ Summary: A full-featured email, RSS, and newsgroup client Name: mozilla-thunderbird Version: 2.0b2 -Release: %mkrel 2 +Release: %mkrel 3 Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -59,7 +59,6 @@ Source10: mozilla-thunderbird-mozconfig Source11: mozilla-thunderbird-mozconfig-branded Source12: mozilla-thunderbird-mandriva-default-prefs.js -Source21: mozilla-thunderbird.sh.in # This is a larger icon than in `other-licenses/branding/thunderbird' Source22: mozilla-thunderbird-official.png Source30: mozilla-thunderbird-open-browser.sh @@ -328,15 +327,12 @@ EOF # set up the thunderbird start script -%{__cat} %{SOURCE21} | %{__perl} -p -e 's,thunderbird-TBIRD_VERSION,%{name}-%{version},g' > \ - %{buildroot}%{_bindir}/%{name} -%{__chmod} 755 %{buildroot}/%{_bindir}/%{name} -(cd %{buildroot}%{_bindir} && %{__ln_s} %{name} thunderbird) +(cd %{buildroot}%{_bindir} && %{__ln_s} thunderbird %{name}) -%{__perl} -pi -e 's|^moz_libdir=.*|moz_libdir=%{tbdir}|' %{buildroot}/%{tbdir}/thunderbird +%{__perl} -pi -e 's|^moz_libdir=.*|moz_libdir=%{tbdir}|' %{buildroot}/%{_bindir}/thunderbird +%{__perl} -pi -e 's|^MRE_HOME=.*|MRE_HOME=%{tbdir}|' %{buildroot}/%{_bindir}/thunderbird %{__install} -m 755 %{SOURCE30} %{buildroot}/%{tbdir}/open-browser.sh -%{__perl} -pi -e 's|LIBDIR|%{_libdir}|g' %{buildroot}/%{tbdir}/open-browser.sh %{__cat} %{SOURCE12} | %{__perl} -p -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g;' \ -e 's,THUNDERBIRD_VENDOR_COMMENT,%{mandriva_release},g;' \
