RPM: update packages to build on Fedora 30, Mageia 7

11 files changed, 42 insertions, 11 deletions

diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index a18b8f583..aa8f35067 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -431,6 +431,13 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
          -e "s|Config\.|RbConfig\.|g"
 fi
 
+%if 0%{?fedora} >= 30
+%__sed -i "amarok/src/scripts/playlist2html/playlist2html.py" \
+          "amarok/src/scripts/playlist2html/PlaylistServer.py" \
+          "amarok/src/scripts/webcontrol/WebControl.py" \
+  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
index d22c56f35..0c82b8b5f 120000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
@@ -1 +1 @@
-../../../ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file
+../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
index fbb967811..f71a6795b 120000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
+++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
@@ -1 +1 @@
-../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file
+../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
index 122ae8e16..8e006a46b 120000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
+++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
@@ -1 +1 @@
-../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file
+../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
index 354af853e..2f6e60e4a 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
@@ -38,7 +38,7 @@
 
 %define _docdir %{tde_docdir}
 
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7
 %define debug_package %{nil}
 %endif
 
diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec
index 27aa8edaa..1c2629084 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/konversation/konversation.spec
@@ -176,6 +176,12 @@ and experienced users alike will appreciate its many features:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
+%if 0%{?fedora} >= 30
+%__sed -i "konversation/scripts/media" \
+          "konversation/scripts/weather" \
+  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index d5395491a..988dd77ac 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -15,7 +15,7 @@
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
-%if 0%{?fedora} >= 28
+%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7
 %global debug_package %{nil}
 %endif
 
@@ -59,6 +59,7 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		scons-local-2.5.1.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -100,7 +101,7 @@ you with managing/ripping your preferred streams.
 
 
 %prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1
 %__rm -f kde.py
 
 
@@ -109,14 +110,14 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
 export QTDIR=/usr
-scons configure prefix="%{_prefix}"
-scons %{?_smp_mflags}
+python ./scons.py configure prefix="%{_prefix}"
+python ./scons.py %{?_smp_mflags}
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-DESTDIR="%{?buildroot}" scons install
+DESTDIR="%{?buildroot}" python ./scons.py install
 
 # Missing icon file will make this fail.
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index bd98db971..bf149cdc9 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -74,6 +74,9 @@ BuildRequires:	cln-devel
 %if 0%{?pclinuxos} >= 2018
 BuildRequires:	libcln-devel
 %endif
+%if 0%{?mgaversion} >= 7
+BuildRequires:	%{_lib}cln-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index 27ed4338c..8c9d3fc8c 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -33,7 +33,7 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?mgaversion}
 %define debug_package %{nil}
 %endif
 
@@ -180,6 +180,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__ln_s "smartauthckpasswd" "%{buildroot}%{_bindir}/smartauthmon"
 %__cp -Rp "usr/"*  "%{buildroot}%{_prefix}"
 
+sed -i "%{?buildroot}%{_datadir}/applications/"*".desktop" -e "/^Categories/ s|TDE|X-TDE|"
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardauth.desktop"
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestrict.desktop"
 %endif
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index 02b6c3b33..ebf6e0021 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -421,8 +421,13 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
 
 # Replace all '#!' calls to python with /usr/bin/python
 # and make them executable
+%if 0%{?fedora} >= 30
+%define python /usr/bin/python2
+%else
+%define python /usr/bin/python
+%endif
 for i in `find %{buildroot} -type f`; do
-	sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
+	sed '1s,#!.*python[^ ]*\(.*\),#! %python\1,' \
 		$i > $i.temp;
 	if cmp --quiet $i $i.temp; then
 		rm -f $i.temp;
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 8cb0aae90..fa1d1495f 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -272,6 +272,14 @@ if [ -r /usr/include/libv4l1-videodev.h ]; then
 %__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|"
 fi
 
+%if 0%{?fedora} >= 30
+%__sed -i "src/fetch/scripts/dark_horse_comics.py" \
+          "src/fetch/scripts/ministerio_de_cultura.py" \
+          "src/fetch/scripts/fr.allocine.py" \
+          "src/translators/griffith2tellico.py" \
+  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB