summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2015-11-12 15:33:20 +0100
committerFran├žois Andriot <albator78@libertysurf.fr>2015-11-12 15:33:20 +0100
commit6d35d807af3922ef7aa259b25fd3f8f15c6dea9e (patch)
tree844a59bca97cc1c1698b770a092c0c8690a32a75
parentef3647b27122d9db4d6ec26840d92e628c5b561f (diff)
downloadtde-packaging-6d35d807af3922ef7aa259b25fd3f8f15c6dea9e.tar.gz
tde-packaging-6d35d807af3922ef7aa259b25fd3f8f15c6dea9e.zip
RPM packaging: build fixes for TDE 14.0.2 on Fedora 23
-rw-r--r--redhat/applications/kmymoney/kmymoney-14.0.0.spec4
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec2
-rw-r--r--redhat/applications/kvirc/kvirc-14.0.0.spec4
-rw-r--r--redhat/applications/tellico/tellico-14.0.0.spec4
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec4
5 files changed, 17 insertions, 1 deletions
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index 7045a633b..47b7de6e4 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -1,3 +1,7 @@
+%if 0%{?fedora} == 23
+%define _configure_libtool_hardening_hack 0
+%endif
+
#
# spec file for package kmymoney (version R14)
#
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 3134cc61f..04fb6cbcf 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -1130,7 +1130,7 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
%endif
# FTBFS on Fedora 22
-%if 0%{?fedora} == 22
+%if 0%{?fedora} >= 23
%__sed -i "lib/kross/ruby/rubyinterpreter.cpp" \
-e "s|rb_set_safe_level|//rb_set_safe_level|"
%endif
diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec
index 0633b749e..abb9b4d02 100644
--- a/redhat/applications/kvirc/kvirc-14.0.0.spec
+++ b/redhat/applications/kvirc/kvirc-14.0.0.spec
@@ -1,3 +1,7 @@
+%if 0%{?fedora} == 23
+%define _hardened_ldflags %nil
+%endif
+
#
# spec file for package kvirc (version R14)
#
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 2b023667f..3d99feb5a 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -1,3 +1,7 @@
+%if 0%{?fedora} == 23
+%define _hardened_ldflags %nil
+%endif
+
#
# spec file for package tellico (version R14)
#
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
index b4c9a60e8..e46efef40 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
@@ -1,3 +1,7 @@
+%if 0%{?fedora} == 23
+%define _hardened_ldflags %nil
+%endif
+
#
# spec file for package libksquirrel (version R14)
#