packages: icedove/icedove.spec - rel .3

[shadzik]

Author: shadzik                      Date: Wed Jan 13 11:59:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel .3

---- Files affected:
packages/icedove:
   icedove.spec (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.49 packages/icedove/icedove.spec:1.50
--- packages/icedove/icedove.spec:1.49	Tue Jan  5 08:48:57 2010
+++ packages/icedove/icedove.spec	Wed Jan 13 12:59:08 2010
@@ -25,7 +25,7 @@
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
 Version:	3.0
-Release:	0.2
+Release:	0.3
 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
@@ -133,7 +133,7 @@
 cd comm-1.9.1
 %{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
 /bin/sh %{SOURCE3}
-%patch0 -p1
+%patch0 -p2
 %{?with_enigmail:%patch1 -p1}
 %patch2 -p1
 %patch3 -p1
@@ -262,9 +262,14 @@
 
 %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 \
@@ -400,6 +405,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2010/01/13 11:59:08  shadzik
+- rel .3
+
 Revision 1.49  2010/01/05 07:48:57  paszczus
 - added bconf for lightning
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.49&r2=1.50&f=u