RPM: update build scripts

1 files changed, 22 insertions, 125 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 733b96e57..ae0a100e5 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -56,9 +56,6 @@ libcaldav: tqtinterface
 libcarddav:	tqtinterface
 	$(call buildpkg,dependencies/libcarddav)
 
-libr:
-	$(call buildpkg,dependencies/libr)
-
 python-tqt: sip4-tqt tdelibs tqscintilla
 	$(call buildpkg,dependencies/python-tqt)
 
@@ -105,11 +102,10 @@ tdeedu:	tdebase
 tdegames:	tdebase tdemultimedia
 	$(call buildpkg,main/tdegames)
 
-tdegraphics:	tdebase poppler lcms
+tdegraphics:	tdebase lcms
 	$(call buildpkg,main/tdegraphics)
 
-tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl file
-	[ -x /usr/libexec/utempter/utempter ] && sudo chmod a+r /usr/libexec/utempter/utempter || :
+tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl
 	$(call buildpkg,main/tdelibs)
 
 tdemultimedia:	tdebase akode
@@ -118,7 +114,7 @@ tdemultimedia:	tdebase akode
 tdenetwork:	tdebase rdesktop
 	$(call buildpkg,main/tdenetwork)
 
-tdepim:	tdebase libcaldav libcarddav dirmngr
+tdepim:	tdebase libcaldav libcarddav
 	$(call buildpkg,main/tdepim)
 
 tdesdk:		tdebase tdebindings
@@ -137,90 +133,36 @@ tdewebdev:	tdebase tdesdk
 	$(call buildpkg,main/tdewebdev)
 
 ### 3rd party libraries and tools
-
-cscope:
-# Build on PCLOS only
-ifneq ($(wildcard /etc/pclinuxos-release),)
-	$(call buildpkg,3rdparty/cscope)
-endif
-
-dirmngr:
-# Build on CentOS >= 7
-ifneq ($(wildcard /boot/vmlinuz*.el7*),)
-	$(call buildpkg,3rdparty/dirmngr)
-endif
-
 esound:
-# Build on Mageia, Fedora >= 23, Opensuse >= 15.0
-ifneq (,$(filter $(DIST),.el8 .mga5 .mga6 .mga7 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .oss151 .osstw))
+ifneq (,$(filter $(DIST), .el8 .mga6 .mga7 .oss151 .osstw ))
 	$(call buildpkg,3rdparty/esound)
 endif
 
-gmime:
-# Build on CentOS 6
-ifneq (,$(filter $(DIST),.el6))
-	$(call buildpkg,3rdparty/gmime)
-endif
-
 htdig:
