- up to 6.0, adds x86_64 arch

Changed files:
    mozilla-thunderbird-bin.sh -> 1.2
    mozilla-thunderbird-bin.spec -> 1.12

diff --git a/mozilla-thunderbird-bin.sh b/mozilla-thunderbird-bin.sh
index c61391a0cac86489306a514ca58dbb65fcb02a17..bc0e3fe907d755b194efc99e54165a5db08030ce 100644 (file)
--- a/mozilla-thunderbird-bin.sh
+++ b/mozilla-thunderbird-bin.sh
@@ -1,21 +1,22 @@
 #!/bin/sh
 # based on script by (c) vip at linux.pl, wolf at pld-linux.org
 
-MOZILLA_FIVE_HOME=/usr/lib/mozilla-thunderbird-bin
-if [ "$1" == "-remote" ]; then
-       $MOZILLA_FIVE_HOME/thunderbird "$@"
-else
-       PING=`$MOZILLA_FIVE_HOME/thunderbird -remote 'ping()' 2>&1 >/dev/null`
-       if [ -n "$PING" ]; then
-               $MOZILLA_FIVE_HOME/thunderbird "$@"
-       else
-               case "$1" in
-                   -compose|-editor)
-                       $MOZILLA_FIVE_HOME/thunderbird -remote 'xfeDoCommand (composeMessage)'
-                       ;;
-                   *)
-                       $MOZILLA_FIVE_HOME/thunderbird -remote 'xfeDoCommand (openInbox)'
-                       ;;
-               esac
-       fi
+app=@libdir@/thunderbird
+
+if [ "$1" = "-remote" ]; then
+       exec "$app" "$@"
+fi
+
+PING=$("$app" -remote 'ping()' 2>&1 >/dev/null)
+if [ -n "$PING" ]; then
+       exec "$app" "$@"
 fi
+
+case "$1" in
+-compose|-editor)
+       exec "$app" -remote 'xfeDoCommand (composeMessage)'
+       ;;
+*)
+       exec "$app" -remote 'xfeDoCommand (openInbox)'
+       ;;
+esac

diff --git a/mozilla-thunderbird-bin.spec b/mozilla-thunderbird-bin.spec
index b9b10156808e3d175c3f694a425fad5cda36841a..a8ed6b6a69a39bf0c60d2ab9d72adf4b5fbdc459 100644 (file)
--- a/mozilla-thunderbird-bin.spec
+++ b/mozilla-thunderbird-bin.spec
@@ -1,36 +1,46 @@
+# TODO
+# ./components/libmozgnome.so matches on libnotify.1, subpackage to -gnome
+%define                realname        thunderbird
 Summary:       Mozilla Thunderbird - email client
 Summary(pl.UTF-8):     Mozilla Thunderbird - klient poczty
 Name:          mozilla-thunderbird-bin
-Version:       3.1.7
-Release:       1
+Version:       6.0
+Release:       0.7
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Networking
-Source0:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/en-US/thunderbird-%{version}.tar.bz2
-# Source0-md5: d8611c9fcf956240144b95c920fd42de
-Source1:       %{name}.desktop
-Source2:       %{name}.sh
+Source0:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/en-US/thunderbird-%{version}.tar.bz2#/%{realname}-%{version}.tar.bz2
+# Source0-md5: 0c114d1afedd118dd2955213d99cf281
+Source1:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/en-US/thunderbird-%{version}.tar.bz2#/%{realname}64-%{version}.tar.bz2
+# Source1-md5: 2c2135ab79c3fb1c2220176af4b99321
+Source2:       %{name}.desktop
+Source3:       %{name}.sh
 URL:           http://www.mozilla.org/projects/thunderbird/
+BuildRequires: tar >= 1:1.15.1
 Requires:      mktemp
 Requires:      myspell-common
 Requires:      sqlite3 >= 3.6.22-2
-ExclusiveArch: i686 athlon
+Requires:      nss >= 1:3.12.10
+ExclusiveArch: i686 athlon %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # already stripped
 %define                _enable_debug_packages  0
 
-%define                nss_caps                libfreebl3.so libnss3.so libnssckbi.so libsmime3.so ibsoftokn3.so libssl3.so libnssutil3.so
 %define                nspr_caps               libnspr4.so libplc4.so libplds4.so
