2 files changed, 8 insertions, 7 deletions
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 16e69a105..083b85f4e 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -52,7 +52,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.6.3
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	An integrated office suite
 Group:		Applications/Productivity
 URL:		http://www.trinitydesktop.org/
@@ -1129,6 +1129,12 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
        -e "/TDEApplication/ s|\");|\", true, true, true);|"
 %endif
 
+# FTBFS on Fedora 22
+%if 0%{?fedora} == 22
+%__sed -i "lib/kross/ruby/rubyinterpreter.cpp" \
+       -e "s|rb_set_safe_level|//rb_set_safe_level|"
+%endif
+
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
index 22cfb1166..701c8af8a 100644
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.2.spec
@@ -5,11 +5,6 @@
 # Required for Mageia 2: removes the ldflag '--no-undefined'
 %define _disable_ld_no_undefined 1
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 # TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -41,7 +36,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		An integrated office suite
 Version:		1.6.3
-Release:		%{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}
 
 Group:			Applications/Productivity
 License:		GPLv2+