RPM Packaging: update 3.5.13.2 for openSUSE 13.1

3 files changed, 60 insertions, 11 deletions

diff --git a/redhat/tdebindings/admin-fix-parallel-test.diff b/redhat/tdebindings/admin-fix-parallel-test.diff
new file mode 100644
index 000000000..9f6f46ba8
--- /dev/null
+++ b/redhat/tdebindings/admin-fix-parallel-test.diff
@@ -0,0 +1,11 @@
+--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113	2013-06-26 22:35:42.000000000 +0200
++++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh	2013-08-29 22:27:18.546349736 +0200
+@@ -123,7 +123,7 @@
+ fi
+ 
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing || exit 1
+ 
+ if test "$UNSERMAKE" = no; then
+   echo "*** Postprocessing Makefile templates"
diff --git a/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch b/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch
new file mode 100644
index 000000000..67174598e
--- /dev/null
+++ b/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch
@@ -0,0 +1,30 @@
+--- ./qtruby/rubylib/qtruby/configure.in.in.ruby2	2013-08-24 15:44:24.933359206 +0200
++++ ./qtruby/rubylib/qtruby/configure.in.in	2013-08-24 15:49:41.820696908 +0200
+@@ -21,6 +21,12 @@
+       fi
+     fi
+     if test -z "$RUBY_VERSION"; then
++      RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
++      if test -n "$RUBY_VERSION"; then
++        RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
++      fi
++    fi
++    if test -z "$RUBY_VERSION"; then
+       # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
+       if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
+         # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
+--- ./korundum/rubylib/korundum/configure.in.in.ruby2	2013-08-24 15:44:24.933359206 +0200
++++ ./korundum/rubylib/korundum/configure.in.in	2013-08-24 15:50:46.666333349 +0200
+@@ -19,6 +19,12 @@
+       if test -n "$RUBY_VERSION"; then
+         RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
+       fi
++    fi
++    if test -z "$RUBY_VERSION"; then
++      RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
++      if test -n "$RUBY_VERSION"; then
++        RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
++      fi
+     fi
+     if test -z "$RUBY_VERSION"; then
+       # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
diff --git a/redhat/tdebindings/tdebindings-3.5.13.2.spec b/redhat/tdebindings/tdebindings-3.5.13.2.spec
index d862c9b15..6e553c754 100644
--- a/redhat/tdebindings/tdebindings-3.5.13.2.spec
+++ b/redhat/tdebindings/tdebindings-3.5.13.2.spec
@@ -52,13 +52,19 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
 # [tdebindings] Fix RUBY path ending with '/' causing fail to install
-Patch1:		tdebindings-3.5.13.2-fix_ruby_path.patch
+Patch1:			tdebindings-3.5.13.2-fix_ruby_path.patch
+
+# [tdebindings] Fix ruby 2.x detection
+Patch2:			tdebindings-3.5.13.2-fix_ruby2_detection.patch
+
+# [tdebindings] Fix automake 1.13 build issue
+Patch3:			admin-fix-parallel-test.diff
 
 # [kdebindings] Fix FTBFS in dcopjava/bindings
-Patch7:		kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch
+Patch4:			kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch
 
 # [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL5
-Patch18:	kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch
+Patch5:		kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch
 
 BuildRequires: autoconf automake libtool m4
 BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@@ -975,19 +981,16 @@ Development files for the TDE bindings.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .rubypath
-%patch7 -p1 -b .dcopjavaldflags
+%patch2 -p1 -b .ruby2
+%patch3 -p1 -b .automake113
+%patch4 -p1 -b .dcopjavaldflags
 
 %if "%{?perl_vendorarch}" == ""
 exit 1
 %endif
 
 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-%patch18 -p1 -b .ruby
-%endif
-
-# Workarounds strange issue in MGA3
-%if 0%{?mgaversion} == 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19
-%__cp /usr/share/automake-1.13/test-driver admin/
+%patch5 -p1 -b .ruby
 %endif
 
 # Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so')
@@ -1019,6 +1022,11 @@ if [ -d /usr/evolution28 ]; then
   export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
 fi
 
+# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h
+%if 0%{?suse_version} >= 1310
+EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
+%endif
+
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
@@ -1036,7 +1044,7 @@ fi
   --enable-closure \
   --enable-rpath \
   \
-  --with-extra-includes=%{_includedir}/tqscintilla \
+  --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \
   --with-extra-libs=%{tde_libdir} \
   --with-pythondir=%{_usr} \
   \