[ethos] - detect recent vala

[Dan Horák]

commit c0a042f5064526bcafd883715d200a9bafb49837
Author: Dan Horák <dan at danny.cz>
Date:   Mon Feb 7 10:51:01 2011 +0100

    - detect recent vala

 ethos-0.2.2-vala.patch |   69 ++++++++++++++++++++++++++++++++++++++++++++++++
 ethos.spec             |    7 ++++-
 2 files changed, 75 insertions(+), 1 deletions(-)
---
diff --git a/ethos-0.2.2-vala.patch b/ethos-0.2.2-vala.patch
new file mode 100644
index 0000000..a0a3806
--- /dev/null
+++ b/ethos-0.2.2-vala.patch
@@ -0,0 +1,69 @@
+diff -up ethos-0.2.2/configure.ac.vala ethos-0.2.2/configure.ac
+--- ethos-0.2.2/configure.ac.vala	2011-02-07 10:43:19.000000000 +0100
++++ ethos-0.2.2/configure.ac	2011-02-07 10:43:50.000000000 +0100
+@@ -81,7 +81,7 @@ AM_CONDITIONAL(ENABLE_GLIB_TEST, test "x
+ 
+ dnl = Enable Vala ==========================================================
+ enable_vala=no
+-PKG_CHECK_MODULES(VALA, vala-1.0, enable_vala=yes, enable_vala=no)
++PKG_CHECK_MODULES(VALA, libvala-0.12, enable_vala=yes, enable_vala=no)
+ if test "x$enable_vala" = "xyes"; then
+ 	VAPI_DIR=`pkg-config --variable=vapidir vala-1.0`
+ else
+diff -up ethos-0.2.2/configure.vala ethos-0.2.2/configure
+--- ethos-0.2.2/configure.vala	2011-02-07 10:43:15.000000000 +0100
++++ ethos-0.2.2/configure	2011-02-07 10:43:37.000000000 +0100
+@@ -13045,12 +13045,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_VALA_CFLAGS="$VALA_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvala-0.12\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0" 2>/dev/null`
++  pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "libvala-0.12" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13063,12 +13063,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_VALA_LIBS="$VALA_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvala-0.12\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0" 2>/dev/null`
++  pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "libvala-0.12" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13087,9 +13087,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0"`
++	        VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libvala-0.12"`
+         else
+-	        VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0"`
++	        VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libvala-0.12"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$VALA_PKG_ERRORS" >&5
+@@ -13107,7 +13107,7 @@ $as_echo "yes" >&6; }
+ 	enable_vala=yes
+ fi
+ if test "x$enable_vala" = "xyes"; then
+-	VAPI_DIR=`pkg-config --variable=vapidir vala-1.0`
++	VAPI_DIR=`pkg-config --variable=vapidir libvala-0.12`
+ else
+ 	VAPI_DIR=
+ fi
+diff -up ethos-0.2.2/examples/vala/basic.vala ethos-0.2.2/examples/vala/basic
diff --git a/ethos.spec b/ethos.spec
index b52661f..f07a0d4 100644
--- a/ethos.spec
+++ b/ethos.spec
@@ -2,13 +2,14 @@
 
 Name:          ethos
 Version:       0.2.2
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Plugin framework for GLib
 
 Group:         System Environment/Libraries
 License:       LGPLv2+
 URL:           http://git.dronelabs.com/ethos/about/
 Source0:       http://ftp.dronelabs.com/sources/ethos/0.2/%{name}-%{version}.tar.gz
+Patch0:        %{name}-0.2.2-vala.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel
@@ -70,6 +71,7 @@ Vala bindings for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .vala
 
 %build
 %configure --disable-static --enable-introspection --enable-python
@@ -132,6 +134,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/ethos-ui-1.0.vapi
 
 %changelog
+* Mon Feb  7 2011 Dan Horák <dan[at]danny.cz> 0.2.2-9
+- detect recent vala
+
 * Wed Sep 22 2010 Peter Robinson <pbrobinson at gmail.com> 0.2.2-8
 - Bump build