rpms/cairo-dock/devel cairo-dock-plugins-3.4.0-vala-append-soname.patch, NONE, 1.1 cairo-dock.spec, 1.80, 1.81

Mon Dec 29 07:34:16 CET 2014

Author: mtasaka

Update of /cvs/free/rpms/cairo-dock/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv730

Modified Files:
	cairo-dock.spec 
Added Files:
	cairo-dock-plugins-3.4.0-vala-append-soname.patch 
Log Message:
* Mon Dec 29 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.4.0-6
- Enable vala interface


cairo-dock-plugins-3.4.0-vala-append-soname.patch:
 CMakeLists.txt                          |    2 ++
 Dbus/interfaces/vala/src/CMakeLists.txt |   10 ++++++++++
 2 files changed, 12 insertions(+)

--- NEW FILE cairo-dock-plugins-3.4.0-vala-append-soname.patch ---
>From 2326408fb3ea63b78f0b0b5b13dcfa2070018e10 Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <matttbe at gmail.com>
Date: Mon, 29 Dec 2014 01:39:23 +0100
Subject: [PATCH] DBus: Vala: added soversion

A version is needed for Vala interface's soname to track ABI changes
---
 CMakeLists.txt                          |  2 ++
 Dbus/interfaces/vala/src/CMakeLists.txt | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdd83a5..82e81c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -596,6 +596,8 @@ if (enable-vala-interface)
 	set (with_valac no)
 	find_program (VALAC_EXE valac)
 	message (STATUS "   Path to valac: ${VALAC_EXE}")
+	set (VERSION_VALA "1.0.0")
+	message (STATUS "   Cairo-Dock Vala interface's ABI version: ${VERSION_VALA}")
 
 	enable_if_not_defined (enable-vala-support)
 	if (NOT enable-vala-support)
diff --git a/Dbus/interfaces/vala/src/CMakeLists.txt b/Dbus/interfaces/vala/src/CMakeLists.txt
index d2dc97e..5b86d61 100644
--- a/Dbus/interfaces/vala/src/CMakeLists.txt
+++ b/Dbus/interfaces/vala/src/CMakeLists.txt
@@ -7,6 +7,16 @@ endif()
 
 # now, compile it as any normal C lib.
 add_library (${CDAPPLET} SHARED ${VALA_SRC_DIR}/${CDAPPLET}.c)
+STRING (REGEX REPLACE "\\..*" "" SOVERSION_VALA "${VERSION_VALA}")
+set_target_properties (${CDAPPLET} PROPERTIES
+	# create *nix style library versions + symbolic links
+	VERSION ${VERSION_VALA}
+	SOVERSION ${SOVERSION_VALA}
+	# allow creating static and shared libs without conflicts
+	#CLEAN_DIRECT_OUTPUT 1
+	# avoid conflicts between library and binary target names
+	#OUTPUT_NAME ${PROJECT_NAME}
+)
 add_definitions (-fPIC -Wno-all)
 
 pkg_check_modules ("CDAPPLET_DEPS" "gobject-2.0" "gio-2.0")


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- cairo-dock.spec	19 Dec 2014 15:07:08 -0000	1.80
+++ cairo-dock.spec	29 Dec 2014 06:34:15 -0000	1.81
@@ -29,7 +29,7 @@
 %global		build_webkit	1
 %global		build_xfce	1
 
-%global		fedora_main_rel	5
+%global		fedora_main_rel	6
 
 
 %global		fedora_rel	%{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -44,9 +44,7 @@
 
 %global	build_ruby		1
 %global	ruby_vendorlib		%(ruby -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
-# FIXME
-# I don't know well about vala !!
-%global	build_vala		0
+%global	build_vala		1
 
 # For debugging
 %global	skip_main_build	0
@@ -66,9 +64,14 @@
 Source2:	http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}%{?betaver:-%betaver}/+download/cairo-dock-plugins-%{mainver}%{?postver_p:~%postver_p}%{?betaver:~%betaver}.tar.gz
 %endif
 # Specify gem name to surely use ruby-dbus
+# Applied as 006353cc067e789e50d85790fbdb6c25e1398a63
 Patch0:	cairo-dock-plugins-3.4.0-ruby-specify-gemname.patch
 # Ruby initialization fix
+# Applied as b71aff98db0fe9d4a22ed1fb9c457da0c3023846
 Patch1:	cairo-dock-plugins-3.4.0-ruby-initialization.patch
+# Append soname for Vala interface
+# Upstream: 2326408fb3ea63b78f0b0b5b13dcfa2070018e10
+Patch2:	cairo-dock-plugins-3.4.0-vala-append-soname.patch
 
 BuildRequires:	cmake
 
@@ -268,6 +271,17 @@
 %description	vala
 This package contains Vala binding files for %{name}
 
+%package	vala-devel
+Summary:	Development files for Vala binding for %{name}
+Version:	%{rpmver_p}
+Release:	%{rpmrel}
+Group:		Development/Libraries
+Requires:	%{name}-vala%{?_isa} = %{rpmver_p}-%{rpmrel}
+
+%description vala-devel
+This package contains development files for Vala
+binding for %{name}.
+
 %package	devel
 Summary:	Development files for %{name}
 Version:	%{rpmver_c}
@@ -328,6 +342,7 @@
 # Patch
 %patch0 -p1 -b .gem
 %patch1 -p1 -b .rubyinit
+%patch2 -p1 -b .valasoname
 
 ## permission
 for dir in */
@@ -357,11 +372,6 @@
 	-e '\@set.*RUBY_LIB_DIR.*CMAKE_INSTALL_PREFIX.*RUBY_LIB_DIR_INSTALL at d' \
 	CMakeLists.txt
 # Python
-# Vala
-## FIXME
-sed -i.vala \
-	-e '/with_vala /s|yes|no|' \
-	CMakeLists.txt
 
 popd # from opt/cairo-dock/trunk/cairo-dock
 
@@ -543,6 +553,10 @@
 
 %post core -p /sbin/ldconfig
 %postun core -p /sbin/ldconfig
+%if %{build_vala} >= 0
+%post vala -p /sbin/ldconfig
+%postun vala -p /sbin/ldconfig
+%endif
 
 
 %files
@@ -640,13 +654,27 @@
 %{ruby_vendorlib}/CDApplet.rb
 %endif
 
+%if %{build_vala} > 0
+%files vala
+%{_libdir}/libCDApplet.so.1*
+%{_datadir}/vala/vapi/CDApplet.*
+
+%files vala-devel
+%{_libdir}/libCDApplet.so
+%{_libdir}/pkgconfig/CDApplet.pc
+%endif
+
+
 %files	devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/
 %{_libdir}/libgldi.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/gldi.pc
 
 %changelog
+* Mon Dec 29 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.4.0-6
+- Enable vala interface
+
 * Sat Dec 20 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.4.0-5
 - Make plug-ins depending on python(2), due to cairo-dock-launcher-API-daemon
   dependency (bug 3470)
