rpms/glib2/devel glib2.spec,1.147,1.148

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/glib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27335

Modified Files:
	glib2.spec 
Log Message:
fix spec



Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- glib2.spec	22 Dec 2007 18:06:02 -0000	1.147
+++ glib2.spec	22 Dec 2007 18:24:02 -0000	1.148
@@ -10,13 +10,13 @@
 Source: http://download.gnome.org/sources/glib/2.15/glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
-Patch0: desktopfiles.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig >= 1:0.14
 BuildRequires: gamin-devel
 BuildRequires: gettext
 
 Patch0: glib-2.15.0-gtestutils.patch
+Patch1: desktopfiles.patch
 
 %description 
 GLib is the low-level core library that forms the basis
@@ -49,11 +49,8 @@
 
 %prep
 %setup -q -n glib-%{version}
-<<<<<<< glib2.spec
-%patch0 -p1 -b .desktopfiles
-=======
 %patch0 -p1 -b .gtestutils.patch
->>>>>>> 1.146
+%patch1 -p1 -b .desktopfiles
 
 %build
 for i in config.guess config.sub ; do