packages: icedove/icedove.spec - fix cvs messup

[shadzik]

Author: shadzik                      Date: Wed Jan 13 12:06:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix cvs messup

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

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.50 packages/icedove/icedove.spec:1.51
--- packages/icedove/icedove.spec:1.50	Wed Jan 13 12:59:08 2010
+++ packages/icedove/icedove.spec	Wed Jan 13 13:06:34 2010
@@ -262,14 +262,9 @@
 
 %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 \
@@ -405,6 +400,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2010/01/13 12:06:34  shadzik
+- fix cvs messup
+
 Revision 1.50  2010/01/13 11:59:08  shadzik
 - rel .3
 
================================================================

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