new version 0.3.17, drop the patches

.gitignore

@@ -1 +1,2 @@
 /libindicator-0.3.15.tar.gz
+/libindicator-0.3.17.tar.gz

libindicator-0.3.15-abs_srcdir.patch

@@ -1,22 +0,0 @@
-=== modified file 'libindicator/Makefile.am'
---- libindicator/Makefile.am	2010-11-11 15:38:56 +0000
-+++ libindicator/Makefile.am	2010-11-24 23:00:33 +0000
-@@ -73,7 +73,7 @@
- indicator-object-enum-types.h: s-enum-types-h
- 	@true
- s-enum-types-h: $(indicator_headers)
--	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template								\
-+	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template								\
- 		$(indicator_headers) ) >> tmp-indicator-object-enum-types.h											\
- 	&& (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h )	\
- 	&& rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F)
-@@ -81,7 +81,7 @@
- indicator-object-enum-types.c: s-enum-types-c
- 	@true
- s-enum-types-c: $(indicator_headers)
--	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template								\
-+	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template								\
- 		$(indicator_headers) ) > tmp-indicator-object-enum-types.c											\
- 	&& (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c )	\
- 	&& rm -f tmp-indicator-object-enum-types.c
-

libindicator-0.3.15-loader3.patch

@@ -1,35 +0,0 @@
-=== modified file 'tools/Makefile.am'
---- tools/Makefile.am	2010-11-11 15:25:43 +0000
-+++ tools/Makefile.am	2010-11-24 23:00:06 +0000
-@@ -1,11 +1,13 @@
- if USE_GTK3
- INDICATOR_LIB = -lindicator3
-+libexec_PROGRAMS = indicator-loader3
-+VER=3
- else
-+VER=
- INDICATOR_LIB = -lindicator
-+libexec_PROGRAMS = indicator-loader
- endif
- 
--libexec_PROGRAMS = \
--	indicator-loader
- 
- #############################
- # Indicator Loader
-@@ -24,6 +26,14 @@
- 	-L$(top_builddir)/libindicator/.libs \
- 	$(INDICATOR_LIB)
- 
-+# We duplicate these here because Automake won't let us use $(VER) on the left hand side.
-+# Since we carefully use $(VER) in the right hand side above, we can assign the same values.
-+# Only one version of the library is every compiled at the same time, so it is safe to reuse
-+# the right hand sides like this.
-+indicator_loader3_SOURCES = $(indicator_loader_SOURCES)
-+indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS)
-+indicator_loader3_LDADD = $(indicator_loader_LDADD)
-+
- xsessiondir = $(sysconfdir)/X11/Xsession.d
- 
- xsession_DATA = 80indicator-debugging
-

libindicator.spec

@@ -1,16 +1,11 @@
 Summary:	Shared functions for Ayatana indicators
 Name:		libindicator
-Version:	0.3.15
+Version:	0.3.17
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPLv3
 Group:		System Environment/Libraries
 URL:		https://launchpad.net/libindicator
 Source0:	http://launchpad.net/libindicator/0.3/%{version}/+download/%{name}-%{version}.tar.gz
-# From upstream https://code.launchpad.net/~ken-vandine/libindicator/natty_fixes
-# fix out-of-tree build and rename the GTK+ 3 indicator-loader for
-# parallel installation
-Patch0:		libindicator-0.3.15-abs_srcdir.patch
-Patch1:		libindicator-0.3.15-loader3.patch
 
 BuildRequires:	gtk-doc
 BuildRequires:	libtool
@@ -70,13 +65,8 @@ developing applications that use %{name}-gtk3.
 
 %prep
 %setup -q
-%patch0 -p0 -b .abs_srcdir
-%patch1 -p0 -b .loader3
 
 %build
-# without this, you get rpath problems; can't figure why
-autoreconf -i
-
 # we build it twice, once against GTK+ 3 and once against GTK+ 2, so
 # both GTK+ 2 and GTK+ 3 apps can use it; the GTK+ 3 build is
 # libindicator-gtk3. When we have no need for the GTK+ 2 build any more
@@ -145,6 +135,11 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so
 %{_libdir}/pkgconfig/indicator3.pc
 
 %changelog
+* Sun Jan 23 2011 Adam Williamson <awilliam@redhat.com> - 0.3.17-1
+- new version 0.3.17
+- drop both patches (upstream)
+- no need for autoreconf any more
+
 * Mon Jan 10 2011 Matthias Clasen <mclasen@redhat.com> - 0.3.15-2
 - Rebuild against newer gtk3
 

sources

@@ -1 +1 @@
-0ae797cbb0fb803c38b8d4da3969d8b1  libindicator-0.3.15.tar.gz
+c79f659bdcb89bb4152cecb4ed31fe49  libindicator-0.3.17.tar.gz