SPECS: gnome-mount.spec - resolved conflict

[qboosh]

Author: qboosh                       Date: Wed Feb 14 21:41:07 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- resolved conflict

---- Files affected:
SPECS:
   gnome-mount.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/gnome-mount.spec
diff -u SPECS/gnome-mount.spec:1.20 SPECS/gnome-mount.spec:1.21
--- SPECS/gnome-mount.spec:1.20	Tue Feb 13 08:16:46 2007
+++ SPECS/gnome-mount.spec	Wed Feb 14 22:41:02 2007
@@ -2,24 +2,13 @@
 Summary:	Programs for mounting, unmounting and ejecting storage devices
 Summary(pl.UTF-8):	Programy do montowania, odmontowywania i wysuwania urządzeń do przechowywania danych
 Name:		gnome-mount
-<<<<<<< gnome-mount.spec
-Version:	0.4
-Release:	4.1
-=======
 Version:	0.5
 Release:	2
->>>>>>> 1.18
 License:	GPL v.2
 Group:		Applications
 Source0:	http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
 # Source0-md5:	76622ff9af0131fc44687aed7204f84f
 Patch0:		%{name}-shortname.patch
-<<<<<<< gnome-mount.spec
-Patch1:		%{name}-drive_mount.patch
-Patch2:		%{name}-no_media.patch
-Patch3:		%{name}-options.patch
-=======
->>>>>>> 1.18
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.61
@@ -58,12 +47,6 @@
 %prep
 %setup -q
 %patch0 -p1
-<<<<<<< gnome-mount.spec
-%patch1	-p0
-%patch2 -p0
-%patch3 -p1
-=======
->>>>>>> 1.18
 
 %build
 %{__glib_gettextize}
@@ -115,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/02/14 21:41:02  qboosh
+- resolved conflict
+
 Revision 1.20  2007/02/13 07:16:46  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-mount.spec?r1=1.20&r2=1.21&f=u