From d2eba64be653467728b0db9befc387fe002e8729 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Sat, 31 Mar 2012 15:11:18 -0400
Subject: [PATCH] update to 0.4.94

---
 .gitignore        |  1 +
 libindicator.spec | 39 +++++++++++++++++++--------------------
 sources           |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 81504d9..1a5e0ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /libindicator-0.3.17.tar.gz
 /libindicator-0.3.20.tar.gz
 /libindicator-0.3.22.tar.gz
+/libindicator-0.4.94.tar.gz
diff --git a/libindicator.spec b/libindicator.spec
index b1cb35c..c58d373 100644
--- a/libindicator.spec
+++ b/libindicator.spec
@@ -1,13 +1,11 @@
 Summary:	Shared functions for Ayatana indicators
 Name:		libindicator
-Version:	0.3.22
-Release:	3%{?dist}
+Version:	0.4.94
+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
-
-
+Source0:	http://launchpad.net/libindicator/0.5/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRequires:	gtk-doc
 BuildRequires:	libtool
 BuildRequires:	dbus-glib-devel
@@ -29,7 +27,7 @@ Ayatana indicators system.
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	pkgconfig
 
 %description	devel
@@ -57,7 +55,7 @@ tools for the GTK+3 build of %{name}.
 %package	gtk3-devel
 Summary:	Development files for %{name}-gtk3
 Group:		Development/Libraries
-Requires:	%{name}-gtk3 = %{version}-%{release}
+Requires:	%{name}-gtk3{?_isa} = %{version}-%{release}
 Requires:	pkgconfig
 
 %description	gtk3-devel
@@ -77,16 +75,19 @@ developing applications that use %{name}-gtk3.
 rm -rf build-gtk3 build-gtk2
 mkdir build-gtk3 build-gtk2
 pushd build-gtk2
-%configure --disable-static
+%configure --disable-static --with-gtk=2
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 popd
 pushd build-gtk3
 %configure --disable-static --with-gtk=3
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 popd
 
 %install
-rm -rf %{buildroot}
 make -C build-gtk2 DESTDIR=%{buildroot} install
 make -C build-gtk3 DESTDIR=%{buildroot} install
 find %{buildroot} -regex ".*\.la$" | xargs rm -f --
@@ -100,42 +101,40 @@ rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so
 %postun gtk3 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libindicator.so.*
 
 %files	tools
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libexecdir}/indicator-loader
 
 %files	devel
-%defattr(-,root,root,-)
 %doc COPYING
-%{_includedir}/libindicator-0.3
+%{_includedir}/libindicator-0.4
 %{_libdir}/libindicator.so
-%{_libdir}/pkgconfig/indicator.pc
+%{_libdir}/pkgconfig/indicator-0.4.pc
+# Contains 80indicator-debugging
 # This is marked as 'for development use only'
-%{_sysconfdir}/X11/Xsession.d/80indicator-debugging
+%{_datadir}/libindicator/
 
 %files	gtk3
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libindicator3.so.*
 
 %files	gtk3-tools
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libexecdir}/indicator-loader3
 
 %files	gtk3-devel
-%defattr(-,root,root,-)
 %doc COPYING
-%{_includedir}/libindicator3-0.3
+%{_includedir}/libindicator3-0.4
 %{_libdir}/libindicator3.so
-%{_libdir}/pkgconfig/indicator3.pc
+%{_libdir}/pkgconfig/indicator3-0.4.pc
 
 %changelog
+* Sat Mar 31 2012 Tom Callaway <spot@fedoraproject.org> - 0.4.94-1
+- Update to 0.4.94
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 65880ce..4f5bdbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cbd9724375718dd06b86ac3d668e548  libindicator-0.3.22.tar.gz
+b7093979cacf24001834e231c89fe05f  libindicator-0.4.94.tar.gz