Branch: r14.0.x

f6042194 2019-07-30 17:54:39 François Andriot 
RPM: update packages to build on Fedora 30, Mageia 7
A redhat/docker/f30/Dockerfile.i686
A redhat/docker/f30/Dockerfile.x86_64
A redhat/docker/f30/packages
A redhat/docker/f30/rpmbuild.repo
A redhat/docker/f30/rpmmacros
A redhat/docker/mga7/Dockerfile.i686
A redhat/docker/mga7/Dockerfile.x86_64
A redhat/docker/mga7/packages.i686
A redhat/docker/mga7/packages.x86_64
A redhat/docker/mga7/rpmmacros
A redhat/docker/oss151/Dockerfile.x86_64
A redhat/docker/oss151/packages
A redhat/docker/oss151/rpmmacros
A redhat/main/tdebase/pamd.kcheckpass-trinity.fc30
A redhat/main/tdebase/pamd.kcheckpass-trinity.mga7
A redhat/main/tdebase/pamd.kdm-trinity-np.fc30
A redhat/main/tdebase/pamd.kdm-trinity-np.mga7
A redhat/main/tdebase/pamd.kdm-trinity.fc30
A redhat/main/tdebase/pamd.kdm-trinity.mga7
A redhat/main/tdebase/pamd.kscreensaver-trinity.fc30
A redhat/main/tdebase/pamd.kscreensaver-trinity.mga7
A redhat/main/tdebase/tdm.fc30.pp
A redhat/main/tdebase/tdm.service.fc30
M redhat/Makefile.r14
M redhat/applications/amarok/amarok-14.0.0.spec
M redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
M redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
M redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
M redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
M redhat/applications/konversation/konversation.spec
M redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
M redhat/applications/qalculate-tde/qalculate-tde.spec
M redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
M redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
M redhat/applications/tellico/tellico-14.0.0.spec
M redhat/build/get_latest_tarball_filename.sh
M redhat/build/get_latest_tarball_version.sh
M redhat/build/get_rpm_package_name.sh
M redhat/build/is_latest_package_built.sh
M redhat/dependencies/tqt3/tqt3-14.0.0.spec
M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
M redhat/extras/fileshareset/fileshareset.spec
M redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
M redhat/libraries/python-trinity/python-trinity-14.0.0.spec
M redhat/main/tdeaddons/tdeaddons-14.0.0.spec
M redhat/main/tdebindings/tdebindings-14.0.0.spec
M redhat/main/tdeedu/tdeedu-14.0.0.spec
M redhat/main/tdesdk/tdesdk-14.0.0.spec

redhat/Makefile.r14

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 57eb8eb..17ffbc3 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -168,8 +168,13 @@
 
 esound:
 # Build on Mageia, Fedora >= 23, Opensuse >= 15.0
-ifneq (,$(filter $(DIST),.mga5 .mga6 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .osstw))
+ifneq (,$(filter $(DIST),.mga5 .mga6 .mga7 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .oss151 .osstw))
 	$(call buildpkg,3rdparty/esound)
+endif
+
+exiv2:
+ifneq (,$(filter $(DIST),.mga7 .fc30))
+	$(call buildpkg,3rdparty/exiv2)
 endif
 
 file:
@@ -211,8 +216,8 @@
 endif
 
 lcms:
-# Build on EL7, OSS150, OSSTW
-ifneq (,$(filter $(DIST),.el7 .oss150 .osstw))
+# Build on EL7, MGA7, OSS >= 150, OSSTW
+ifneq (,$(filter $(DIST),.el7 .oss150 .oss151 .osstw .mga7))
 	$(call buildpkg,3rdparty/lcms)
 endif
 
@@ -248,7 +253,7 @@
 
 mp4v2:
 # Build on OpenSUSE only
-ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw))
+ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
@@ -281,7 +286,7 @@
 
 recode:
 # Build on OpenSUSE >= 15.0 only
-ifneq (,$(filter $(DIST),.oss150 .osstw))
+ifneq (,$(filter $(DIST),.oss150 .oss151 .osstw))
 	$(call buildpkg,3rdparty/recode)
 endif
 
@@ -311,7 +316,7 @@
 
 wv2:
 # Do NOT build on Mageia or openSUSE or PCLINUXOS
-ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos .pclos2018))
+ifeq (,$(filter $(DIST), .mga5 .mga6 .mga7 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw .pclos .pclos2018))
 	$(call buildpkg,3rdparty/wv2)
 endif
 
@@ -328,7 +333,7 @@
 libkdcraw:	tqtinterface lcms
 	$(call buildpkg,libraries/libkdcraw)
 
-libkexiv2:	tqtinterface
+libkexiv2:	tqtinterface tdelibs exiv2
 	$(call buildpkg,libraries/libkexiv2)
 
 libkipi:	tqtinterface

redhat/applications/amarok/amarok-14.0.0.spec

diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index a18b8f5..aa8f350 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -431,6 +431,13 @@
          -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

redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh

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 d22c56f..0c82b8b 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

redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4

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 fbb9678..f71a679 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

redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4

diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
index 122ae8e..8e006a4 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

redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec

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 354af85..2f6e60e 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

redhat/applications/konversation/konversation.spec

diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec
index 27aa8ed..1c26290 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/konversation/konversation.spec
@@ -176,6 +176,12 @@
 %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

redhat/applications/kstreamripper/kstreamripper-14.0.0.spec

diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index d539549..988dd77 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 @@
 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 @@
 
 
 %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 @@
 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"

redhat/applications/qalculate-tde/qalculate-tde.spec

diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index bd98db9..bf149cd 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -74,6 +74,9 @@
 %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}

redhat/applications/smartcardauth/smartcardauth-14.0.0.spec

diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index 27ed433..8c9d3fc 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 @@
 %__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

redhat/applications/tde-guidance/tde-guidance-14.0.0.spec

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 02b6c3b..ebf6e00 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 @@
 
 # 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;

redhat/applications/tellico/tellico-14.0.0.spec

diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 8cb0aae..fa1d149 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -272,6 +272,14 @@
 %__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|"
 fi
** Diff limit reached (max: 250 lines) **