- up to 31.5.0

- drop -f flag from rm

diff --git a/mozilla-thunderbird-bin.spec b/mozilla-thunderbird-bin.spec
index c70974f43ba64e978af6918eefd8483816a31bce..214013a6c45aded7ff8af5a8774906fb27a24afd 100644 (file)
--- a/mozilla-thunderbird-bin.spec
+++ b/mozilla-thunderbird-bin.spec
@@ -4,14 +4,14 @@
 Summary:       Mozilla Thunderbird - email client
 Summary(pl.UTF-8):     Mozilla Thunderbird - klient poczty
 Name:          mozilla-thunderbird-bin
-Version:       31.4.0
+Version:       31.5.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: 84536b725fd93b9beb1aaed07405e8c7
+# Source0-md5: ef17b16266fdceb8de556af6c7adbfd1
 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: 8129ec3e341f980c4914d06633d4f94a
+# Source1-md5: 86c97bf32bc41b8dbf9a766b7e886d38
 Source2:       %{name}.desktop
 Source3:       %{name}.sh
 URL:           http://www.mozilla.org/projects/thunderbird/
@@ -93,12 +93,12 @@ 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
-grep -v 'lib\(nspr4\|plc4\|plds4\|nssutil3\|nss3\|smime3\|ssl3\|ldap60\|ldif60\|prldap60\|ssldap60\).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