[cairo-dock-plug-ins] 3.4.1

Fri Mar 13 16:05:31 UTC 2015

commit 657c40962ca879d5616f818d3a1b4d3803c99856
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Sat Mar 14 01:05:27 2015 +0900

    3.4.1
    
    - demo_ruby: fix traceback when changing themes

 .gitignore                                         |  1 +
 cairo-dock-plug-ins-create-fedora-tarball.sh       |  8 +++-
 cairo-dock-plug-ins.spec                           | 28 +++++---------
 cairo-dock-plugins-3.4.0-ruby-initialization.patch | 11 ------
 ...o-dock-plugins-3.4.0-ruby-specify-gemname.patch | 10 -----
 cairo-dock-plugins-3.4.0-vala-append-soname.patch  | 45 ----------------------
 ...o_ruby-fix-traceback-when-changing-themes.patch | 40 +++++++++++++++++++
 sources                                            |  2 +-
 8 files changed, 59 insertions(+), 86 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index d7c659f..f976922 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cairo-dock-plugins-fedora-3.4.0.tar.gz
+/cairo-dock-plugins-fedora-3.4.1.tar.gz
diff --git a/cairo-dock-plug-ins-create-fedora-tarball.sh b/cairo-dock-plug-ins-create-fedora-tarball.sh
index 43b712a..b0ce3b5 100644
--- a/cairo-dock-plug-ins-create-fedora-tarball.sh
+++ b/cairo-dock-plug-ins-create-fedora-tarball.sh
@@ -13,9 +13,15 @@ CURRENT_DIR=$(pwd)
 TMPDIR=$(mktemp -d /var/tmp/cairo-dock-XXXXXX)
 pushd $TMPDIR
 
-wget -N http://launchpad.net/cairo-dock-plug-ins/${VERSION_PARENT}/${VERSION}/+download/cairo-dock-plugins-${VERSION}.tar.gz
+#wget -N http://launchpad.net/cairo-dock-plug-ins/${VERSION_PARENT}/${VERSION}/+download/cairo-dock-plugins-${VERSION}.tar.gz
+wget -N https://github.com/Cairo-Dock/cairo-dock-plug-ins/archive/${VERSION}/cairo-dock-plugins-${VERSION}.tar.gz
 rm -rf cairo-dock-plugins-${VERSION}
 tar xzf cairo-dock-plugins-${VERSION}.tar.gz
+
+if [ -d cairo-dock-plug-ins-${VERSION} ] ; then
+	mv cairo-dock-plug{-,}ins-${VERSION}
+fi
+
 pushd cairo-dock-plugins-${VERSION}
 
 rm -rf Scooby-Do/
diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec
index 58d4f79..e1da703 100644
--- a/cairo-dock-plug-ins.spec
+++ b/cairo-dock-plug-ins.spec
@@ -1,7 +1,7 @@
 %global	urlver		3.4
-%global	mainver	3.4.0
+%global	mainver	3.4.1
 
-%global	core_least_ver	3.4.0
+%global	core_least_ver	3.4.1
 
 %global	ruby_vendorlib	%(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
 
@@ -9,7 +9,7 @@
 
 Name:			cairo-dock-plug-ins
 Version:		%{mainver}
-Release:		14%{?dist}
+Release:		1%{?dist}
 Summary:		Plug-ins files for Cairo-Dock
 
 License:		GPLv3+
@@ -19,16 +19,8 @@ URL:			http://glx-dock.org/
 Source0:		cairo-dock-plugins-fedora-%{version}.tar.gz
 # Source0 is created from Source1
 Source1:		cairo-dock-plug-ins-create-fedora-tarball.sh
-
-# 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
+# demo_ruby: fix traceback when changing themes
+Patch0:		cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch
 
 BuildRequires:	cmake
 BuildRequires:	gettext
@@ -193,11 +185,7 @@ binding for Cairo-Dock.
 
 %prep
 %setup -q -n cairo-dock-plugins-%{mainver}
-
-# Patch
-%patch0 -p1 -b .gem
-%patch1 -p1 -b .rubyinit
-%patch2 -p1 -b .valasoname
+%patch0 -p1
 
 ## permission
 # %%_fixperms cannot fix permissions completely here
@@ -391,6 +379,10 @@ popd
 %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h
 
 %changelog
+* Thu Mar 13 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.4.1-1
+- 3.4.1
+- demo_ruby: fix traceback when changing themes
+
 * Sat Feb 28 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.4.0-14
 - Bump release
 
diff --git a/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch b/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch
new file mode 100644
index 0000000..846b417
--- /dev/null
+++ b/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch
@@ -0,0 +1,40 @@
+From 9043010e2cdd384ff5de5f5f116229557d15721c Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedorapeople.org>
+Date: Fri, 6 Mar 2015 19:06:34 +0900
+Subject: [PATCH] demo_ruby: fix traceback when changing themes
+
+Fix the "crash" when changing like:
+./demo_ruby:108:in `reload': undefined local variable or method `myApplet' for #<Applet:0x00000002e6c060> (NameError)
+        from /usr/share/ruby/vendor_ruby/CDApplet.rb:203:in `_on_reload'
+        from /usr/share/ruby/vendor_ruby/CDApplet.rb:274:in `block in _connect_to_dock'
+        from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/introspect.rb:325:in `call'
+        from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/introspect.rb:325:in `block in on_signal'
+        from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:665:in `call'
+        from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:665:in `block in process'
+        from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:663:in `each'
+        from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:663:in `process'
+        from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:855:in `block in run'
+        from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:846:in `each'
+        from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:846:in `run'
+        from /usr/share/ruby/vendor_ruby/CDApplet.rb:83:in `run'
+        from ./demo_ruby:127:in `<main>'
+---
+ Dbus/demos/demo_ruby/demo_ruby | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Dbus/demos/demo_ruby/demo_ruby b/Dbus/demos/demo_ruby/demo_ruby
+index 2df5cda..a9374bd 100755
+--- a/Dbus/demos/demo_ruby/demo_ruby
++++ b/Dbus/demos/demo_ruby/demo_ruby
+@@ -105,7 +105,7 @@ class Applet < CDApplet
+ 	end
+ 	def reload
+ 		p "[+] our module was reloaded, welcome back!"
+-		self.icon.AddDataRenderer("gauge", 1, myApplet.config['theme'])
++		self.icon.AddDataRenderer("gauge", 1, self.configuration['theme'])
+ 		self.icon.RenderValues([Float(self.counter)/self.configuration['max_value']])
+ 		self.sub_icons.RemoveSubIcon("any")
+ 		self.sub_icons.AddSubIcons(["icon 1", "firefox-3.0", "id1", "icon 2", "natilus", "id2", "icon 3", "thunderbird", "id3"]) 
+-- 
+2.1.0
+
diff --git a/sources b/sources
index 900ccb3..f6dff08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9c1b65c6eba742b1037d40704d1d8a2  cairo-dock-plugins-fedora-3.4.0.tar.gz
+0767bf68cb8aba586cb13c9d02173497  cairo-dock-plugins-fedora-3.4.1.tar.gz
