RPM: updates (cherry-pick from TDE R14.0.13)

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 26 insertions, 12 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 440ddb369..829dce327 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -23,12 +23,12 @@ buildpkg = \
   echo
 
 
-all:	common dependencies main libraries applications i18n meta
+all:	common dependencies main libraries applications i18n meta external
 common:	cmake
 dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
 main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
 libraries:	kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications:	abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-suse2 wlassistant yakuake
+applications:	abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-machbunt twin-style-suse2 wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
 ### Trinity Common
@@ -67,12 +67,14 @@ ifeq (,$(filter $(DIST), .el5 .el6 ))
 endif
 
 python-tqt: sip4-tqt tdelibs tqscintilla
-ifeq (,$(filter $(DIST), .oss154 ))
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,dependencies/python-tqt)
 endif
 
 sip4-tqt:
+ifeq (,$(filter $(DIST), .el9 ))
 	$(call buildpkg,dependencies/sip4-tqt)
+endif
 
 tqca:	tqtinterface
 	$(call buildpkg,dependencies/tqca)
@@ -153,7 +155,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .oss
 endif
 
 htdig:
-ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 .mga8 ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga6 .mga7 .mga8 ))
 	$(call buildpkg,extras/htdig)
 endif
 
@@ -163,7 +165,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw ))
 endif
 
 lcms:
-ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/lcms)
 endif
 
@@ -171,7 +173,7 @@ libbeagle:
 	$(call buildpkg,3rdparty/libbeagle)
 
 mp4v2:
-ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
@@ -193,7 +195,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151))
 endif
 
 wv2:
-ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 ))
+ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37))
 	$(call buildpkg,3rdparty/wv2)
 endif
 
@@ -224,12 +226,12 @@ mlt:	tqtinterface
 	$(call buildpkg,libraries/mlt)
 
 pytdeextensions:	tqtinterface python-trinity
-ifeq (,$(filter $(DIST), .oss154 ))
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,libraries/pytdeextensions)
 endif
 
 python-trinity:	tqtinterface python-tqt
-ifeq (,$(filter $(DIST), .oss154 ))
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,libraries/python-trinity)
 endif
 
@@ -504,7 +506,9 @@ mathemagics: tdebase
 	$(call buildpkg,applications/mathemagics)
 
 mplayerthumbs:	tdebase
+ifeq (,$(filter $(DIST),.el9))
 	$(call buildpkg,applications/mplayerthumbs)
+endif
 
 piklab:	tdebase
 	$(call buildpkg,applications/piklab)
@@ -521,12 +525,12 @@ qalculate-tde:
 	$(call buildpkg,applications/qalculate-tde)
 
 qt4-tqt-theme-engine:	tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el8 .oss153 .oss154 .osstw))
+ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .oss153 .oss154 .osstw))
 	$(call buildpkg,applications/qt4-tqt-theme-engine)
 endif
 
 rosegarden:	tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8))
+ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9))
 	$(call buildpkg,applications/rosegarden)
 endif
 
@@ -546,10 +550,15 @@ tdedocker:	tdebase
 	$(call buildpkg,applications/tdedocker)
 
 tde-guidance:	tdebase pytdeextensions
-ifeq (,$(filter $(DIST), .oss154 ))
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,applications/tde-guidance)
 endif
 
+tdeio-appinfo:	tdebase
+ifeq (,$(filter $(DIST), .el5 .el6 ))
+	$(call buildpkg,applications/tdeio-appinfo)
+endif
+
 tdeio-apt:	tdebase
 	$(call buildpkg,applications/tdeio-apt)
 
@@ -609,7 +618,9 @@ tdesvn:	tdebase
 	$(call buildpkg,applications/tdesvn)
 
 tde-systemsettings:	tdebase
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,applications/tde-systemsettings)
+endif
 
 tdmtheme:	tdebase
 	$(call buildpkg,applications/tdmtheme)
@@ -626,6 +637,9 @@ twin-style-crystal:	tdebase
 twin-style-dekorator:	tdebase
 	$(call buildpkg,applications/twin-style-dekorator)
 
+twin-style-machbunt:	tdebase
+	$(call buildpkg,applications/twin-style-machbunt)
+
 twin-style-suse2: tdebase
 	$(call buildpkg,applications/twin-style-suse2)