- really fix vapigen detection

- rel 5

diff --git a/libgda5.spec b/libgda5.spec
index d0691919ca217bb8875f34a72db20c12573678fa..202033fdffabab5fdb43b9075fe26c77cb61cb97 100644 (file)
--- a/libgda5.spec
+++ b/libgda5.spec
@@ -23,7 +23,7 @@ Summary:      GNU Data Access library
 Summary(pl.UTF-8):     Biblioteka GNU Data Access
 Name:          libgda5
 Version:       5.2.4
-Release:       4
+Release:       5
 License:       LGPL v2+/GPL v2+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-%{version}.tar.xz
@@ -35,6 +35,7 @@ Patch3:               %{name}-format.patch
 Patch4:                %{name}-yelp.patch
 Patch5:                java-arch.patch
 Patch6:                java8.patch
+Patch7:                vapigen-detect.patch
 URL:           http://www.gnome-db.org/
 %{?with_firebird:BuildRequires:        Firebird-devel}
 BuildRequires: autoconf >= 2.68
@@ -389,6 +390,7 @@ Narzędzia graficzne dla GDA.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 # included version is bash-specific, use system file
@@ -413,7 +415,6 @@ export _JAVA_SUFFIX="/lib/amd64/server"
 javac getsp.java
 %endif
 %configure \
-       %{?with_vala:VALA_API_VERSION="$(pkg-config --modversion vapigen)"} \
        --disable-silent-rules \
        %{!?with_vala:--disable-vala} \
        --enable-gda-gi \

diff --git a/vapigen-detect.patch b/vapigen-detect.patch
new file mode 100644 (file)
index 0000000..eb877ea
--- /dev/null
+++ b/vapigen-detect.patch
@@ -0,0 +1,11 @@
+--- libgda-5.2.4/configure.ac~ 2015-06-13 11:07:23.000000000 +0200
++++ libgda-5.2.4/configure.ac  2016-05-05 19:21:21.587028339 +0200
+@@ -550,7 +550,7 @@
+       AM_PROG_VALAC([0.26.0])
+       if test "x$VALA_API_VERSION" = "x"
+       then
+-              VAPIGEN_CHECK([0.26.0],[0.26],,no)
++              VAPIGEN_CHECK([0.26.0],,,no)
+               vala_api="0.26 (Default)"
+       else
+               VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)