summaryrefslogtreecommitdiffstats
path: root/redhat/applications/koffice
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-08-31 15:38:14 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-08-31 15:38:14 +0200
commitcdec7ede2cd93dedf437e5b10597433ea9d9eabe (patch)
tree723b1f74f1d9d264363e9b535466dd461be8fef6 /redhat/applications/koffice
parent1af57210e2e55d40eb39a274fcf48779c6b9e7d5 (diff)
downloadtde-packaging-cdec7ede2cd93dedf437e5b10597433ea9d9eabe.tar.gz
tde-packaging-cdec7ede2cd93dedf437e5b10597433ea9d9eabe.zip
RPM Packaging: update 3.5.13.2 for openSUSE 13.1
Diffstat (limited to 'redhat/applications/koffice')
-rw-r--r--redhat/applications/koffice/admin-fix-parallel-test.diff11
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch15
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2.spec12
3 files changed, 32 insertions, 6 deletions
diff --git a/redhat/applications/koffice/admin-fix-parallel-test.diff b/redhat/applications/koffice/admin-fix-parallel-test.diff
new file mode 100644
index 000000000..9f6f46ba8
--- /dev/null
+++ b/redhat/applications/koffice/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/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
new file mode 100644
index 000000000..f375078cf
--- /dev/null
+++ b/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
@@ -0,0 +1,15 @@
+--- trinity-koffice-3.5.13.2/lib/kross/configure.in.in.ori 2013-08-24 20:57:39.878623151 +0200
++++ trinity-koffice-3.5.13.2/lib/kross/configure.in.in 2013-08-24 20:58:50.132123615 +0200
+@@ -42,6 +42,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
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
index 5e23a4fe8..34dfb6606 100644
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.2.spec
@@ -27,7 +27,7 @@
%define _docdir %{tde_docdir}
# Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_kross 1
%endif
@@ -56,6 +56,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: koffice-3.5.13.2-fix_kformula_ftbfs.patch
+Patch2: koffice-3.5.13.2-fix_ruby2_detection.patch
+Patch3: admin-fix-parallel-test.diff
# BuildRequires: world-devel ;)
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@@ -1061,10 +1063,8 @@ This package is part of the TDE Office Suite.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .ftbfs
-
-%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19
-%__cp /usr/share/automake-1.13/test-driver admin/
-%endif
+%patch2 -p1 -b .ruby2
+%patch3 -p1 -b .automake113
# use LGC variant instead
%__sed -i.dejavu-lgc \
@@ -1078,7 +1078,7 @@ This package is part of the TDE Office Suite.
%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export KDEDIR="%{tde_prefix}"