commit eade1487d74e67d43a96daee2d048635a2108290
Author: Jan Rękorajski <[email protected]>
Date: Thu May 5 19:39:33 2016 +0200
- really fix vapigen detection
- rel 5
libgda5.spec | 5 +++--
vapigen-detect.patch | 11 +++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/libgda5.spec b/libgda5.spec
index d069191..202033f 100644
--- 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
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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgda5.git/commitdiff/eade1487d74e67d43a96daee2d048635a2108290
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
