rpms/cairo-dock/F-20 cairo-dock-plugins-3.4.0-vala-append-soname.patch, NONE, 1.1 cairo-dock.spec, 1.76, 1.77
Mamoru Tasaka
mtasaka at rpmfusion.org
Mon Dec 29 09:16:00 CET 2014
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1750
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-7
- Build unstable plug-ins (except for KDE experimental)
(not installed by default option)
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/F-20/cairo-dock.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- cairo-dock.spec 19 Dec 2014 15:08:23 -0000 1.76
+++ cairo-dock.spec 29 Dec 2014 08:16:00 -0000 1.77
@@ -29,7 +29,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 5
+%global fedora_main_rel 7
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -44,9 +44,8 @@
%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
+%global build_unstable 1
# For debugging
%global skip_main_build 0
@@ -66,9 +65,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
@@ -220,6 +224,17 @@
This package contains plug-ins files for %{name} related
to webkit.
+%package plug-ins-unstable
+Summary: Unstable plug-ins not installed by default
+Version: %{rpmver_p}
+Release: %{rpmrel}
+Group: User Interface/Desktops
+Requires: %{name}-core%{?_isa} = %{rpmver_c}-%{rpmrel}
+
+%description plug-ins-unstable
+This package contains unstable and experimental
+plug-ins not installed by default.
+
%package python
Summary: Python binding for %{name}
Version: %{rpmver_p}
@@ -268,6 +283,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 +354,7 @@
# Patch
%patch0 -p1 -b .gem
%patch1 -p1 -b .rubyinit
+%patch2 -p1 -b .valasoname
## permission
for dir in */
@@ -357,11 +384,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
@@ -433,6 +455,13 @@
rm -f CMakeCache.txt
%cmake \
+%if 0%{?build_unstable} >= 1
+ -Denable-disks=TRUE \
+ -Denable-doncky=TRUE \
+ -Denable-global-menu=TRUE \
+ -Denable-network-monitor=TRUE \
+ -Denable-scooby-do=TRUE \
+%endif
.
## Parallel make fails some times, but it is gerenally fast
@@ -543,6 +572,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
@@ -595,6 +628,35 @@
%endif
%exclude %{_libdir}/%{name}/*kde*
%exclude %{_datadir}/%{name}/plug-ins/*kde*
+%if 0%{?build_unstable} >= 1
+%exclude %{_libdir}/%{name}/appmenu-registrar
+%exclude %{_libdir}/%{name}/libcd-Global-Menu.so
+%exclude %{_libdir}/%{name}/libcd-disks.so
+%exclude %{_libdir}/%{name}/libcd-doncky.so
+%exclude %{_libdir}/%{name}/libcd-network-monitor.so
+%exclude %{_libdir}/%{name}/libcd-scooby-do.so
+%exclude %{_datadir}/%{name}/plug-ins/Disks/
+%exclude %{_datadir}/%{name}/plug-ins/Doncky/
+%exclude %{_datadir}/%{name}/plug-ins/Global-Menu/
+%exclude %{_datadir}/%{name}/plug-ins/Network-Monitor/
+%exclude %{_datadir}/%{name}/plug-ins/Scooby-Do/
+%endif
+
+%if 0%{?build_unstable} >= 1
+%files plug-ins-unstable
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/appmenu-registrar
+%{_libdir}/%{name}/libcd-Global-Menu.so
+%{_libdir}/%{name}/libcd-disks.so
+%{_libdir}/%{name}/libcd-doncky.so
+%{_libdir}/%{name}/libcd-network-monitor.so
+%{_libdir}/%{name}/libcd-scooby-do.so
+%{_datadir}/%{name}/plug-ins/Disks/
+%{_datadir}/%{name}/plug-ins/Doncky/
+%{_datadir}/%{name}/plug-ins/Global-Menu/
+%{_datadir}/%{name}/plug-ins/Network-Monitor/
+%{_datadir}/%{name}/plug-ins/Scooby-Do/
+%endif
%if %{build_xfce} > 0
%files plug-ins-xfce
@@ -640,13 +702,31 @@
%{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-7
+- Build unstable plug-ins (except for KDE experimental)
+ (not installed by default option)
+
+* 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)
More information about the rpmfusion-commits
mailing list