[bamf] Update to 0.3.6
Michel Alexandre Salim
salimma at fedoraproject.org
Sat Apr 20 07:04:52 UTC 2013
commit f6e97670b688d73181afde9d80f2355d50d21458
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Sat Apr 20 14:04:17 2013 +0700
Update to 0.3.6
.gitignore | 6 +--
bamf-0.2.64-gio_parameter.patch | 33 ---------
bamf-0.3.6-use-scanner-flags.patch | 13 ++++
bamf.spec | 128 +++++++++++++++++++++---------------
sources | 2 +-
5 files changed, 89 insertions(+), 93 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d940381..fd7391d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/bamf-0.2.74.tar.gz
-/bamf-0.2.78.tar.gz
-/bamf-0.2.80.tar.gz
-/bamf-0.2.90.tar.gz
-/bamf-0.2.104.tar.gz
+/bamf-0.3.6.tar.gz
diff --git a/bamf-0.3.6-use-scanner-flags.patch b/bamf-0.3.6-use-scanner-flags.patch
new file mode 100644
index 0000000..7ee00bc
--- /dev/null
+++ b/bamf-0.3.6-use-scanner-flags.patch
@@ -0,0 +1,13 @@
+--- bamf-0.3.6/lib/libbamf/Makefile.in.use-scanner-flags 2013-01-14 20:14:49.976963315 +0700
++++ bamf-0.3.6/lib/libbamf/Makefile.in 2013-04-20 13:31:20.431559888 +0700
+@@ -465,9 +465,8 @@
+ @HAVE_INTROSPECTION_TRUE@ $(NULL)
+
+ @HAVE_INTROSPECTION_TRUE at Bamf_0_2_gir_INCLUDES = GObject-2.0 GLib-2.0
++ at HAVE_INTROSPECTION_TRUE@Bamf_0_2_gir_SCANNERFLAGS = --warn-all --c-include='libbamf/libbamf.h'
+ @HAVE_INTROSPECTION_TRUE at Bamf_0_2_gir_CFLAGS = \
+- at HAVE_INTROSPECTION_TRUE@ --warn-all \
+- at HAVE_INTROSPECTION_TRUE@ --c-include='libbamf/libbamf.h' \
+ @HAVE_INTROSPECTION_TRUE@ $(DBUS_CFLAGS) \
+ @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir)/lib \
+ @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir)/lib \
diff --git a/bamf.spec b/bamf.spec
index 5a44732..e144f25 100644
--- a/bamf.spec
+++ b/bamf.spec
@@ -1,28 +1,39 @@
-Summary: Application matching framework
-Name: bamf
-Version: 0.2.104
-Release: 4%{?dist}
+Summary: Application matching framework
+Name: bamf
+Version: 0.3.6
+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
# may not be upstream's intention. For now, marking library as
# GPL.
-# License: LGPLv2 or LGPLv3
-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
-
-BuildRequires: vala-tools
-BuildRequires: gtk-doc
-BuildRequires: dbus-glib-devel
-BuildRequires: gobject-introspection-devel
-BuildRequires: gtk2-devel
-BuildRequires: gtk3-devel
-BuildRequires: pkgconfig(libwnck-1.0)
-BuildRequires: pkgconfig(libwnck-3.0)
-BuildRequires: libgtop2-devel
+# License: LGPLv2 or LGPLv3
+License: GPLv2 or GPLv3
+Group: System Environment/Libraries
+URL: https://launchpad.net/bamf
+Source0: http://launchpad.net/bamf/0.3/%{version}/+download/%{name}-%{version}.tar.gz
+# backport of commit 525:
+# move directives from CFLAGS to scanner flags
+Patch0: bamf-0.3.6-use-scanner-flags.patch
+
+BuildRequires: vala-tools
+BuildRequires: gtk-doc
+BuildRequires: gobject-introspection-devel
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(gio-unix-2.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gdk-2.0)
+BuildRequires: pkgconfig(gdk-3.0)
+BuildRequires: pkgconfig(gdk-x11-2.0)
+BuildRequires: pkgconfig(gdk-x11-3.0)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(libgtop-2.0)
+BuildRequires: pkgconfig(libwnck-1.0)
+BuildRequires: pkgconfig(libwnck-3.0)
+BuildRequires: pkgconfig(x11)
%description
BAMF removes the headache of applications matching into a simple DBus
@@ -30,66 +41,67 @@ 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+ 2.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-License: GPLv2 or GPLv3
-Requires: %{name} = %{version}-%{release}
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+License: GPLv2 or GPLv3
+Requires: %{name} = %{version}-%{release}
# For %{_libdir}/girepository-1.0 and %{_datadir}/gir-1.0
-#Requires: gobject-introspection-devel
-Requires: pkgconfig
+#Requires: gobject-introspection-devel
+Requires: pkgconfig
-%description devel
+%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
-%package daemon
-Summary: Application matching framework
-Group: System Environment/Libraries
-License: GPLv3
+%package daemon
+Summary: Application matching framework
+Group: System Environment/Libraries
+License: GPLv3
-%description daemon
+%description daemon
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 daemon and supporting data.
-%package -n %{name}3
-Summary: Application matching framework (GTK+ 3 build)
+%package -n %{name}3
+Summary: Application matching framework (GTK+ 3 build)
-%description -n %{name}3
+%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}
+%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
+#Requires: gobject-introspection-devel
+Requires: pkgconfig
-%description -n %{name}3-devel
+%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 -b .use-scanner-flags
%build
%global _configure ../configure
rm -rf build-gtk3 build-gtk2
mkdir build-gtk3 build-gtk2
pushd build-gtk2
-%configure --disable-static --with-gtk=2 --enable-gtk-doc
+%configure --disable-static --disable-webapps --with-gtk=2 --enable-gtk-doc
make %{?_smp_mflags}
popd
pushd build-gtk3
-%configure --disable-static --with-gtk=3 --enable-gtk-doc
+%configure --disable-static --disable-webapps --with-gtk=3 --enable-gtk-doc
make %{?_smp_mflags}
popd
@@ -112,38 +124,46 @@ rm -rf %{name}-%{version} %{name}-%{version}-gtk3
%doc COPYING.LGPL COPYING
%{_libdir}/libbamf.so.*
-%files -n %{name}3
+%files -n %{name}3
%doc COPYING.LGPL COPYING
%{_libdir}/libbamf3.so.*
-%files devel
+%files devel
%defattr(-,root,root,-)
%doc COPYING.LGPL COPYING
%{_includedir}/libbamf
%{_libdir}/libbamf.so
%{_libdir}/pkgconfig/libbamf.pc
%{_datadir}/gtk-doc
-# Installation of these was disabled in the 0.2.72 release commit,
-# with no explanation - http://bazaar.launchpad.net/~unity-team/bamf/trunk/revision/374
-#%{_libdir}/girepository-1.0/Bamf*.typelib
-#%{_datadir}/gir-1.0/Bamf*.gir
-#%{_datadir}/vala/vapi/Bamf*.vapi
+%{_libdir}/girepository-1.0/Bamf*.typelib
+%{_datadir}/gir-1.0/Bamf*.gir
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/libbamf.vapi
-%files -n %{name}3-devel
+%files -n %{name}3-devel
%defattr(-,root,root,-)
%doc COPYING.LGPL COPYING
%{_includedir}/libbamf3
%{_libdir}/libbamf3.so
%{_libdir}/pkgconfig/libbamf3.pc
%{_datadir}/gtk-doc
+%{_libdir}/girepository-1.0/Bamf*.typelib
+%{_datadir}/gir-1.0/Bamf*.gir
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/libbamf3.vapi
-%files daemon
+%files daemon
%defattr(-,root,root,-)
%doc COPYING
%{_libexecdir}/bamfdaemon
%{_datadir}/dbus-1/services/*.service
%changelog
+* Sat Apr 20 2013 Michel Salim <salimma at fedoraproject.org> - 0.3.6-1
+- Update to 0.3.6
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.104-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 1446c28..228e41c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4271cd5979483f7e3a9bffc42fed6383 bamf-0.2.104.tar.gz
+56b0b0ac2d3f2a0401db268c78cc8527 bamf-0.3.6.tar.gz
More information about the scm-commits
mailing list