[bamf] new upstream version, various fixes upstreamed, build gtk+2 and gtk+3

[Adam Williamson]

commit 0803684a3924cfafbb5a151bc99e8745c74db9bf
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Nov 10 21:30:34 2011 -0800

    new upstream version, various fixes upstreamed, build gtk+2 and gtk+3

 .gitignore |    1 +
 bamf.spec  |   92 +++++++++++++++++++++++++++++++++++++++++++----------------
 sources    |    2 +-
 3 files changed, 69 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d84d3cc..d940381 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /bamf-0.2.78.tar.gz
 /bamf-0.2.80.tar.gz
 /bamf-0.2.90.tar.gz
+/bamf-0.2.104.tar.gz
diff --git a/bamf.spec b/bamf.spec
index ee6953f..cfde469 100644
--- a/bamf.spec
+++ b/bamf.spec
@@ -1,9 +1,8 @@
 Summary:	Application matching framework
 Name:		bamf
-Version:	0.2.90
-Release:	2%{?dist}
-# the GIO module is LGPLv3-*only*, but we don't build that. Other
-# library bits are LGPLv2 or LGPLv3 (but not open-ended LGPLv2+);
+Version:	0.2.104
+Release:	1%{?dist}
+# Library bits are LGPLv2 or LGPLv3 (but not open-ended LGPLv2+);
 # non-lib bits are GPLv3.
 # pbrobinson points out that three files in the lib are actually
 # marked GPL in headers, making library GPL, though we think this
@@ -14,31 +13,30 @@ License:	GPLv2 or GPLv3
 Group:		System Environment/Libraries
 URL:		https://launchpad.net/bamf
 Source0:	http://launchpad.net/bamf/0.2/%{version}/+download/%{name}-%{version}.tar.gz
-# Convenience patch to add a configure parameter to disable building
-# of the gio module: see https://bugs.launchpad.net/bamf/+bug/687683
-Patch0:		bamf-0.2.64-gio_parameter.patch
 
 BuildRequires:	vala-tools
 BuildRequires:	gtk-doc
 BuildRequires:	dbus-glib-devel
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	gtk2-devel
-BuildRequires:	libwnck-devel
+BuildRequires:	gtk3-devel
+BuildRequires:	pkgconfig(libwnck-1.0)
+BuildRequires:	pkgconfig(libwnck-3.0)
 BuildRequires:	libgtop2-devel
 
 %description
 BAMF removes the headache of applications matching into a simple DBus
 daemon and C wrapper library. Currently features application matching
 at amazing levels of accuracy (covering nearly every corner case). This
-package contains the bamf library.
+package contains the bamf library built against GTK+ 2.
 
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-License:	LGPLv2 or LGPLv3
+License:	GPLv2 or GPLv3
 Requires:	%{name} = %{version}-%{release}
 # For %{_libdir}/girepository-1.0 and %{_datadir}/gir-1.0
-Requires:	gobject-introspection-devel
+#Requires:	gobject-introspection-devel
 Requires:	pkgconfig
 
 %description	devel
@@ -56,39 +54,70 @@ daemon and C wrapper library. Currently features application matching
 at amazing levels of accuracy (covering nearly every corner case). This
 package contains the bamf daemon and supporting data.
 
+%package -n	%{name}3
+Summary:	Application matching framework (GTK+ 3 build)
+
+%description -n	%{name}3
+BAMF removes the headache of applications matching into a simple DBus
+daemon and C wrapper library. Currently features application matching
+at amazing levels of accuracy (covering nearly every corner case). This
+package contains the bamf library built against GTK+ 3.
+
+%package -n	%{name}3-devel
+Summary:	Development files for %{name} (GTK+ 3 build)
+Group:		Development/Libraries
+License:	GPLv2 or GPLv3
+Requires:	%{name}3 = %{version}-%{release}
+# For %{_libdir}/girepository-1.0 and %{_datadir}/gir-1.0
+#Requires:	gobject-introspection-devel
+Requires:	pkgconfig
+
+%description -n	%{name}3-devel
+The %{name}3-devel package contains libraries and header files for
+developing applications that use %{name} (GTK+ 3 build).
+
+
 %prep
 %setup -q
-%patch0 -p1
+pushd %{_builddir}
+cp -R %{name}-%{version} %{name}-%{version}-gtk3
+popd
 
 %build
-# needed for patch0
-autoreconf -i
-
-# disable unused-but-set-variable error for now as I'm not sure if we
-# should really remove it from the code: bug reported upstream
-# https://bugs.launchpad.net/bamf/+bug/706703
-%global optflags %{optflags} -Wno-error=unused-but-set-variable
-
-# we must disable the gio module as we do not carry the glib patch
-# required to build it: https://bugzilla.gnome.org/show_bug.cgi?id=606960
-%configure --disable-static --disable-gio-module
+%configure --disable-static --with-gtk=2
+make %{?_smp_mflags}
 
+pushd %{_builddir}/%{name}-%{version}-gtk3
+%configure --disable-static --with-gtk=3
 make %{?_smp_mflags}
+popd
 
 %install
 rm -rf %{buildroot}
+
+make DESTDIR=%{buildroot} install
+pushd %{_builddir}/%{name}-%{version}-gtk3
 make DESTDIR=%{buildroot} install
+popd
+
 find %{buildroot} -regex ".*\.la$" | xargs rm -f --
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%clean
+rm -rf %{name}-%{version} %{name}-%{version}-gtk3
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LGPL COPYING
 %{_libdir}/libbamf.so.*
 
-%files	devel
+%files -n	%{name}3
+%doc COPYING.LGPL COPYING
+%{_libdir}/libbamf3.so.*
+
+%files		devel
 %defattr(-,root,root,-)
 %doc COPYING.LGPL COPYING
 %{_includedir}/libbamf
@@ -101,13 +130,26 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
 #%{_datadir}/gir-1.0/Bamf*.gir
 #%{_datadir}/vala/vapi/Bamf*.vapi
 
-%files daemon
+%files -n	%{name}3-devel
+%defattr(-,root,root,-)
+%doc COPYING.LGPL COPYING
+%{_includedir}/libbamf3
+%{_libdir}/libbamf3.so
+%{_libdir}/pkgconfig/libbamf3.pc
+%{_datadir}/gtk-doc
+
+%files		daemon
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libexecdir}/bamfdaemon
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Thu Nov 10 2011 Adam Williamson <awilliam at redhat.com> - 0.2.104-1
+- new version, adjust for various upstream fixes
+- rebuild against new libpng
+- build both gtk+2 and gtk+3 libs, and package separately (like Ubuntu)
+
 * Wed May 25 2011 Adam Williamson <awilliam at redhat.com> - 0.2.90-2
 - don't depend on gtk-doc but own /usr/share/gtk-doc instead (#707545)
 
diff --git a/sources b/sources
index 4729a5c..1446c28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ffe3c5688989dd84b4bdfceade13808  bamf-0.2.90.tar.gz
+4271cd5979483f7e3a9bffc42fed6383  bamf-0.2.104.tar.gz