[gnome-code-assistance] Apply upstream fix to actually build with vala 0.28

Ville Skyttä scop at fedoraproject.org
Wed Feb 25 22:28:58 UTC 2015


commit 07d67285c1eb895cadde85608f39947c84aa5325
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Feb 25 23:48:02 2015 +0200

    Apply upstream fix to actually build with vala 0.28
    
    - Make build more verbose, use %autosetup
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1196395

 gnome-code-assistance-3.14.0-vala028.patch | 12 ++++++++++++
 gnome-code-assistance.spec                 | 12 +++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/gnome-code-assistance-3.14.0-vala028.patch b/gnome-code-assistance-3.14.0-vala028.patch
new file mode 100644
index 0000000..e55a4b4
--- /dev/null
+++ b/gnome-code-assistance-3.14.0-vala028.patch
@@ -0,0 +1,12 @@
+diff -up gnome-code-assistance-3.14.0/configure~ gnome-code-assistance-3.14.0/configure
+--- gnome-code-assistance-3.14.0/configure~	2014-12-04 14:01:04.000000000 +0200
++++ gnome-code-assistance-3.14.0/configure	2015-02-25 23:43:08.236011616 +0200
+@@ -13179,7 +13179,7 @@ else
+ fi
+ 
+ 
+-BACKEND_VALA_LIBVALA_VERSIONS="libvala-0.26 libvala-0.24 libvala-0.22 libvala-0.20"
++BACKEND_VALA_LIBVALA_VERSIONS="libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22 libvala-0.20"
+ BACKEND_VALA_MODULES="gobject-2.0 >= 2.36 glib-2.0 >= 2.36 gio-2.0 >= 2.36 gee-0.8 gio-unix-2.0 >= 2.36"
+ 
+ BACKEND_VALA_LIBVALA=
diff --git a/gnome-code-assistance.spec b/gnome-code-assistance.spec
index 07e5f1a..3d5f7d2 100644
--- a/gnome-code-assistance.spec
+++ b/gnome-code-assistance.spec
@@ -2,13 +2,15 @@
 
 Name:           gnome-code-assistance
 Version:        3.14.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Common code assistance services for code editors
 
 License:        GPLv3+
 URL:            http://wiki.gnome.org/Projects/CodeAssistance
 
 Source0:        https://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
+# https://git.gnome.org/browse/gnome-code-assistance/commit/?id=126b5781748ce9bf5d822a2b9692adf6cd9f6487
+Patch0:         %{name}-3.14.0-vala028.patch
 
 BuildRequires:  libtool
 BuildRequires:  gcc
@@ -55,11 +57,11 @@ provide a centralized code-assistance as a service for the GNOME platform
 instead of having every editor implement their own solution.
 
 %prep
-%setup -q
+%autosetup
 
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-silent-rules
 make %{?_smp_mflags}
 
 
@@ -85,6 +87,10 @@ fi
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Wed Feb 25 2015 Ville Skyttä <ville.skytta at iki.fi> - 3.14.0-3
+- Apply upstream fix to actually build with vala 0.28
+- Make build more verbose, use %%autosetup
+
 * Sat Feb 21 2015 Kalev Lember <kalevlember at gmail.com> - 3.14.0-2
 - Rebuilt for vala 0.28
 


More information about the scm-commits mailing list