summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Alexandre Salim <salimma@fedoraproject.org>2013-06-13 21:11:36 +0700
committerMichel Alexandre Salim <salimma@fedoraproject.org>2013-06-13 21:11:36 +0700
commit6f9455ae3b4aa04ee43fd480262a25c1f792ba19 (patch)
treec5f5e7b3f728fa5138657e56c41d8f4277e70ee5
parent4f8263bedd99301ee670a75ca3d7f219cd3bf6a1 (diff)
downloadspecs-6f9455ae3b4aa04ee43fd480262a25c1f792ba19.tar.gz
specs-6f9455ae3b4aa04ee43fd480262a25c1f792ba19.tar.xz
specs-6f9455ae3b4aa04ee43fd480262a25c1f792ba19.zip
bamf: clean-up spec
-rw-r--r--gnome/bamf.spec21
1 files changed, 12 insertions, 9 deletions
diff --git a/gnome/bamf.spec b/gnome/bamf.spec
index e144f25..96f4bae 100644
--- a/gnome/bamf.spec
+++ b/gnome/bamf.spec
@@ -1,7 +1,7 @@
Summary: Application matching framework
Name: bamf
Version: 0.3.6
-Release: 1%{?dist}
+Release: 3%{?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
@@ -16,6 +16,8 @@ Source0: http://launchpad.net/bamf/0.3/%{version}/+download/%{name}-%{ver
# 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
BuildRequires: vala-tools
BuildRequires: gtk-doc
@@ -91,6 +93,7 @@ developing applications that use %{name} (GTK+ 3 build).
%prep
%setup -q
%patch0 -p1 -b .use-scanner-flags
+%patch1 -p1 -b .glibfix
%build
%global _configure ../configure
@@ -98,16 +101,14 @@ 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}
+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}
+make %{?_smp_mflags} VALA_API_GEN="/usr/bin/vapigen-0.20"
popd
%install
-rm -rf %{buildroot}
-
make -C build-gtk2 DESTDIR=%{buildroot} install
make -C build-gtk3 DESTDIR=%{buildroot} install
@@ -120,7 +121,6 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
rm -rf %{name}-%{version} %{name}-%{version}-gtk3
%files
-%defattr(-,root,root,-)
%doc COPYING.LGPL COPYING
%{_libdir}/libbamf.so.*
@@ -129,7 +129,6 @@ rm -rf %{name}-%{version} %{name}-%{version}-gtk3
%{_libdir}/libbamf3.so.*
%files devel
-%defattr(-,root,root,-)
%doc COPYING.LGPL COPYING
%{_includedir}/libbamf
%{_libdir}/libbamf.so
@@ -142,7 +141,6 @@ rm -rf %{name}-%{version} %{name}-%{version}-gtk3
%{_datadir}/vala/vapi/libbamf.vapi
%files -n %{name}3-devel
-%defattr(-,root,root,-)
%doc COPYING.LGPL COPYING
%{_includedir}/libbamf3
%{_libdir}/libbamf3.so
@@ -155,12 +153,17 @@ rm -rf %{name}-%{version} %{name}-%{version}-gtk3
%{_datadir}/vala/vapi/libbamf3.vapi
%files daemon
-%defattr(-,root,root,-)
%doc COPYING
%{_libexecdir}/bamfdaemon
%{_datadir}/dbus-1/services/*.service
%changelog
+* Thu Jun 13 2013 Michel Salim <salimma@fedoraproject.org> - 0.3.6-3
+- Spec clean-ups
+
+* Thu Apr 25 2013 Tom Callaway <spot@fedoraproject.org> - 0.3.6-2
+- fix build
+
* Sat Apr 20 2013 Michel Salim <salimma@fedoraproject.org> - 0.3.6-1
- Update to 0.3.6