diff --git a/.gitignore b/.gitignore index 6d9e46a..d12f099 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ gupnp-igd-0.1.7.tar.gz +/gupnp-igd-0.2.1.tar.gz diff --git a/gupnp-igd-0.1.7-make.patch b/gupnp-igd-0.1.7-make.patch deleted file mode 100644 index fb72002..0000000 --- a/gupnp-igd-0.1.7-make.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up gupnp-igd-0.1.7/gtk-doc.make gupnp-igd-0.1.7/gtk-doc -diff -up gupnp-igd-0.1.7/python/Makefile.am.make gupnp-igd-0.1.7/python/Makefile.am ---- gupnp-igd-0.1.7/python/Makefile.am.make 2010-12-23 14:28:49.000000000 +0100 -+++ gupnp-igd-0.1.7/python/Makefile.am 2010-12-23 14:28:59.000000000 +0100 -@@ -1,5 +1,4 @@ - PYDEFS=`pkg-config --variable=defsdir pygobject-2.0` --[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`] - - AM_CPPFLAGS = \ - -I. \ -diff -up gupnp-igd-0.1.7/python/Makefile.in.make gupnp-igd-0.1.7/python/Makefile.in ---- gupnp-igd-0.1.7/python/Makefile.in.make 2010-12-23 14:28:56.000000000 +0100 -+++ gupnp-igd-0.1.7/python/Makefile.in 2010-12-23 14:29:21.000000000 +0100 -@@ -640,8 +640,6 @@ uninstall-am: uninstall-pygupnpigdLTLIBR - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-pygupnpigdLTLIBRARIES uninstall-pygupnpigdPYTHON - --[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`] -- - pygupnp-igd.c: $(srcdir)/pygupnp-igd.override $(srcdir)/pygupnp-igd.defs - $(PYCODEGEN) \ - --prefix igd \ diff --git a/gupnp-igd-gcc.patch b/gupnp-igd-gcc.patch deleted file mode 100644 index 67791c0..0000000 --- a/gupnp-igd-gcc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 251a7c4bf1817a98140ab1ca80a0c636945d65bb Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Olivier=20Cr=C3=AAte?= -Date: Mon, 20 Dec 2010 16:27:12 +0530 -Subject: [PATCH] simpleigdthread: Add typecast to make newer GCC happy - -Report by Peter Robinson -http://bugzilla.openedhand.com/show_bug.cgi?id=2209 ---- - libgupnp-igd/gupnp-simple-igd-thread.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libgupnp-igd/gupnp-simple-igd-thread.c b/libgupnp-igd/gupnp-simple-igd-thread.c -index bd4476e..905880d 100644 ---- a/libgupnp-igd/gupnp-simple-igd-thread.c -+++ b/libgupnp-igd/gupnp-simple-igd-thread.c -@@ -214,7 +214,7 @@ gupnp_simple_igd_thread_dispose (GObject *object) - { - GSource *src = g_idle_source_new (); - -- g_source_set_callback (src, stop_loop, self, NULL); -+ g_source_set_callback (src, (GSourceFunc) stop_loop, self, NULL); - g_source_attach (src, self->priv->context); - g_source_unref (src); - --- -1.6.1 - diff --git a/gupnp-igd.spec b/gupnp-igd.spec index 53d03ec..e090309 100644 --- a/gupnp-igd.spec +++ b/gupnp-igd.spec @@ -1,16 +1,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gupnp-igd -Version: 0.1.7 -Release: 7%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Library to handle UPnP IGD port mapping Group: System Environment/Libraries License: LGPLv2+ URL: http://www.gupnp.org/ Source0: http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-0.1.7-make.patch -Patch1: gupnp-igd-gcc.patch BuildRequires: glib2-devel BuildRequires: gupnp-devel @@ -46,8 +44,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .make -%patch1 -p1 -b .gcc %build @@ -90,6 +86,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Mon Jan 16 2012 Brian Pepple - 0.2.1-1 +- Update to 0.2.1. +- Drop gcc patch. Fixed upstream. + * Fri Jan 13 2012 Fedora Release Engineering - 0.1.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index fa4035b..bbccaba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75aaca3361046ac42125f81d07c072ac gupnp-igd-0.1.7.tar.gz +03be8a80e2862cf72b2c50d65043828c gupnp-igd-0.2.1.tar.gz