fix merge

gupnp.spec

@@ -27,12 +27,12 @@ The GUPnP API is intended to be easy to use, efficient and flexible.
 Summary: Development package for gupnp
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: glib2-devel
 Requires: gssdp-devel
-Requires: pkgconfig
 Requires: libsoup-devel
 Requires: libxml2-devel
 Requires: libuuid-devel
-Requires: glib2-devel
+Requires: pkgconfig
 
 %description devel
 Files for development with %{name}.
@@ -48,7 +48,6 @@ This package contains developer documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixdso
 
 %build
 %configure --disable-static
@@ -61,9 +60,6 @@ make install DESTDIR=%{buildroot}
 #Remove libtool archives.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -90,6 +86,9 @@ rm -rf %{buildroot}
 * Tue Nov 30 2010 Peter Robinson <pbrobinson@gmail.com> 0.15.0-1
 - Update to 0.15.0
 
+* Wed Sep 29 2010 jkeating - 0.14.0-3
+- Rebuilt for gcc bug 634757
+
 * Wed Sep 22 2010 Matthias Clasen <mclasen@redhat.com> 0.14.0-2
 - Rebuild against newer gobject-introspection