diff options
Diffstat (limited to 'redhat/Makefile')
| -rw-r--r-- | redhat/Makefile | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/redhat/Makefile b/redhat/Makefile index 437a9c2c2..49a95c5ec 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -1,6 +1,6 @@ SHELL := /bin/bash PATH := $(PATH):$(shell pwd)/build -TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.4}) +TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.5}) TDE_GIT_DIR := $(shell cd ../..; pwd) TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd) RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))" @@ -24,10 +24,10 @@ buildpkg = \ all: dependencies core libraries applications i18n meta external -dependencies: tde-cmake tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt pytqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt +dependencies: tde-cmake tqt tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt pytqt sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt core: 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 pytde -applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine 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 knights knmap knowit knutclient koffice kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer 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 tdealternatives tdebluez tde-ebook-reader tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdeknighttour tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-mallory twin-style-suse2 wlassistant yakuake +applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine 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 knights knmap knowit knutclient koffice kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer 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 tdealternatives tdebluez tde-ebook-reader tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdeknighttour tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdexsldbg tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-mallory twin-style-suse2 universal-indent-gui-tqt wlassistant xdg-desktop-portal-tde yakuake i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n ### Trinity Dependencies @@ -76,10 +76,10 @@ tqca: tqtinterface tqscintilla: tqca tdelibs $(call buildpkg,dependencies/tqscintilla) -tqt3: - $(call buildpkg,dependencies/tqt3) +tqt: + $(call buildpkg,dependencies/tqt) -tqtinterface: tqt3 +tqtinterface: tqt $(call buildpkg,dependencies/tqtinterface) # Core packages @@ -110,7 +110,7 @@ tdegames: tdebase tdemultimedia tdegraphics: tdebase lcms $(call buildpkg,core/tdegraphics) -tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl tde-cmake +tdelibs: brp-check-trinity tqt tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl tde-cmake $(call buildpkg,core/tdelibs) tdemultimedia: tdebase akode @@ -144,7 +144,7 @@ ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw endif htdig: -ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .fc41 .fc42 .fc43 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv6000 . .osstw )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .el10 .fc38 .fc39 .fc40 .fc41 .fc42 .fc43 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv6000 .oss160 .osstw )) $(call buildpkg,extras/htdig) endif @@ -154,7 +154,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw )) endif lcms: -ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw )) +ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .oss160 .osstw )) $(call buildpkg,3rdparty/lcms) endif @@ -176,7 +176,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151)) endif wv2: -ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40 .fc41 .fc42 .omv2490 .omv6000 .osstw)) +ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .el10 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37 .fc38 .fc39 .fc40 .fc41 .fc42 .omv2490 .omv6000 .oss160 .osstw)) $(call buildpkg,3rdparty/wv2) endif @@ -253,12 +253,12 @@ fusion-icon: tdebase $(call buildpkg,applications/misc/fusion-icon) gtk3-tqt-engine: tdebase -ifeq (,$(filter $(DIST),.el5 .el6)) +ifeq (,$(filter $(DIST), .el5 .el6)) $(call buildpkg,applications/themes/gtk3-tqt-engine) endif gtk-qt-engine: tdebase -ifeq (,$(filter $(DIST),.el5 .fc42 .fc43 .pclos2025)) +ifeq (,$(filter $(DIST), .el5 .fc42 .fc43 .oss160 .pclos2025)) $(call buildpkg,applications/themes/gtk-qt-engine) endif @@ -416,7 +416,7 @@ kpicosim: tdebase $(call buildpkg,applications/development/kpicosim) kpilot: tdebase tdepim -ifeq (,$(filter $(DIST),.el5 .oss154 .oss155 .oss156 .osstw)) +ifeq (,$(filter $(DIST), .el5 .el10 .oss154 .oss155 .oss156 .oss160 .osstw)) $(call buildpkg,applications/office/kpilot) endif @@ -498,12 +498,12 @@ qalculate-tde: tdebase $(call buildpkg,applications/utilities/qalculate-tde) qt4-tqt-theme-engine: tdebase -ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .omv2490 .omv6000 .oss153 .oss154 .oss155 .oss156 .osstw)) +ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .el10 .omv2490 .omv6000 .oss153 .oss154 .oss155 .oss156 .oss160 .osstw)) $(call buildpkg,applications/themes/qt4-tqt-theme-engine) endif rosegarden: tdebase -ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9)) +ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9 .el10)) $(call buildpkg,applications/multimedia/rosegarden) endif @@ -606,6 +606,11 @@ tdesvn: tdebase tde-systemsettings: tdebase $(call buildpkg,applications/settings/tde-systemsettings) +tdexsldbg: tdebase +ifeq (,$(filter $(DIST), .osstw)) + $(call buildpkg,applications/development/tdexsldbg) +endif + tdmtheme: tdebase $(call buildpkg,applications/tdmtheme) @@ -633,9 +638,15 @@ twin-style-mallory: tdebase twin-style-suse2: tdebase $(call buildpkg,applications/themes/twin-style-suse2) +universal-indent-gui-tqt: tdebase + $(call buildpkg,applications/development/universal-indent-gui-tqt) + wlassistant: tdebase $(call buildpkg,applications/settings/wlassistant) +xdg-desktop-portal-tde: tdebase + $(call buildpkg,applications/system/xdg-desktop-portal-tde) + yakuake: tdebase $(call buildpkg,applications/system/yakuake) @@ -661,12 +672,12 @@ fileshareset: $(call buildpkg,extras/fileshareset) libheimdal: -ifneq (,$(filter $(DIST), .osstw )) +ifneq (,$(filter $(DIST), .oss160 .osstw )) $(call buildpkg,extras/libheimdal) endif pinentry-tqt: tqtinterface -ifeq (,$(filter $(DIST), .el5 .el6 .el7 )) +ifeq (,$(filter $(DIST), .el5 .el6 .el7 .fc43 .osstw )) $(call buildpkg,extras/pinentry-tqt) endif |