Hello community,

here is the log from the commit of package ruby-kde4 for openSUSE:Factory 
checked in at 2013-05-16 18:15:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ruby-kde4 (Old)
 and      /work/SRC/openSUSE:Factory/.ruby-kde4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ruby-kde4"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ruby-kde4/ruby-kde4.changes      2013-04-18 
10:43:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-kde4.new/ruby-kde4.changes 2013-05-16 
18:15:02.000000000 +0200
@@ -1,0 +2,15 @@
+Tue May 14 12:41:11 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Tweak korundum-ruby19.patch, so it also works correctly with
+  ruby 2.0
+- Use ruby macros directly, instead of defineing our own in the spec
+
+-------------------------------------------------------------------
+Sat May  4 16:54:31 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.10.3
+   * Bugfix release
+   * See http://www.kde.org/announcements/announce-4.10.3.php
+   * resolves bnc#818500
+
+-------------------------------------------------------------------

Old:
----
  korundum-4.10.2.tar.xz

New:
----
  korundum-4.10.3.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ruby-kde4.spec ++++++
--- /var/tmp/diff_new_pack.DbVpzn/_old  2013-05-16 18:15:02.000000000 +0200
+++ /var/tmp/diff_new_pack.DbVpzn/_new  2013-05-16 18:15:02.000000000 +0200
@@ -16,11 +16,6 @@
 #
 
 
-%if 0%{?suse_version} >= 1220
-%define rb_sitelib                        %rb19_sitelibdir
-%define rb_sitearch                       %rb19_sitearchdir
-%endif
-
 Name:           ruby-kde4
 BuildRequires:  kate-devel
 BuildRequires:  libjasper-devel
@@ -37,7 +32,7 @@
 Summary:        Korundum Ruby-KDE library
 License:        LGPL-2.1+
 Group:          Development/Libraries/KDE
-Version:        4.10.2
+Version:        4.10.3
 Release:        0
 Source0:        korundum-%{version}.tar.xz
 Url:            https://projects.kde.org/projects/kde/kdebindings/ruby/korundum
@@ -65,22 +60,22 @@
 %install
   cd build
   %kde4_makeinstall
-  chmod a+x %{buildroot}%{rb_sitelib}/kio/kio.rb
-  chmod a+x %{buildroot}%{rb_sitelib}/khtml/khtml.rb
+  chmod a+x %{buildroot}%{rb_sitelibdir}/kio/kio.rb
+  chmod a+x %{buildroot}%{rb_sitelibdir}/khtml/khtml.rb
   %kde_post_install
 
 %files
 %defattr(-,root,root)
-%{rb_sitearch}/*.so
-%{rb_sitelib}/KDE/
-%{rb_sitelib}/soprano/
-%{rb_sitelib}/akonadi/
-%{rb_sitelib}/kio/
-%{rb_sitelib}/khtml/
-%{rb_sitelib}/ktexteditor/
-%{rb_sitelib}/solid/
-%{rb_sitelib}/nepomuk/
-%{rb_sitelib}/okular/
+%{rb_sitearchdir}/*.so
+%{rb_sitelibdir}/KDE/
+%{rb_sitelibdir}/soprano/
+%{rb_sitelibdir}/akonadi/
+%{rb_sitelibdir}/kio/
+%{rb_sitelibdir}/khtml/
+%{rb_sitelibdir}/ktexteditor/
+%{rb_sitelibdir}/solid/
+%{rb_sitelibdir}/nepomuk/
+%{rb_sitelibdir}/okular/
 %{_kde4_modulesdir}/krubypluginfactory.so
 %{_kde4_bindir}/krubyapplication
 %{_kde4_bindir}/rbkconfig_compiler4

++++++ korundum-4.10.2.tar.xz -> korundum-4.10.3.tar.xz ++++++

++++++ korundum-ruby19.patch ++++++
--- /var/tmp/diff_new_pack.DbVpzn/_old  2013-05-16 18:15:02.000000000 +0200
+++ /var/tmp/diff_new_pack.DbVpzn/_new  2013-05-16 18:15:02.000000000 +0200
@@ -2,30 +2,31 @@
 ===================================================================
 --- korundum-4.8.4.orig/src/krubypluginfactory.cpp
 +++ korundum-4.8.4/src/krubypluginfactory.cpp
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,6 @@
  extern "C" {
  extern VALUE rb_load_path;
  extern VALUE qt_internal_module;
 -void Init_prelude(void);
-+void ruby_init_prelude(void);
  }
  
  //
-@@ -165,7 +165,7 @@ QObject *KRubyPluginFactory::create(cons
+@@ -165,7 +164,8 @@
  #if RUBY_VERSION >= 0x10900
      VALUE gem = rb_define_module("Gem");
      rb_const_set(gem, rb_intern("Enable"), Qtrue);
 -    Init_prelude(); 
-+    ruby_init_prelude(); 
++    char *opts[] = { "ruby", "-e;" };
++    ruby_options(2, opts);
  #endif
  
      ruby_incpush(QFile::encodeName(program.path()));
-@@ -342,7 +342,7 @@ int kdemain(int argc, char **argv)
+@@ -342,7 +342,8 @@
  #if RUBY_VERSION >= 0x10900
      VALUE gem = rb_define_module("Gem");
      rb_const_set(gem, rb_intern("Enable"), Qtrue);
 -    Init_prelude();                                             
-+    ruby_init_prelude();                                             
++    char *opts[] = { "ruby", "-e;" };
++    ruby_options(2, opts);
  #endif
  
      ruby_incpush(QFile::encodeName(program.path()));

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to