-%define                moz_caps                libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so libxpcom_core.so
+%define                moz_caps                libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so libxpcom_core.so libmozsqlite3.so libmozalloc.so
+
+%define                mozldap_caps    libldap60.so libldif60.so libprldap60.so libssldap60.so
 %define                sqlite_caps             libsqlite3.so
+# temporarily, see todo
+%define                notify_caps             libnotify.so.1
 
-%define                _noautoreqdep           libgfxpsshar.so libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpcom_core.so libxpistub.so
-%define                _noautoprovfiles        %{_libdir}/%{name}/components
+%define                _noautoreqdep           %{nspr_caps}
+%define                _noautoprovfiles        %{_libdir}/%{name}
 
 # list of script capabilities (regexps) not to be used in Provides
 %define     _noautoprov %{moz_caps}
 # and as we don't provide them, don't require either
-%define     _noautoreq  %{_noautoprov} %{sqlite_caps}
+%define     _noautoreq  %{_noautoprov} %{notify_caps}
 
 %description
 Mozilla Thunderbird is an open-source, fast and portable email client.
@@ -41,57 +51,52 @@ Mozilla Thunderbird jest open sourcowym, szybkim i przenośnym klientem
 poczty. Wersja binarna, ze strony %{url}.
 
 %prep
-%setup -qc
+%setup -qcT
+%ifarch %{ix86}
+%{__tar} jxf %{SOURCE0} --strip-components=1
+%endif
+%ifarch %{x8664}
+%{__tar} jxf %{SOURCE1} --strip-components=1
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/plugins,%{_datadir}/%{name},%{_pixmapsdir},%{_desktopdir}}
 
-install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
-cp -a thunderbird/* $RPM_BUILD_ROOT%{_libdir}/%{name}
-cp -a thunderbird/chrome/icons/default/default48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+sed 's,@libdir@,%{_libdir}/%{name},' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/%{name}
+cp -a . $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp -p chrome/icons/default/default48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 # files created by register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
 
 # use system dict
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 
-# use system sqlite
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite3.so
-ln -s /%{_lib}/libsqlite3.so.0 $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite3.so
-
 # move arch independant ones to datadir
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
 ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
-ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
 ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
 ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
-ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
-ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
 
 # never package these
 # nss
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
 # nspr
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
 # mozldap
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
 
 # remove unecessary stuff
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -117,18 +122,21 @@ rm -rf $HOME
 
 %dir %{_libdir}/%{name}/components
 %attr(755,root,root) %{_libdir}/%{name}/components/*.so
-%{_libdir}/%{name}/components/*.js
-%{_libdir}/%{name}/components/*.xpt
+%attr(755,root,root) %{_libdir}/%{name}/components/binary.manifest
 
 %attr(755,root,root) %{_libdir}/%{name}/*.so
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
 %attr(755,root,root) %{_libdir}/%{name}/*-bin
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
+%attr(755,root,root) %{_libdir}/%{name}/plugin-container
+%attr(755,root,root) %{_libdir}/%{name}/precomplete
 %attr(755,root,root) %{_libdir}/%{name}/thunderbird
 
-%{_libdir}/%{name}/platform.ini
 %{_libdir}/%{name}/application.ini
 %{_libdir}/%{name}/blocklist.xml
+%{_libdir}/%{name}/chrome.manifest
+%{_libdir}/%{name}/omni.jar
+%{_libdir}/%{name}/platform.ini
 
 %attr(755,root,root) %{_libdir}/%{name}/crashreporter
 %{_libdir}/%{name}/crashreporter.ini
@@ -146,11 +154,8 @@ rm -rf $HOME
 %{_libdir}/%{name}/chrome
 %{_libdir}/%{name}/defaults
 %{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/greprefs
 %{_libdir}/%{name}/icons
 %{_libdir}/%{name}/isp
-%{_libdir}/%{name}/modules
-%{_libdir}/%{name}/res
 
 %{_pixmapsdir}/*.png
 %{_desktopdir}/*.desktop
@@ -162,8 +167,5 @@ rm -rf $HOME
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
-%{_datadir}/%{name}/greprefs
 %{_datadir}/%{name}/icons
 %{_datadir}/%{name}/isp
-%{_datadir}/%{name}/modules
-%{_datadir}/%{name}/res