up to 31.7.0

[packages/mozilla-thunderbird-bin.git] / mozilla-thunderbird-bin.spec

diff --git a/mozilla-thunderbird-bin.spec b/mozilla-thunderbird-bin.spec
index 96587786c777a6d2e5119ddef380bab99a0fc64b..cef5d59065ebb5e7769e938ab6721ca5a2da97f5 100644 (file)
--- a/mozilla-thunderbird-bin.spec
+++ b/mozilla-thunderbird-bin.spec
@@ -4,22 +4,23 @@
 Summary:       Mozilla Thunderbird - email client
 Summary(pl.UTF-8):     Mozilla Thunderbird - klient poczty
 Name:          mozilla-thunderbird-bin
-Version:       17.0.8
+Version:       31.7.0
 Release:       1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Networking
 Source0:       http://download.cdn.mozilla.net/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/en-US/thunderbird-%{version}.tar.bz2?/%{realname}-%{version}.tar.bz2
-# Source0-md5: 8fc86eb1ae2f42e2ab754aebe181e1f6
+# Source0-md5: 1aea3ec5288fb1f2534b63c8f604c8a2
 Source1:       http://download.cdn.mozilla.net/pub/mozilla.org/thunderbird/releases/%{version}/linux-x86_64/en-US/thunderbird-%{version}.tar.bz2?/%{realname}64-%{version}.tar.bz2
-# Source1-md5: ab51a6e97f4642e6eb4d7ce9bc97b796
+# Source1-md5: 8583be98ce9b278da1887df68d85689b
 Source2:       %{name}.desktop
 Source3:       %{name}.sh
 URL:           http://www.mozilla.org/projects/thunderbird/
 BuildRequires: tar >= 1:1.15.1
+Requires(post,postun): desktop-file-utils
 Requires:      mktemp
 Requires:      myspell-common
 Requires:      sqlite3 >= 3.6.22-2
-Requires:      nss >= 1:3.12.10
+Requires:      nss >= 1:3.13.0
 ExclusiveArch: i686 athlon %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -92,13 +93,16 @@ ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/search
 
 # never package these
 # nss
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
+%{__rm} $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} $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} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap}60.so
+grep -v 'lib\(nspr4\|plc4\|plds4\|nssutil3\|nss3\|smime3\|ssl3\|ldap60\|ldif60\|prldap60\).so' \
+       dependentlibs.list > $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
 
 # remove update notifier, we prefer rpm packages for updating
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/update-settings.ini
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/updater
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/updater.ini
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/Throbber-small.gif
@@ -106,13 +110,12 @@ ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/search
 
 # remove unecessary stuff
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files
-# testpilot quiz
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%update_desktop_database_post
 # it attempts to register crashreport in $HOME/.thunderbird
 # make temporary $HOME to avoid polluting home of user installing this package
 # via sudo.
@@ -125,6 +128,9 @@ umask 022
 
 rm -rf $HOME
 
+%postun
+%update_desktop_database_postun
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}
@@ -133,7 +139,7 @@ rm -rf $HOME
 
 %dir %{_libdir}/%{name}/components
 %attr(755,root,root) %{_libdir}/%{name}/components/*.so
-%attr(755,root,root) %{_libdir}/%{name}/components/binary.manifest
+%attr(755,root,root) %{_libdir}/%{name}/components/components.manifest
 
 %attr(755,root,root) %{_libdir}/%{name}/*.so
 %attr(755,root,root) %{_libdir}/%{name}/*.sh