diff options
| -rw-r--r-- | redhat/Makefile | 42 | ||||
| -rw-r--r-- | redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec | 4 | ||||
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3.spec | 2 | ||||
| -rw-r--r-- | redhat/libraries/libksquirrel/libksquirrel.spec | 2 | ||||
| -rw-r--r-- | redhat/main/tdelibs/tdelibs.spec | 7 | ||||
| -rw-r--r-- | redhat/main/tdenetwork/tdenetwork.spec | 6 | ||||
| -rw-r--r-- | redhat/main/tdepim/tdepim.spec | 5 |
7 files changed, 52 insertions, 16 deletions
diff --git a/redhat/Makefile b/redhat/Makefile index a409f5bfe..5b4d90654 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -27,9 +27,9 @@ all: dependencies main libraries applications i18n meta dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls 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 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 kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal 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 klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice 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 potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio 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 wlassistant yakuake i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n -extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kompose koverartist kpacman mathemagics png2qrgb +extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb ### Trinity Dependencies @@ -135,7 +135,7 @@ tdewebdev: tdebase tdesdk ### 3rd party libraries and tools esound: -ifneq (,$(filter $(DIST), .el8 .mga6 .mga7 .oss151 .osstw )) +ifneq (,$(filter $(DIST), .el8 .mga6 .mga7 .oss151 .oss152 .osstw )) $(call buildpkg,3rdparty/esound) endif @@ -150,7 +150,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw )) endif lcms: -ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .oss151 .osstw )) +ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .oss151 .oss152 .osstw )) $(call buildpkg,3rdparty/lcms) endif @@ -158,7 +158,7 @@ libbeagle: $(call buildpkg,3rdparty/libbeagle) mp4v2: -ifneq (,$(filter $(DIST), .oss151 .osstw )) +ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw )) $(call buildpkg,3rdparty/mp4v2) endif @@ -180,7 +180,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151)) endif wv2: -ifneq (,$(filter $(DIST), .el6 .el7 .el8 .fc30 .fc31 )) +ifneq (,$(filter $(DIST), .el6 .el7 .el8 .fc30 .fc31 .fc32 )) $(call buildpkg,3rdparty/wv2) endif @@ -232,6 +232,9 @@ basket: tdebase tdepim bibletime: tdebase $(call buildpkg,applications/bibletime) +codeine: tdebase +# $(call buildpkg,applications/codeine) + compizconfig-backend-kconfig: tdebase $(call buildpkg,applications/compizconfig-backend-kconfig) @@ -336,6 +339,9 @@ keep: tdebase rdiff-backup kerberostray: tdebase $(call buildpkg,applications/kerberostray) +keximdb: tdebase +# $(call buildpkg,applications/keximdb) + kftpgrabber: tdebase $(call buildpkg,applications/kftpgrabber) @@ -399,6 +405,9 @@ koffice: tdebase tdegraphics wv2 konversation: tdebase $(call buildpkg,applications/konversation) +kooldock: tdebase +# $(call buildpkg,applications/kooldock) + kopete-otr: tdebase tdenetwork $(call buildpkg,applications/kopete-otr) @@ -459,6 +468,12 @@ kvkbd: tdebase kvpnc: tdebase $(call buildpkg,applications/kvpnc) +kxmleditor: tdebase +# $(call buildpkg,applications/kxmleditor) + +mathemagics: tdebase +# $(call buildpkg,applications/mathemagics) + mplayerthumbs: tdebase $(call buildpkg,applications/mplayerthumbs) @@ -487,6 +502,9 @@ smb4k: tdebase soundkonverter: tdebase $(call buildpkg,applications/soundkonverter) +tastymenu: +# $(call buildpkg,applications/tastymenu) + tde-guidance: tdebase pytdeextensions $(call buildpkg,applications/tde-guidance) @@ -516,6 +534,15 @@ tdepowersave: tdebase tderadio: tdebase $(call buildpkg,applications/tderadio) +tde-style-baghira: tdebase +# $(call buildpkg,applications/tde-style-baghira) + +tde-style-domino: tdebase +# $(call buildpkg,applications/tde-style-domino) + +tde-style-ia-ora: tdebase +# $(call buildpkg,applications/tde-style-ia-ora) + tde-style-lipstik: tdebase $(call buildpkg,applications/tde-style-lipstik) @@ -606,9 +633,6 @@ koverartist: kpacman: $(call buildpkg,extras/kpacman) -mathemagics: - $(call buildpkg,extras/mathemagics) - pan: gmime ifeq (,$(filter $(DIST),.oss150 .osstw)) $(call buildpkg,3rdparty/pan) diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec index d01e50fac..a24494cd2 100644 --- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec +++ b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec @@ -81,7 +81,11 @@ BuildRequires: brp-check-trinity # QT4 support %if 0%{?suse_version} +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 +BuildRequires: libqt4-devel +%else BuildRequires: qt-devel +%endif %else BuildRequires: qt4-devel %endif diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index b968ad5eb..68cd50ee6 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -267,7 +267,7 @@ BuildRequires: sqlite3-devel %endif # POSTGRESQL support -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 BuildRequires: postgresql10 BuildRequires: postgresql10-devel %else diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec index 2d7ea1b17..e5d76eed5 100644 --- a/redhat/libraries/libksquirrel/libksquirrel.spec +++ b/redhat/libraries/libksquirrel/libksquirrel.spec @@ -135,7 +135,7 @@ BuildRequires: librsvg2-tools BuildRequires: librsvg %endif %if 0%{?suse_version} -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 BuildRequires: rsvg-convert %else BuildRequires: rsvg-view diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index c0b3e2f0a..78ec1c93c 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -243,12 +243,15 @@ BuildRequires: xorg-x11-devel # ICEAUTH %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 Requires: iceauth +BuildRequires: iceauth %endif %if 0%{?rhel} >= 5 || 0%{?fedora} Requires: xorg-x11-server-utils +BuildRequires: xorg-x11-server-utils %endif %if 0%{?rhel} == 4 || 0%{?suse_version} Requires: xorg-x11 +BuildRequires: xorg-x11 %endif # XZ support @@ -438,6 +441,9 @@ BuildRequires: libr-devel >= 0.6.0 # ATTR support BuildRequires: libattr-devel +# INTLTOOL support +BuildRequires: intltool + %description Libraries for the Trinity Desktop Environment: @@ -584,6 +590,7 @@ Requires: libtqt4-devel = %{tde_epoch}:4.2.0 Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 Requires: libart_lgpl-devel Requires: libattr-devel +Requires: intltool %{?xcomposite_devel:Requires: %{xcomposite_devel}} %{?xt_devel:Requires: %{xt_devel}} diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index 45323afe3..a8a8295ed 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -234,7 +234,7 @@ BuildRequires: glib2-devel BuildRequires: speex-devel # jabber/ssl #{?fedora:Requires(hint): qca-tls} -Requires: jasper +#Requires: jasper # ACL support BuildRequires: libacl-devel @@ -764,6 +764,7 @@ designed to be used for sharing files with friends. %package -n trinity-kppp Summary: Modem dialer and ppp frontend for Trinity Group: Applications/Internet +BuildRequires: ppp Requires: ppp %if 0%{?with_consolehelper} @@ -801,9 +802,6 @@ track of the time spent online for you. %{tde_datadir}/apps/kppp/ %{tde_datadir}/icons/hicolor/*/apps/kppp.png %{tde_tdedocdir}/HTML/en/kppp/ -%if 0%{?suse_version} >= 1500 -%dir %{_sysconfdir}/ppp -%endif %dir %{_sysconfdir}/ppp/peers %{_sysconfdir}/ppp/peers/kppp-options diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec index b0ed255bc..efd9c9771 100644 --- a/redhat/main/tdepim/tdepim.spec +++ b/redhat/main/tdepim/tdepim.spec @@ -104,7 +104,7 @@ BuildRequires: gamin-devel # KDEPIM specific features %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%if 0%{?suse_version} < 1550 +%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200 %define with_gnokii 1 BuildRequires: gnokii-devel %endif @@ -116,6 +116,9 @@ BuildRequires: gnokii-devel BuildRequires: flex-static %endif +# BISON support +BuildRequires: bison + # CURL support BuildRequires: curl-devel |