commit 94fe1224e3ae146f713aa247287da995f887b0f9
Merge: 50f8bdb 9160b22
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Tue Nov 30 21:51:13 2010 +0000
fix merge
gupnp.spec | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --cc gupnp.spec
index 1d39791,2c6299c..1f5a4c0
--- a/gupnp.spec
+++ b/gupnp.spec
@@@ -27,12 -28,12 +27,12 @@@ The GUPnP API is intended to be easy t
Summary: Development package for gupnp
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
++Requires: glib2-devel
Requires: gssdp-devel
Requires: libsoup-devel
Requires: libxml2-devel
Requires: libuuid-devel
--Requires: glib2-devel
++Requires: pkgconfig
%description devel
Files for development with %{name}.
@@@ -48,7 -49,7 +48,6 @@@ This package contains developer documen
%prep
%setup -q
--%patch0 -p1 -b .fixdso
%build
%configure --disable-static
@@@ -61,9 -62,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
@@@ -87,9 -88,9 +83,12 @@@
%doc %{_datadir}/gtk-doc/html/%{name}
%changelog
+* Tue Nov 30 2010 Peter Robinson <pbrobinson(a)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(a)redhat.com> 0.14.0-2
- Rebuild against newer gobject-introspection