diff --git a/.gitignore b/.gitignore index fd7391d..8eb770c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/bamf-0.3.6.tar.gz +/bamf-0.5.0.tar.gz diff --git a/bamf-0.3.6-glib-fix.patch b/bamf-0.3.6-glib-fix.patch deleted file mode 100644 index b3c68b8..0000000 --- a/bamf-0.3.6-glib-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up bamf-0.3.6/doc/reference/libbamf/Makefile.am.glibfix bamf-0.3.6/doc/reference/libbamf/Makefile.am ---- bamf-0.3.6/doc/reference/libbamf/Makefile.am.glibfix 2013-01-11 11:57:19.981616000 -0500 -+++ bamf-0.3.6/doc/reference/libbamf/Makefile.am 2013-04-25 11:39:43.231676689 -0400 -@@ -19,7 +19,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs. - DOC_SOURCE_DIR = ../../../lib/libbamf - - # Extra options to pass to gtkdoc-scangobj. Not normally needed. --SCANGOBJ_OPTIONS = -+SCANGOBJ_OPTIONS = --type-init-func="g_type_class_ref(G_TYPE_OBJECT);" - - # Extra options to supply to gtkdoc-scan. - # Fx --rebuild-types --rebuild-sections -diff -up bamf-0.3.6/doc/reference/libbamf/Makefile.in.glibfix bamf-0.3.6/doc/reference/libbamf/Makefile.in ---- bamf-0.3.6/doc/reference/libbamf/Makefile.in.glibfix 2013-04-25 11:40:16.699677191 -0400 -+++ bamf-0.3.6/doc/reference/libbamf/Makefile.in 2013-04-25 11:40:30.356677396 -0400 -@@ -260,7 +260,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs. - DOC_SOURCE_DIR = ../../../lib/libbamf - - # Extra options to pass to gtkdoc-scangobj. Not normally needed. --SCANGOBJ_OPTIONS = -+SCANGOBJ_OPTIONS = --type-init-func="g_type_class_ref(G_TYPE_OBJECT);" - - # Extra options to supply to gtkdoc-scan. - # Fx --rebuild-types --rebuild-sections -diff -up bamf-0.3.6/tests/libbamf/test-libbamf.c.glibfix bamf-0.3.6/tests/libbamf/test-libbamf.c ---- bamf-0.3.6/tests/libbamf/test-libbamf.c.glibfix 2013-01-11 11:57:19.981616000 -0500 -+++ bamf-0.3.6/tests/libbamf/test-libbamf.c 2013-04-25 11:39:43.231676689 -0400 -@@ -30,7 +30,9 @@ void test_matcher_create_suite (void); - gint - main (gint argc, gchar *argv[]) - { -+#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -+#endif - g_test_init (&argc, &argv, NULL); - - gtk_init (&argc, &argv); diff --git a/bamf-0.3.6-use-scanner-flags.patch b/bamf-0.3.6-use-scanner-flags.patch deleted file mode 100644 index 7ee00bc..0000000 --- a/bamf-0.3.6-use-scanner-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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@Bamf_0_2_gir_INCLUDES = GObject-2.0 GLib-2.0 -+@HAVE_INTROSPECTION_TRUE@Bamf_0_2_gir_SCANNERFLAGS = --warn-all --c-include='libbamf/libbamf.h' - @HAVE_INTROSPECTION_TRUE@Bamf_0_2_gir_CFLAGS = \ --@HAVE_INTROSPECTION_TRUE@ --warn-all \ --@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-0.5.0-fix_retval.patch b/bamf-0.5.0-fix_retval.patch new file mode 100644 index 0000000..89b779c --- /dev/null +++ b/bamf-0.5.0-fix_retval.patch @@ -0,0 +1,13 @@ +=== modified file 'src/bamf-application.c' +--- src/bamf-application.c 2013-08-08 12:48:26 +0000 ++++ src/bamf-application.c 2014-02-14 06:44:55 +0000 +@@ -470,7 +470,7 @@ + GFile **out_desktop_file, GFile **out_icon_file, + GCancellable *cancellable) + { +- g_return_val_if_fail (out_desktop_file, NULL); ++ g_return_val_if_fail (out_desktop_file, FALSE); + + if (!apps_dir) + { + diff --git a/bamf.spec b/bamf.spec index 0f70d53..373683e 100644 --- a/bamf.spec +++ b/bamf.spec @@ -1,7 +1,7 @@ Summary: Application matching framework Name: bamf -Version: 0.3.6 -Release: 4%{?dist} +Version: 0.5.0 +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 @@ -12,46 +12,44 @@ Release: 4%{?dist} 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 -# Fix test -Patch1: bamf-0.3.6-glib-fix.patch +Source0: http://launchpad.net/bamf/0.5/%{version}/+download/%{name}-%{version}.tar.gz +# https://bugs.launchpad.net/bamf/+bug/1280110 +Patch0: bamf-0.5.0-fix_retval.patch BuildRequires: vala-tools BuildRequires: gtk-doc BuildRequires: gobject-introspection-devel -BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: libxml2-python +BuildRequires: libxslt-python 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) +# there is no longer a separate GTK3 build +Provides: %{name}3%{?_isa} = %{version}-%{release} +Obsoletes: %{name}3%{?_isa} < 0.5.0-1%{?dist} + %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 built against GTK+ 2. +at amazing levels of accuracy (covering nearly every corner case). %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 +# For %%{_libdir}/girepository-1.0 and %%{_datadir}/gir-1.0 #Requires: gobject-introspection-devel Requires: pkgconfig +# there is no longer a separate GTK3 build +Provides: %{name}3-devel%{?_isa} = %{version}-%{release} +Obsoletes: %{name}3-devel%{?_isa} < 0.5.0-1%{?dist} + %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -67,81 +65,32 @@ 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 -b .use-scanner-flags -%patch1 -p1 -b .glibfix +%patch0 -p0 -b .fix_retval + %build -%global _configure ../configure -rm -rf build-gtk3 build-gtk2 -mkdir build-gtk3 build-gtk2 -pushd build-gtk2 -%configure --disable-static --disable-webapps --with-gtk=2 --enable-gtk-doc -make %{?_smp_mflags} VALA_API_GEN="/usr/bin/vapigen-0.20" -popd -pushd build-gtk3 -%configure --disable-static --disable-webapps --with-gtk=3 --enable-gtk-doc -make %{?_smp_mflags} VALA_API_GEN="/usr/bin/vapigen-0.20" -popd +%configure --disable-static --disable-webapps --enable-gtk-doc +make %{?_smp_mflags} + %install -make -C build-gtk2 DESTDIR=%{buildroot} install -make -C build-gtk3 DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install find %{buildroot} -regex ".*\.la$" | xargs rm -f -- %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -rm -rf %{name}-%{version} %{name}-%{version}-gtk3 %files %doc COPYING.LGPL COPYING -%{_libdir}/libbamf.so.* - -%files -n %{name}3 -%doc COPYING.LGPL COPYING %{_libdir}/libbamf3.so.* -%files devel -%doc COPYING.LGPL COPYING -%{_includedir}/libbamf -%{_libdir}/libbamf.so -%{_libdir}/pkgconfig/libbamf.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/libbamf.vapi - -%files -n %{name}3-devel -%doc COPYING.LGPL COPYING +%files devel +%doc ChangeLog TODO %{_includedir}/libbamf3 %{_libdir}/libbamf3.so %{_libdir}/pkgconfig/libbamf3.pc @@ -154,10 +103,13 @@ rm -rf %{name}-%{version} %{name}-%{version}-gtk3 %files daemon %doc COPYING -%{_libexecdir}/bamfdaemon +%{_libexecdir}/bamf %{_datadir}/dbus-1/services/*.service %changelog +* Fri Feb 14 2014 Michel Salim - 0.5.0-1 +- Update to 0.5.0 + * Sat Aug 03 2013 Fedora Release Engineering - 0.3.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 228e41c..13036b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56b0b0ac2d3f2a0401db268c78cc8527 bamf-0.3.6.tar.gz +0d039bcbfc7da874fefa09703e3cf4e6 bamf-0.5.0.tar.gz