11:35 a.m.
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8870
Modified Files:
cairo-dock.spec
Added Files:
cairo-dock-plugins-3.4.0-ruby-initialization.patch
cairo-dock-plugins-3.4.0-ruby-specify-gemname.patch
Log Message:
* Fri Dec 19 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-3
- Build ruby
cairo-dock-plugins-3.4.0-ruby-initialization.patch:
CDApplet.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cairo-dock-plugins-3.4.0-ruby-initialization.patch ---
--- cairo-dock-plugins-3.4.0/Dbus/interfaces/ruby/CDApplet.rb.initialization 2014-12-19
19:06:23.010243636 +0900
+++ cairo-dock-plugins-3.4.0/Dbus/interfaces/ruby/CDApplet.rb 2014-12-19
20:22:32.177163226 +0900
@@ -26,7 +26,7 @@ require 'dbus'
require 'parseconfig'
class CDApplet
- attr_accessor :cConfFile, :cAppletName, :icon, :sub_icons, :config, :bus, :_cMenuIconId,
:cParentAppName, :cBusPath
+ attr_accessor :cConfFile, :cAppletName, :icon, :sub_icons, :config, :bus, :_cMenuIconId,
:cParentAppName, :cBusPath, :cRootDataDir, :cShareDataDir
BOTTOM = 0
TOP = 1
cairo-dock-plugins-3.4.0-ruby-specify-gemname.patch:
CDApplet.rb | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE cairo-dock-plugins-3.4.0-ruby-specify-gemname.patch ---
--- cairo-dock-plugins-3.4.0/Dbus/interfaces/ruby/CDApplet.rb.gem 2014-07-26
18:05:11.000000000 +0900
+++ cairo-dock-plugins-3.4.0/Dbus/interfaces/ruby/CDApplet.rb 2014-12-19
18:13:23.662837953 +0900
@@ -21,6 +21,7 @@
# show the % of carge as quick info, and activate an alert message to be shown when the
charge is critically low.
require 'rubygems'
+gem 'ruby-dbus'
require 'dbus'
require 'parseconfig'
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- cairo-dock.spec 12 Dec 2014 08:58:41 -0000 1.77
+++ cairo-dock.spec 19 Dec 2014 11:35:06 -0000 1.78
@@ -29,7 +29,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 2
+%global fedora_main_rel 3
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -42,9 +42,8 @@
%global build_python 1
%global build_python3 1
-%global build_ruby 0
-%global rubyabi 1.9.1
-%global ruby_sitearch %(ruby -rrbconfig -e "puts
Config::CONFIG['sitearchdir']")
+%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
@@ -66,6 +65,10 @@
Source0: http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}%{?betaver:-%bet...
Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}%{?betaver:-...
%endif
+# Specify gem name to surely use ruby-dbus
+Patch0: cairo-dock-plugins-3.4.0-ruby-specify-gemname.patch
+# Ruby initialization fix
+Patch1: cairo-dock-plugins-3.4.0-ruby-initialization.patch
BuildRequires: cmake
@@ -124,17 +127,11 @@
BuildRequires: python3-devel
%endif
%if %{build_ruby}
-%if 0%{?fedora} >= 19
BuildRequires: ruby(release)
-%else
-BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby
-%endif
BuildRequires: ruby-devel
%endif
%if %{build_vala}
-#?????
-# BuildRequires: vala
+BuildRequires: vala
%endif
# This is a meta package to install cairo-dock-core and
@@ -249,14 +246,9 @@
Release: %{rpmrel}
Group: User Interface/Desktops
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
-%if 0%{?fedora} >= 19
Requires: ruby(release)
-%else
-Requires: ruby(abi) = %{rubyabi}
-%endif
-Requires: rubygems
-# The following is not in Fedora yet
-Requires: rubygem(dbus)
+Requires: rubygem(ruby-dbus)
+Requires: rubygem(parseconfig)
%description ruby
This package contains Ruby binding files for %{name}
@@ -267,7 +259,6 @@
Release: %{rpmrel}
Group: User Interface/Desktops
Requires: %{name}-core = %{rpmver_c}-%{rpmrel}
-# ???
Requires: vala
%description vala
@@ -331,6 +322,8 @@
cd ../plug-ins
# Patch
+%patch0 -p1 -b .gem
+%patch1 -p1 -b .rubyinit
## permission
for dir in */
@@ -354,6 +347,11 @@
sed -i.site \
-e "s|CONFIG\['rubylibdir'\]|CONFIG['vendorlibdir']|" \
CMakeLists.txt
+# ????
+sed -i.installdir \
+ -e '\@REGEX REPLACE.*RUBY@d' \
+ -e '\@set.*RUBY_LIB_DIR.*CMAKE_INSTALL_PREFIX.*RUBY_LIB_DIR_INSTALL(a)d' \
+ CMakeLists.txt
# Python
# Vala
## FIXME
@@ -632,7 +630,7 @@
%if %{build_ruby} > 0
%files ruby
%defattr(-,root,root,-)
-%{ruby_sitearch}/CDApplet.rb
+%{ruby_vendorlib}/CDApplet.rb
%endif
%files devel
@@ -642,6 +640,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Dec 19 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-3
+- Build ruby
+
* Fri Dec 12 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-2
- Build Messaging-Menu, Status-Notifier