[grilo] fix build with vala 0.15/0.16

Peter Robinson pbrobinson at fedoraproject.org
Wed Mar 7 15:12:22 UTC 2012


commit cd414c78965c7d0fdb035546f33ee6cdcc5db1d5
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Mar 7 15:12:18 2012 +0000

    fix build with vala 0.15/0.16

 grilo.spec |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/grilo.spec b/grilo.spec
index 28d8ee3..61a30db 100644
--- a/grilo.spec
+++ b/grilo.spec
@@ -1,13 +1,12 @@
 Name:           grilo
 Version:        0.1.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Content discovery framework
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/grilo/0.1/grilo-%{version}.tar.xz
 Url:            http://live.gnome.org/Grilo
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-common
 BuildRequires:  vala-devel >= 0.7.2
@@ -54,6 +53,8 @@ This package contains the Vala language bindings.
 %prep
 %setup -q
 
+# Fix vala detection for version 0.16
+sed -i.vala 's/libvala-0.14/libvala-0.16/g' configure*
 
 %build
 %configure                      \
@@ -67,7 +68,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/grilo-0.1/ $RPM_BUILD_ROOT%{_datadir}/grilo-0.1/plugins/
 
@@ -76,9 +76,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_bindir}/grilo-simple-playlist
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -109,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala-*/vapi/*
 
 %changelog
+* Wed Mar  7 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.1.18-3
+- fix build with vala 0.15/0.16
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list