-# build on Mageia, and CentOS >= 7
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*  /boot/loader/entries/*el8*),)
+ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 ))
 	$(call buildpkg,extras/htdig)
 endif
 
 imlib1:
-# Do NOT build on Fedora, nor CentOS, nor PCLOS
-ifeq ($(wildcard /etc/fedora-release),)
-ifeq (,$(filter $(DIST),.el5 .el6 .el7))
+ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw ))
 	$(call buildpkg,3rdparty/imlib1)
 endif
-endif
 
 lcms:
-# Build on EL7, MGA7, OSS >= 150, OSSTW
-ifneq (,$(filter $(DIST),.el7 .el8 .oss150 .oss151 .osstw .mga7))
+ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .oss151 .osstw ))
 	$(call buildpkg,3rdparty/lcms)
 endif
 
 libbeagle:
 	$(call buildpkg,3rdparty/libbeagle)
 
-lilypond: mftrace
-# Build on CentOS 6 only
-ifneq (,$(filter $(DIST),.el6))
-	$(call buildpkg,3rdparty/lilypond)
-endif
-
-mftrace:
-# Build on CentOS 6 only
-ifneq (,$(filter $(DIST),.el6))
-	$(call buildpkg,3rdparty/mftrace)
-endif
-
 mp4v2:
-# Build on OpenSUSE only
-ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw))
+ifneq (,$(filter $(DIST), .oss151 .osstw ))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
-pcsc-perl:
-# Build on CentOS  5
-ifneq (,$(filter $(DIST),.el5))
-	$(call buildpkg,3rdparty/pcsc-perl)
-endif
-
-poppler:
-# Build on CentOS 5 only (vendor-provided Poppler is too old)
-ifneq (,$(filter $(DIST),.el5))
-	$(call buildpkg,3rdparty/poppler)
-endif
-
-python-qt3: tdelibs sip
-	$(call buildpkg,3rdparty/python-qt3)
-
 rdesktop:
-# Build on OpenSUSE >= 15.0 only
-ifneq (,$(filter $(DIST),.oss150))
+ifneq (,$(filter $(DIST), .oss150 ))
 	$(call buildpkg,3rdparty/rdesktop)
 endif
 
@@ -236,34 +178,11 @@ ifneq (,$(filter $(DIST),.oss150 .oss151 .osstw))
 	$(call buildpkg,3rdparty/recode)
 endif
 
-sip:
-# Build on CentOS 5 only (vendor-provided SIP is too old)
-ifneq (,$(filter $(DIST),.el5))
-	$(call buildpkg,3rdparty/sip)
-endif
-
-sword:
-ifneq (,$(filter $(DIST),.el5))
-	$(call buildpkg,3rdparty/sword)
-endif
-
-torsocks:
-ifneq (,$(filter $(DIST), .oss))
-	$(call buildpkg,3rdparty/torsocks)
-endif
-
 wv2:
-# Do NOT build on Mageia or openSUSE or PCLINUXOS
-ifeq (,$(filter $(DIST), .mga5 .mga6 .mga7 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw .pclos))
+ifneq (,$(filter $(DIST), .el6 .el7 .el8 .fc30 .fc31 ))
 	$(call buildpkg,3rdparty/wv2)
 endif
 
-yaz:
-# Build on CentOS 7, CentOS 8
-ifneq (,$(filter $(DIST), .el7 .el8))
-	$(call buildpkg,3rdparty/yaz)
-endif
-
 
 ### Trinity Libraries
 kipi-plugins:	tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
@@ -309,7 +228,7 @@ amarok:	tdebase mp4v2
 basket:	tdebase tdepim
 	$(call buildpkg,applications/basket)
 
-bibletime:	tdebase sword
+bibletime:	tdebase
 	$(call buildpkg,applications/bibletime)
 
 compizconfig-backend-kconfig:	tdebase
@@ -334,16 +253,12 @@ fusion-icon:	tdebase
 	$(call buildpkg,applications/fusion-icon)
 
 gtk3-tqt-engine:	tdebase
-# Do NOT build on CentOS 5, CentOS 6
-ifeq (,$(filter $(DIST),.el5 .el6))
+ifeq (,$(filter $(DIST),.el6))
 	$(call buildpkg,applications/gtk3-tqt-engine)
 endif
 
 gtk-qt-engine:	tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
-ifeq (,$(filter $(DIST),.el5))
 	$(call buildpkg,applications/gtk-qt-engine)
-endif
 
 gwenview:	tdebase
 	$(call buildpkg,applications/gwenview)
@@ -372,7 +287,7 @@ kbarcode:	tdebase
 kbfx:	tdebase
 	$(call buildpkg,applications/kbfx)
 
-kbibtex:	tdebase yaz
+kbibtex:	tdebase
 	$(call buildpkg,applications/kbibtex)
 
 kbiff:	tdebase
@@ -388,19 +303,13 @@ kcmautostart:	tdebase
 	$(call buildpkg,applications/kcmautostart)
 
 kcmldap:	tdebase libtdeldap
-ifeq (,$(filter $(DIST),.el5))
 	$(call buildpkg,applications/kcmldap)
-endif
 
 kcmldapcontroller:	tdebase kcmldap
-ifeq (,$(filter $(DIST),.el5 .el6))
 	$(call buildpkg,applications/kcmldapcontroller)
-endif
 
 kcmldapmanager:	tdebase kcmldap
-ifeq (,$(filter $(DIST),.el5))
 	$(call buildpkg,applications/kcmldapmanager)
-endif
 
 kcpuload:	tdebase
 	$(call buildpkg,applications/kcpuload)
@@ -424,9 +333,7 @@ keep:	tdebase rdiff-backup
 	$(call buildpkg,applications/keep)
 
 kerberostray:	tdebase
-ifeq (,$(filter $(DIST),.el5))
 	$(call buildpkg,applications/kerberostray)
-endif
 
 kerry:	tdebase libbeagle
 	$(call buildpkg,applications/kerry)
@@ -435,13 +342,7 @@ kftpgrabber:	tdebase
 	$(call buildpkg,applications/kftpgrabber)
 
 kgtk-qt3:	tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
-# Do NOT build on CentOS >=7 (GTK2 is too new)
-# Do NOT build on Fedora >= 20 (GTK2 is too new)
-# Do NOT build on Mageia >= 4 (GTK2 is too new)
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc20* /boot/vmlinuz*.mga4*),)
 	$(call buildpkg,applications/kgtk-qt3)
-endif
 
 kile:	tdebase
 	$(call buildpkg,applications/kile)
@@ -521,7 +422,7 @@ krename:	tdebase
 krusader:	tdebase tdebindings
 	$(call buildpkg,applications/krusader)
 
-kscope:	tdebase cscope
+kscope:	tdebase
 	$(call buildpkg,applications/kscope)
 
 ksensors:	tdebase
@@ -574,12 +475,12 @@ ifeq (,$(filter $(DIST),.el5 .el6 .el8 .osstw))
 	$(call buildpkg,applications/qt4-tqt-theme-engine)
 endif
 
-rosegarden:	tdebase lilypond
-ifeq (,$(filter $(DIST),.el5 .el7 .el8))
+rosegarden:	tdebase
+ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8))
 	$(call buildpkg,applications/rosegarden)
 endif
 
-smartcardauth:	tdebase pcsc-perl
+smartcardauth:	tdebase
 ifeq (,$(filter $(DIST),.el8))
 	$(call buildpkg,applications/smartcardauth)
 endif
@@ -602,23 +503,19 @@ tdeio-ftps:	tdebase
 tdeio-locate:	tdebase
 	$(call buildpkg,applications/tdeio-locate)
 
-tdeio-sword:	tdebase sword
+tdeio-sword:	tdebase
 	$(call buildpkg,applications/tdeio-sword)
 
 tdeio-umountwrapper:	tdebase
 	$(call buildpkg,applications/tdeio-umountwrapper)
 
 tdenetworkmanager:	tdebase
-# Do NOT build on CentOS 5, CentOS 6
-ifeq (,$(filter $(DIST),.el5 .el6))
+ifeq (,$(filter $(DIST),.el6))
 	$(call buildpkg,applications/tdenetworkmanager)
 endif
 
 tdepowersave:	tdebase
-# Do NOT build on CentOS 5
-ifeq (,$(filter $(DIST),.el5))
 	$(call buildpkg,applications/tdepowersave)
-endif
 
 tderadio:	tdebase
 	$(call buildpkg,applications/tderadio)
@@ -644,7 +541,7 @@ tdmtheme:	tdebase
 tellico:	tdebase tdemultimedia
 	$(call buildpkg,applications/tellico)
 
-tork:	tdebase torsocks
+tork:	tdebase
 	$(call buildpkg,applications/tork)
 
 twin-style-crystal:	tdebase
@@ -716,8 +613,8 @@ kpacman:
 mathemagics:
 	$(call buildpkg,extras/mathemagics)
 
-pan: gmime intltool
-ifeq (,$(filter $(DIST),.el5 .oss150 .osstw))
+pan: gmime
+ifeq (,$(filter $(DIST),.oss150 .osstw))
 	$(call buildpkg,3rdparty/pan)
 endif