Branch: master

6d35d807 2015-11-12 08:33:20 François Andriot
RPM packaging: build fixes for TDE 14.0.2 on Fedora 23
M redhat/applications/kmymoney/kmymoney-14.0.0.spec
M redhat/applications/koffice/koffice-14.0.0.spec
M redhat/applications/kvirc/kvirc-14.0.0.spec
M redhat/applications/tellico/tellico-14.0.0.spec
M redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index 7045a63..47b7de6 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 3134cc6..04fb6cb 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -1130,7 +1130,7 @@
 %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 0633b74..abb9b4d 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 2b02366..3d99feb 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 b4c9a60..e46efef 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)
 #