Author: megabajt Date: Mon Apr 2 12:28:42 2012 GMT Module: packages Tag: HEAD ---- Log message: - fixed build with vala-0.16 - release 2
---- Files affected: packages/grilo: grilo.spec (1.3 -> 1.4) , grilo-vala.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/grilo/grilo.spec diff -u packages/grilo/grilo.spec:1.3 packages/grilo/grilo.spec:1.4 --- packages/grilo/grilo.spec:1.3 Fri Dec 9 20:16:08 2011 +++ packages/grilo/grilo.spec Mon Apr 2 14:28:37 2012 @@ -7,11 +7,12 @@ Summary: Framework for access to sources of multimedia content Name: grilo Version: 0.1.18 -Release: 1 +Release: 2 License: LGPL v2.1+ Group: Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/grilo/0.1/%{name}-%{version}.tar.xz # Source0-md5: c2f34727afedf6e2febad53b20218395 +Patch0: %{name}-vala.patch URL: http://live.gnome.org/Grilo BuildRequires: autoconf BuildRequires: automake @@ -23,7 +24,7 @@ BuildRequires: libtool >= 2.2.6 BuildRequires: libxml2-devel BuildRequires: tar >= 1:1.22 -BuildRequires: vala >= 0.14.0 +BuildRequires: vala >= 2:0.16.0 BuildRequires: xz BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -70,6 +71,7 @@ %prep %setup -q +%patch0 -p1 %build %{__libtoolize} @@ -123,10 +125,10 @@ %{_pkgconfigdir}/grilo-net-0.1.pc %{_datadir}/gir-1.0/Grl-0.1.gir %{_datadir}/gir-1.0/GrlNet-0.1.gir -%{_datadir}/vala-0.14/vapi/grilo-0.1.deps -%{_datadir}/vala-0.14/vapi/grilo-0.1.vapi -%{_datadir}/vala-0.14/vapi/grilo-net-0.1.deps -%{_datadir}/vala-0.14/vapi/grilo-net-0.1.vapi +%{_datadir}/vala-0.16/vapi/grilo-0.1.deps +%{_datadir}/vala-0.16/vapi/grilo-0.1.vapi +%{_datadir}/vala-0.16/vapi/grilo-net-0.1.deps +%{_datadir}/vala-0.16/vapi/grilo-net-0.1.vapi %if %{with static_libs} %files static @@ -147,6 +149,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2012/04/02 12:28:37 megabajt +- fixed build with vala-0.16 +- release 2 + Revision 1.3 2011/12/09 19:16:08 wiget - up to 0.1.18 ================================================================ Index: packages/grilo/grilo-vala.patch diff -u /dev/null packages/grilo/grilo-vala.patch:1.1 --- /dev/null Mon Apr 2 14:28:42 2012 +++ packages/grilo/grilo-vala.patch Mon Apr 2 14:28:37 2012 @@ -0,0 +1,34 @@ +--- grilo-0.1.18/configure.ac.pld 2012-04-02 13:51:57.645245654 +0200 ++++ grilo-0.1.18/configure.ac 2012-04-02 13:55:14.134181181 +0200 +@@ -176,17 +176,20 @@ AC_ARG_ENABLE([vala], + [enable_vala=autodetect have_vala=yes]) + AC_MSG_RESULT([$enable_vala]) + if test "x$enable_vala" != "xno"; then +- PKG_CHECK_EXISTS([ libvala-0.14 ], +- [ valapkg="libvala-0.14" ], +- [ PKG_CHECK_EXISTS([ libvala-0.12 ], +- [ valapkg="libvala-0.12" ], +- [ PKG_CHECK_EXISTS([ vala-0.10 ], +- [ valapkg="vala-0.10" ], +- [ PKG_CHECK_EXISTS([ vala-1.0 >= $VALA_REQS ], +- [ valapkg="vala-1.0" ], +- [ valapkg="" ] ) +- ] ) +- ] ) ++ PKG_CHECK_EXISTS([ libvala-0.16 ], ++ [ valapkg="libvala-0.16" ], ++ [ PKG_CHECK_EXISTS([ libvala-0.14 ], ++ [ valapkg="libaval-0.14" ], ++ [ PKG_CHECK_EXISTS([ libvala-0.12 ], ++ [ valapkg="libvala-0.12" ], ++ [ PKG_CHECK_EXISTS([ vala-0.10 ], ++ [ valapkg="vala-0.10" ], ++ [ PKG_CHECK_EXISTS([ vala-1.0 >= $VALA_REQS ], ++ [ valapkg="vala-1.0" ], ++ [ valapkg="" ] ) ++ ] ) ++ ] ) ++ ] ) + ] ) + + if test "x$valapkg" != "x"; then ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/grilo/grilo.spec?r1=1.3&r2=1.4 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
