- up to 3.0.1

[packages/thunderbird.git] / icedove.spec

diff --git a/icedove.spec b/icedove.spec
index d952e38802774406cf66f991ce81b89c472f9039..27814de3a5a112680b9ca313afeacf6a282fdac0 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -23,12 +23,12 @@
 Summary:       Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
-Version:       3.0
-Release:       0.3
+Version:       3.0.1
+Release:       0.1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         Applications/Networking
 Source0:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
-# Source0-md5: 9a564ac2489b1b0f9348dc298b913f6c
+# Source0-md5: f004aa5ddf2a30b5df96e06df416b0c9
 Source1:       http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5: e3a6d379f1a72ac023751bdde2de750a
 Source2:       %{name}-branding.tar.bz2
@@ -261,14 +261,9 @@ cd mailnews/extensions/enigmail
 
 %install
 rm -rf $RPM_BUILD_ROOT
-<<<<<<< icedove.spec
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_libdir}/icedove,%{_pixmapsdir},%{_desktopdir}} \
-       $RPM_BUILD_ROOT%{_datadir}/%{name}
-=======
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} \
               $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
->>>>>>> 1.49
 
 cd comm-1.9.1
 %{__make} -C obj-%{_target_cpu}/mail/installer stage-package \
@@ -391,6 +386,7 @@ exit 0
 
 %dir %{_libdir}/%{name}/extensions
 %{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
 
 %if %{with enigmail}
 %files addon-enigmail