summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'redhat')
-rw-r--r--redhat/Makefile708
-rw-r--r--redhat/applications/adept/adept.spec208
-rw-r--r--redhat/applications/development/kdbg/kdbg.spec (renamed from redhat/applications/kdbg/kdbg.spec)7
-rw-r--r--redhat/applications/development/kdiff3/kdiff3.spec (renamed from redhat/applications/kdiff3/kdiff3.spec)15
-rw-r--r--redhat/applications/development/kpicosim/kpicosim.spec (renamed from redhat/applications/kpicosim/kpicosim.spec)15
-rw-r--r--redhat/applications/development/kscope/kscope.spec (renamed from redhat/applications/kscope/kscope.spec)7
-rw-r--r--redhat/applications/development/ktechlab/ktechlab.spec (renamed from redhat/applications/ktechlab/ktechlab.spec)7
-rw-r--r--redhat/applications/development/kxmleditor/kxmleditor.spec (renamed from redhat/applications/kxmleditor/kxmleditor.spec)30
-rw-r--r--redhat/applications/development/piklab/piklab.spec (renamed from redhat/applications/piklab/piklab.spec)13
-rw-r--r--redhat/applications/development/tdesvn/tdesvn.spec (renamed from redhat/applications/tdesvn/tdesvn.spec)29
-rw-r--r--redhat/applications/filelight-l10n/filelight-l10n.spec112
-rw-r--r--redhat/applications/games/knights/knights.spec (renamed from redhat/applications/knights/knights.spec)15
-rw-r--r--redhat/applications/games/tdepacman/tdepacman.spec (renamed from redhat/applications/tdepacman/tdepacman.spec)7
-rw-r--r--redhat/applications/graphics/digikam/digikam-open_in_digikam.desktop (renamed from redhat/applications/digikam/digikam-open_in_digikam.desktop)0
-rw-r--r--redhat/applications/graphics/digikam/digikam.spec (renamed from redhat/applications/digikam/digikam.spec)14
-rw-r--r--redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec (renamed from redhat/applications/gwenview-i18n/gwenview-i18n.spec)8
-rw-r--r--redhat/applications/graphics/gwenview/gwenview.spec (renamed from redhat/applications/gwenview/gwenview.spec)58
-rw-r--r--redhat/applications/graphics/ksquirrel/ksquirrel.spec (renamed from redhat/applications/ksquirrel/ksquirrel.spec)22
-rw-r--r--redhat/applications/graphics/potracegui/potracegui.spec (renamed from redhat/applications/potracegui/potracegui.spec)15
l---------redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh1
l---------redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde41
l---------redhat/applications/gtk-qt-engine/gtkrc-2.0-kde41
-rw-r--r--redhat/applications/internet/kasablanca/kasablanca.spec (renamed from redhat/applications/kasablanca/kasablanca.spec)15
-rw-r--r--redhat/applications/internet/kbiff/kbiff.spec (renamed from redhat/applications/kbiff/kbiff.spec)16
-rw-r--r--redhat/applications/internet/kftpgrabber/kftpgrabber.spec (renamed from redhat/applications/kftpgrabber/kftpgrabber.spec)11
-rw-r--r--redhat/applications/internet/knmap/knmap.spec (renamed from redhat/applications/knmap/knmap.spec)15
-rw-r--r--redhat/applications/internet/konversation/konversation.spec (renamed from redhat/applications/konversation/konversation.spec)32
-rw-r--r--redhat/applications/internet/kopete-otr/kopete-otr.spec (renamed from redhat/applications/kopete-otr/kopete-otr.spec)12
-rw-r--r--redhat/applications/internet/kshowmail/kshowmail.spec (renamed from redhat/applications/kshowmail/kshowmail.spec)15
-rw-r--r--redhat/applications/internet/kstreamripper/kstreamripper.spec (renamed from redhat/applications/kstreamripper/kstreamripper.spec)7
-rw-r--r--redhat/applications/internet/ktorrent/ktorrent.spec (renamed from redhat/applications/ktorrent/ktorrent.spec)5
-rw-r--r--redhat/applications/internet/kvirc/kvirc.spec (renamed from redhat/applications/kvirc/kvirc.spec)14
-rw-r--r--redhat/applications/internet/kvpnc/kvpnc.spec (renamed from redhat/applications/kvpnc/kvpnc.spec)25
-rw-r--r--redhat/applications/internet/smb4k/smb4k.spec (renamed from redhat/applications/smb4k/smb4k.spec)63
-rw-r--r--redhat/applications/internet/tork/tork.spec (renamed from redhat/applications/tork/tork.spec)15
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager8.spec193
-rw-r--r--redhat/applications/misc/bibletime/bibletime.spec (renamed from redhat/applications/bibletime/bibletime.spec)79
-rw-r--r--redhat/applications/misc/fusion-icon/fusion-icon.spec (renamed from redhat/applications/fusion-icon/fusion-icon.spec)2
-rw-r--r--redhat/applications/misc/kcmldap/kcmldap.spec (renamed from redhat/applications/kcmldap/kcmldap.spec)26
-rw-r--r--redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec (renamed from redhat/applications/kcmldapcontroller/kcmldapcontroller.spec)28
-rw-r--r--redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec (renamed from redhat/applications/kcmldapmanager/kcmldapmanager.spec)25
-rw-r--r--redhat/applications/misc/kerberostray/kerberostray.spec (renamed from redhat/applications/kerberostray/kerberostray.spec)25
-rw-r--r--redhat/applications/misc/krecipes/krecipes.spec (renamed from redhat/applications/krecipes/krecipes.spec)24
-rw-r--r--redhat/applications/multimedia/amarok/amarok.spec (renamed from redhat/applications/amarok/amarok.spec)102
-rw-r--r--redhat/applications/multimedia/codeine/codeine.spec (renamed from redhat/applications/codeine/codeine.spec)11
-rw-r--r--redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec (renamed from redhat/applications/k3b-i18n/k3b-i18n.spec)7
-rw-r--r--redhat/applications/multimedia/k3b/k3b.spec (renamed from redhat/applications/k3b/k3b.spec)73
-rw-r--r--redhat/applications/multimedia/k3b/k3brc (renamed from redhat/applications/k3b/k3brc)0
-rw-r--r--redhat/applications/multimedia/k3b/trinity-k3b-rpmlintrc (renamed from redhat/applications/k3b/trinity-k3b-rpmlintrc)0
-rw-r--r--redhat/applications/multimedia/k9copy/k9copy.spec (renamed from redhat/applications/k9copy/k9copy.spec)59
-rw-r--r--redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec (renamed from redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec)17
-rw-r--r--redhat/applications/multimedia/kaffeine/kaffeine.spec (renamed from redhat/applications/kaffeine/kaffeine.spec)27
-rw-r--r--redhat/applications/multimedia/kaffeine/trinity-kaffeine-rpmlintrc (renamed from redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc)0
-rw-r--r--redhat/applications/multimedia/kmplayer/kmplayer.spec (renamed from redhat/applications/kmplayer/kmplayer.spec)37
-rw-r--r--redhat/applications/multimedia/kplayer/kplayer.spec (renamed from redhat/applications/kplayer/kplayer.spec)15
-rw-r--r--redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec (renamed from redhat/applications/mplayerthumbs/mplayerthumbs.spec)12
-rw-r--r--redhat/applications/multimedia/rosegarden/rosegarden.spec (renamed from redhat/applications/rosegarden/rosegarden.spec)48
-rw-r--r--redhat/applications/multimedia/soundkonverter/soundkonverter.spec (renamed from redhat/applications/soundkonverter/soundkonverter.spec)10
-rw-r--r--redhat/applications/multimedia/tderadio/tderadio.spec (renamed from redhat/applications/tderadio/tderadio.spec)85
-rw-r--r--redhat/applications/office/basket/basket.spec (renamed from redhat/applications/basket/basket.spec)7
-rw-r--r--redhat/applications/office/kbibtex/kbibtex.spec (renamed from redhat/applications/kbibtex/kbibtex.spec)21
-rw-r--r--redhat/applications/office/kbookreader/kbookreader.spec (renamed from redhat/applications/kbookreader/kbookreader.spec)15
-rw-r--r--redhat/applications/office/keximdb/keximdb.spec (renamed from redhat/applications/keximdb/keximdb.spec)15
-rw-r--r--redhat/applications/office/kile/kile.spec (renamed from redhat/applications/kile/kile.spec)57
-rw-r--r--redhat/applications/office/kmymoney/kmymoney.spec (renamed from redhat/applications/kmymoney/kmymoney.spec)11
-rw-r--r--redhat/applications/office/kmymoney/kmymoneytitlelabel.png (renamed from redhat/applications/kmymoney/kmymoneytitlelabel.png)bin557 -> 557 bytes
-rw-r--r--redhat/applications/office/kmymoney/trinity-kmymoney-rpmlintrc (renamed from redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc)0
-rw-r--r--redhat/applications/office/knowit/knowit.spec (renamed from redhat/applications/knowit/knowit.spec)15
-rw-r--r--redhat/applications/office/koffice-i18n/koffice-i18n.spec (renamed from redhat/applications/koffice-i18n/koffice-i18n.spec)81
-rw-r--r--redhat/applications/office/koffice/koffice.spec (renamed from redhat/applications/koffice/koffice.spec)143
-rw-r--r--redhat/applications/office/koffice/koshell.png (renamed from redhat/applications/koffice/koshell.png)bin2531 -> 2531 bytes
-rw-r--r--redhat/applications/office/koffice/trinity-koffice-rpmlintrc (renamed from redhat/applications/koffice/trinity-koffice-rpmlintrc)0
-rw-r--r--redhat/applications/office/kpilot/kpilot.spec (renamed from redhat/applications/kpilot/kpilot.spec)22
-rw-r--r--redhat/applications/office/kpilot/trinity-kpilot-rpmlintrc (renamed from redhat/applications/kpilot/trinity-kpilot-rpmlintrc)0
-rw-r--r--redhat/applications/office/tellico/tellico.spec (renamed from redhat/applications/tellico/tellico.spec)58
-rw-r--r--redhat/applications/settings/kima/kima.spec (renamed from redhat/applications/kima/kima.spec)15
-rw-r--r--redhat/applications/settings/kiosktool/kiosktool.spec (renamed from redhat/applications/kiosktool/kiosktool.spec)15
-rw-r--r--redhat/applications/settings/kkbswitch/kkbswitch.spec (renamed from redhat/applications/kkbswitch/kkbswitch.spec)19
-rw-r--r--redhat/applications/settings/klcddimmer/klcddimmer.spec (renamed from redhat/applications/klcddimmer/klcddimmer.spec)11
-rw-r--r--redhat/applications/settings/kmyfirewall/kmyfirewall.spec (renamed from redhat/applications/kmyfirewall/kmyfirewall.spec)5
-rw-r--r--redhat/applications/settings/kmyfirewall/trinity-kmyfirewall-rpmlintrc (renamed from redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc)0
-rw-r--r--redhat/applications/settings/tde-guidance/tde-guidance.spec385
-rw-r--r--redhat/applications/settings/tde-guidance/trinity-tde-guidance-rpmlintrc (renamed from redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc)0
-rw-r--r--redhat/applications/settings/tde-systemsettings/tde-settings-laptops.directory (renamed from redhat/applications/tde-systemsettings/tde-settings-laptops.directory)0
-rw-r--r--redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec (renamed from redhat/applications/tde-systemsettings/tde-systemsettings.spec)7
-rw-r--r--redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec (renamed from redhat/applications/tdenetworkmanager/tdenetworkmanager.spec)31
-rw-r--r--redhat/applications/settings/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc (renamed from redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc)0
-rw-r--r--redhat/applications/settings/tdesudo/tdesudo.spec (renamed from redhat/applications/tdesudo/tdesudo.spec)15
-rw-r--r--redhat/applications/settings/wlassistant/wlassistant.spec (renamed from redhat/applications/wlassistant/wlassistant.spec)30
-rw-r--r--redhat/applications/system/dolphin/dolphin.spec (renamed from redhat/applications/dolphin/dolphin.spec)15
-rw-r--r--redhat/applications/system/katapult/katapult.spec (renamed from redhat/applications/katapult/katapult.spec)15
-rw-r--r--redhat/applications/system/kbfx/kbfx.spec (renamed from redhat/applications/kbfx/kbfx.spec)18
-rw-r--r--redhat/applications/system/kcmautostart/kcmautostart.spec (renamed from redhat/applications/kcmautostart/kcmautostart.spec)15
-rw-r--r--redhat/applications/system/kdbusnotification/kdbusnotification.spec (renamed from redhat/applications/kdbusnotification/kdbusnotification.spec)19
-rw-r--r--redhat/applications/system/klamav/klamav.spec (renamed from redhat/applications/klamav/klamav.spec)20
-rw-r--r--redhat/applications/system/knemo/knemo.spec (renamed from redhat/applications/knemo/knemo.spec)33
-rw-r--r--redhat/applications/system/knetload/knetload.spec (renamed from redhat/applications/knetload/knetload.spec)15
-rw-r--r--redhat/applications/system/knetstats/knetstats.spec (renamed from redhat/applications/knetstats/knetstats.spec)15
-rw-r--r--redhat/applications/system/kooldock/kooldock.spec (renamed from redhat/applications/kooldock/kooldock.spec)17
-rw-r--r--redhat/applications/system/krusader/krusader.spec (renamed from redhat/applications/krusader/krusader.spec)5
-rw-r--r--redhat/applications/system/kshutdown/kshutdown.spec (renamed from redhat/applications/kshutdown/kshutdown.spec)15
-rw-r--r--redhat/applications/system/ksystemlog/ksystemlog.spec (renamed from redhat/applications/ksystemlog/ksystemlog.spec)7
-rw-r--r--redhat/applications/system/kvkbd/kvkbd.spec (renamed from redhat/applications/kvkbd/kvkbd.spec)15
-rw-r--r--redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec (renamed from redhat/applications/polkit-agent-tde/polkit-agent-tde.spec)7
-rw-r--r--redhat/applications/system/smartcardauth/smartcardauth.spec (renamed from redhat/applications/smartcardauth/smartcardauth.spec)7
-rw-r--r--redhat/applications/system/smartcardauth/trinity-smartcardauth-rpmlintrc (renamed from redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc)0
-rw-r--r--redhat/applications/system/tastymenu/tastymenu.spec (renamed from redhat/applications/tastymenu/tastymenu.spec)15
-rw-r--r--redhat/applications/system/tdebluez/tdebluez.spec258
-rw-r--r--redhat/applications/system/tdedocker/tdedocker.spec (renamed from redhat/applications/tdedocker/tdedocker.spec)22
-rw-r--r--redhat/applications/system/tdepowersave/tdepowersave.spec (renamed from redhat/applications/tdepowersave/tdepowersave.spec)24
-rw-r--r--redhat/applications/system/tdesshaskpass/tdesshaskpass.spec19
-rw-r--r--redhat/applications/system/yakuake/yakuake.spec (renamed from redhat/applications/yakuake/yakuake.spec)15
-rw-r--r--redhat/applications/tde-guidance/tde-guidance.spec462
-rw-r--r--redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec169
-rw-r--r--redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec (renamed from redhat/applications/tdeio-apt/tdeio-apt.spec)11
-rw-r--r--redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec (renamed from redhat/applications/tdeio-ftps/tdeio-ftps.spec)15
-rw-r--r--redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec (renamed from redhat/applications/tdeio-gopher/tdeio-gopher.spec)11
-rw-r--r--redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec (renamed from redhat/applications/tdeio-locate/tdeio-locate.spec)24
-rw-r--r--redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec (renamed from redhat/applications/tdeio-sword/tdeio-sword.spec)15
-rw-r--r--redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop (renamed from redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop)0
-rw-r--r--redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop_tdeio (renamed from redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop_tdeio)0
-rw-r--r--redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec (renamed from redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec)15
-rw-r--r--redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec (renamed from redhat/applications/gtk-qt-engine/gtk-qt-engine.spec)33
-rw-r--r--redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec (renamed from redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec)112
-rw-r--r--redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec (renamed from redhat/applications/kgtk-qt3/kgtk-qt3.spec)21
-rw-r--r--redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec (renamed from redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec)13
-rw-r--r--redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec (renamed from redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec)2
-rw-r--r--redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec (renamed from redhat/applications/tde-style-baghira/tde-style-baghira.spec)17
-rw-r--r--redhat/applications/themes/tde-style-domino/tde-style-domino.spec (renamed from redhat/applications/tde-style-domino/tde-style-domino.spec)17
-rw-r--r--redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec (renamed from redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec)19
-rw-r--r--redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec (renamed from redhat/applications/tde-style-lipstik/tde-style-lipstik.spec)11
-rw-r--r--redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec149
-rw-r--r--redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec (renamed from redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec)17
-rw-r--r--redhat/applications/themes/tdmtheme/tdmtheme.spec (renamed from redhat/applications/tdmtheme/tdmtheme.spec)15
-rw-r--r--redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec (renamed from redhat/applications/twin-style-crystal/twin-style-crystal.spec)11
-rw-r--r--redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec (renamed from redhat/applications/twin-style-dekorator/twin-style-dekorator.spec)7
-rw-r--r--redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec158
-rw-r--r--redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec (renamed from redhat/applications/kuickshow/kuickshow.spec)106
-rw-r--r--redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec (renamed from redhat/applications/twin-style-suse2/twin-style-suse2.spec)7
-rw-r--r--redhat/applications/utilities/abakus/abakus.spec (renamed from redhat/applications/abakus/abakus.spec)18
-rw-r--r--redhat/applications/utilities/filelight/filelight.spec (renamed from redhat/applications/filelight/filelight.spec)24
-rw-r--r--redhat/applications/utilities/kbarcode/kbarcode.spec (renamed from redhat/applications/kbarcode/kbarcode.spec)15
-rw-r--r--redhat/applications/utilities/kchmviewer/kchmviewer.spec (renamed from redhat/applications/kchmviewer/kchmviewer.spec)15
-rw-r--r--redhat/applications/utilities/kcpuload/kcpuload.spec (renamed from redhat/applications/kcpuload/kcpuload.spec)11
-rw-r--r--redhat/applications/utilities/kdirstat/kdirstat.spec (renamed from redhat/applications/kdirstat/kdirstat.spec)15
-rw-r--r--redhat/applications/utilities/keep/keep.spec (renamed from redhat/applications/keep/keep.spec)15
-rw-r--r--redhat/applications/utilities/knutclient/knutclient.spec (renamed from redhat/applications/knutclient/knutclient.spec)18
-rw-r--r--redhat/applications/utilities/kommando/kommando.spec (renamed from redhat/applications/kpowersave/kpowersave.spec)142
-rw-r--r--redhat/applications/utilities/kompose/kompose.spec (renamed from redhat/applications/kompose/kompose.spec)7
-rw-r--r--redhat/applications/utilities/krename/krename.spec (renamed from redhat/applications/krename/krename.spec)15
-rw-r--r--redhat/applications/utilities/ksensors/ksensors.spec (renamed from redhat/applications/ksensors/ksensors.spec)11
-rw-r--r--redhat/applications/utilities/mathemagics/mathemagics.spec (renamed from redhat/applications/mathemagics/mathemagics.spec)7
-rw-r--r--redhat/applications/utilities/qalculate-tde/qalculate-tde.spec (renamed from redhat/applications/qalculate-tde/qalculate-tde.spec)11
-rwxr-xr-xredhat/build/build_rpm_package.sh21
-rwxr-xr-xredhat/build/configure_repository.sh4
-rwxr-xr-xredhat/build/gather_rpm_sources.sh7
-rwxr-xr-xredhat/build/get_installed_package_version.sh2
-rwxr-xr-xredhat/build/get_latest_built_package_filename.sh2
-rwxr-xr-xredhat/build/get_latest_built_package_version.sh2
-rwxr-xr-xredhat/build/get_latest_tarball_filename.sh12
-rwxr-xr-xredhat/build/get_latest_tarball_version.sh4
-rwxr-xr-xredhat/build/get_rpm_package_name.sh7
-rwxr-xr-xredhat/build/get_source_files.sh10
-rwxr-xr-xredhat/build/get_spec_version.sh2
-rwxr-xr-xredhat/build/get_specfile.sh4
-rwxr-xr-xredhat/build/install_requires.sh3
-rwxr-xr-xredhat/build/is_latest_package_built.sh2
-rwxr-xr-xredhat/build/is_latest_package_installed.sh5
-rwxr-xr-xredhat/build/rpmdist.sh21
-rwxr-xr-xredhat/build/update_repository.sh22
-rw-r--r--redhat/core/tde-i18n/tde-i18n.spec (renamed from redhat/main/tde-i18n/tde-i18n.spec)6
-rw-r--r--redhat/core/tdeaccessibility/tdeaccessibility.spec (renamed from redhat/main/tdeaccessibility/tdeaccessibility.spec)21
-rw-r--r--redhat/core/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc (renamed from redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc)0
-rw-r--r--redhat/core/tdeaddons/tdeaddons.spec (renamed from redhat/main/tdeaddons/tdeaddons.spec)56
-rw-r--r--redhat/core/tdeadmin/kpackagerc (renamed from redhat/main/tdeadmin/kpackagerc)0
-rw-r--r--redhat/core/tdeadmin/ksysvrc (renamed from redhat/main/tdeadmin/ksysvrc)0
-rw-r--r--redhat/core/tdeadmin/kuser.pam (renamed from redhat/main/tdeadmin/kuser.pam)0
-rw-r--r--redhat/core/tdeadmin/kuser.pamd (renamed from redhat/main/tdeadmin/kuser.pamd)0
-rw-r--r--redhat/core/tdeadmin/kuserrc (renamed from redhat/main/tdeadmin/kuserrc)0
-rw-r--r--redhat/core/tdeadmin/tdeadmin.spec (renamed from redhat/main/tdeadmin/tdeadmin.spec)17
-rw-r--r--redhat/core/tdeartwork/tdeartwork.spec (renamed from redhat/main/tdeartwork/tdeartwork.spec)52
-rw-r--r--redhat/core/tdebase/mgabutton.svg (renamed from redhat/main/tdebase/mgabutton.svg)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.el5 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.el5)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.el6 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.el6)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.el7 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.el7)0
l---------redhat/core/tdebase/pamd.kcheckpass-trinity.el8 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.el8)0
l---------redhat/core/tdebase/pamd.kcheckpass-trinity.el91
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.fc34 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc34)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.fc35 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc35)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.fc36 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc36)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.fc37 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.mdv2011.0)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.fc38 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.mga8)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.fc39 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012)0
l---------redhat/core/tdebase/pamd.kcheckpass-trinity.fc401
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.mdv2011.0 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.mga8 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.mga9 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.opensuse1220 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.opensuse1220)0
l---------redhat/core/tdebase/pamd.kcheckpass-trinity.pclos (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.pclos)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2012 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2013 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2014 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2015 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.el6)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2016 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.el7)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2017 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.fc34)0
-rw-r--r--redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2018 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.fc35)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.el5 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.el5)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.el6 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.el6)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.el7 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.el7)0
l---------redhat/core/tdebase/pamd.kdm-trinity-np.el8 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.el8)0
l---------redhat/core/tdebase/pamd.kdm-trinity-np.el91
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.fc34 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.fc34)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.fc35 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.fc35)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.fc36 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.fc36)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.fc3716
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.fc3816
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.fc3916
l---------redhat/core/tdebase/pamd.kdm-trinity-np.fc401
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.mdv2011.0 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.mdv2011.0)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.mga8 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.mga8)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.mga911
l---------redhat/core/tdebase/pamd.kdm-trinity-np.pclos (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.pclos)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.pclos2012 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.pclos2013 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.pclos2014 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.pclos2015 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.pclos2016 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.pclos2017 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity-np.pclos2018 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.el5 (renamed from redhat/main/tdebase/pamd.kdm-trinity.el5)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.el6 (renamed from redhat/main/tdebase/pamd.kdm-trinity.el6)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.el7 (renamed from redhat/main/tdebase/pamd.kdm-trinity.el7)0
l---------redhat/core/tdebase/pamd.kdm-trinity.el8 (renamed from redhat/main/tdebase/pamd.kdm-trinity.el8)0
l---------redhat/core/tdebase/pamd.kdm-trinity.el91
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.fc34 (renamed from redhat/main/tdebase/pamd.kdm-trinity.fc34)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.fc35 (renamed from redhat/main/tdebase/pamd.kdm-trinity.fc35)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.fc36 (renamed from redhat/main/tdebase/pamd.kdm-trinity.fc36)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.fc3723
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.fc3823
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.fc3923
l---------redhat/core/tdebase/pamd.kdm-trinity.fc401
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.mdv2011.0 (renamed from redhat/main/tdebase/pamd.kdm-trinity.mdv2011.0)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.mga8 (renamed from redhat/main/tdebase/pamd.kdm-trinity.mga8)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.mga915
l---------redhat/core/tdebase/pamd.kdm-trinity.pclos (renamed from redhat/main/tdebase/pamd.kdm-trinity.pclos)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.pclos2012 (renamed from redhat/main/tdebase/pamd.kdm-trinity.pclos2012)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.pclos2013 (renamed from redhat/main/tdebase/pamd.kdm-trinity.pclos2013)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.pclos2014 (renamed from redhat/main/tdebase/pamd.kdm-trinity.pclos2014)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.pclos2015 (renamed from redhat/main/tdebase/pamd.kdm-trinity.pclos2015)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.pclos2016 (renamed from redhat/main/tdebase/pamd.kdm-trinity.pclos2016)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.pclos2017 (renamed from redhat/main/tdebase/pamd.kdm-trinity.pclos2017)0
-rw-r--r--redhat/core/tdebase/pamd.kdm-trinity.pclos2018 (renamed from redhat/main/tdebase/pamd.kdm-trinity.pclos2018)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.el5 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.el5)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.el6 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.fc36)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.el7 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.mdv2011.0)0
l---------redhat/core/tdebase/pamd.kscreensaver-trinity.el8 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.el8)0
l---------redhat/core/tdebase/pamd.kscreensaver-trinity.el91
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.fc34 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.mga8)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.fc35 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.fc36 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.fc37 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.fc38 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.fc39 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016)0
l---------redhat/core/tdebase/pamd.kscreensaver-trinity.fc401
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.mdv2011.0 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.mga8 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.mga95
l---------redhat/core/tdebase/pamd.kscreensaver-trinity.pclos (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.pclos)0
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.pclos20125
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.pclos20135
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.pclos20145
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.pclos20155
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.pclos20165
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.pclos20175
-rw-r--r--redhat/core/tdebase/pamd.kscreensaver-trinity.pclos20185
-rw-r--r--redhat/core/tdebase/pamd.tde.omv500010
-rw-r--r--redhat/core/tdebase/suse-displaymanagers-tdm (renamed from redhat/main/tdebase/suse-displaymanagers-tdm)0
-rw-r--r--redhat/core/tdebase/tdebase.spec (renamed from redhat/main/tdebase/tdebase.spec)238
-rw-r--r--redhat/core/tdebase/tdm.el6.te (renamed from redhat/main/tdebase/tdm.el6.te)0
-rw-r--r--redhat/core/tdebase/tdm.el7.te (renamed from redhat/main/tdebase/tdm.el7.te)0
-rw-r--r--redhat/core/tdebase/tdm.el8.te (renamed from redhat/main/tdebase/tdm.el8.te)0
l---------redhat/core/tdebase/tdm.el9.te1
-rw-r--r--redhat/core/tdebase/tdm.fc34.te (renamed from redhat/main/tdebase/tdm.fc34.te)0
-rw-r--r--redhat/core/tdebase/tdm.fc35.te (renamed from redhat/main/tdebase/tdm.fc35.te)0
-rw-r--r--redhat/core/tdebase/tdm.fc36.te (renamed from redhat/main/tdebase/tdm.fc36.te)0
-rw-r--r--redhat/core/tdebase/tdm.fc37.te11
-rw-r--r--redhat/core/tdebase/tdm.fc38.te11
-rw-r--r--redhat/core/tdebase/tdm.fc39.te30
l---------redhat/core/tdebase/tdm.fc40.te1
l---------redhat/core/tdebase/tdm.service.el91
-rw-r--r--redhat/core/tdebase/tdm.service.fc34 (renamed from redhat/main/tdebase/tdm.service.fc34)0
-rw-r--r--redhat/core/tdebase/tdm.service.fc35 (renamed from redhat/main/tdebase/tdm.service.fc35)0
-rw-r--r--redhat/core/tdebase/tdm.service.fc36 (renamed from redhat/main/tdebase/tdm.service.fc36)0
-rw-r--r--redhat/core/tdebase/tdm.service.fc3712
-rw-r--r--redhat/core/tdebase/tdm.service.mga8 (renamed from redhat/main/tdebase/tdm.service.mga8)0
-rw-r--r--redhat/core/tdebase/trinity-tdebase-rpmlintrc (renamed from redhat/main/tdebase/trinity-tdebase-rpmlintrc)0
-rwxr-xr-xredhat/core/tdebase/xdm.oss114 (renamed from redhat/main/tdebase/xdm.oss114)0
-rw-r--r--redhat/core/tdebindings/filter-requires.sh (renamed from redhat/main/tdebindings/filter-requires.sh)0
-rw-r--r--redhat/core/tdebindings/tdebindings.spec (renamed from redhat/main/tdebindings/tdebindings.spec)66
-rw-r--r--redhat/core/tdebindings/trinity-tdebindings-rpmlintrc (renamed from redhat/main/tdebindings/trinity-tdebindings-rpmlintrc)0
-rw-r--r--redhat/core/tdeedu/tdeedu.spec (renamed from redhat/main/tdeedu/tdeedu.spec)26
-rw-r--r--redhat/core/tdeedu/trinity-tdeedu-rpmlintrc (renamed from redhat/main/tdeedu/trinity-tdeedu-rpmlintrc)0
-rw-r--r--redhat/core/tdegames/tdegames.spec (renamed from redhat/main/tdegames/tdegames.spec)24
-rw-r--r--redhat/core/tdegames/trinity-tdegames-rpmlintrc (renamed from redhat/main/tdegames/trinity-tdegames-rpmlintrc)0
-rw-r--r--redhat/core/tdegraphics/tdegraphics.spec (renamed from redhat/main/tdegraphics/tdegraphics.spec)78
-rw-r--r--redhat/core/tdegraphics/trinity-tdegraphics-rpmlintrc (renamed from redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc)0
-rw-r--r--redhat/core/tdelibs/tdelibs.spec (renamed from redhat/main/tdelibs/tdelibs.spec)93
-rw-r--r--redhat/core/tdelibs/trinity-tdelibs-rpmlintrc (renamed from redhat/main/tdelibs/trinity-tdelibs-rpmlintrc)1
-rw-r--r--redhat/core/tdemultimedia/tdemultimedia.spec (renamed from redhat/main/tdemultimedia/tdemultimedia.spec)76
-rw-r--r--redhat/core/tdemultimedia/trinity-tdemultimedia-rpmlintrc (renamed from redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc)0
-rw-r--r--redhat/core/tdenetwork/kppp.pamd (renamed from redhat/main/tdenetwork/kppp.pamd)0
-rw-r--r--redhat/core/tdenetwork/ktalk (renamed from redhat/main/tdenetwork/ktalk)0
-rw-r--r--redhat/core/tdenetwork/tdenetwork.spec (renamed from redhat/main/tdenetwork/tdenetwork.spec)70
-rw-r--r--redhat/core/tdenetwork/trinity-tdenetwork-rpmlintrc (renamed from redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc)0
-rw-r--r--redhat/core/tdepim/tdepim.spec (renamed from redhat/main/tdepim/tdepim.spec)50
-rw-r--r--redhat/core/tdepim/trinity-tdepim-rpmlintrc (renamed from redhat/main/tdepim/trinity-tdepim-rpmlintrc)0
-rw-r--r--redhat/core/tdesdk/tdesdk.spec (renamed from redhat/main/tdesdk/tdesdk.spec)99
-rw-r--r--redhat/core/tdesdk/trinity-tdesdk-rpmlintrc (renamed from redhat/main/tdesdk/trinity-tdesdk-rpmlintrc)0
-rw-r--r--redhat/core/tdetoys/tdetoys.spec (renamed from redhat/main/tdetoys/tdetoys.spec)26
-rw-r--r--redhat/core/tdeutils/kcmlaptoprc (renamed from redhat/main/tdeutils/kcmlaptoprc)0
-rw-r--r--redhat/core/tdeutils/klaptop_acpi_helper.console (renamed from redhat/main/tdeutils/klaptop_acpi_helper.console)0
-rw-r--r--redhat/core/tdeutils/klaptop_acpi_helper.pam (renamed from redhat/main/tdeutils/klaptop_acpi_helper.pam)0
-rw-r--r--redhat/core/tdeutils/tdeutils.spec (renamed from redhat/main/tdeutils/tdeutils.spec)67
-rw-r--r--redhat/core/tdeutils/trinity-tdeutils-rpmlintrc (renamed from redhat/main/tdeutils/trinity-tdeutils-rpmlintrc)0
-rw-r--r--redhat/core/tdevelop/tdevelop.spec (renamed from redhat/main/tdevelop/tdevelop.spec)34
-rw-r--r--redhat/core/tdevelop/trinity-tdevelop-rpmlintrc (renamed from redhat/main/tdevelop/trinity-tdevelop-rpmlintrc)0
-rw-r--r--redhat/core/tdewebdev/css.tar.bz2 (renamed from redhat/main/tdewebdev/css.tar.bz2)bin121295 -> 121295 bytes
-rw-r--r--redhat/core/tdewebdev/html.tar.bz2 (renamed from redhat/main/tdewebdev/html.tar.bz2)bin93345 -> 93345 bytes
-rw-r--r--redhat/core/tdewebdev/javascript.tar.bz2 (renamed from redhat/main/tdewebdev/javascript.tar.bz2)bin336563 -> 336563 bytes
-rw-r--r--redhat/core/tdewebdev/php_manual_en_20030401.tar.bz2 (renamed from redhat/main/tdewebdev/php_manual_en_20030401.tar.bz2)bin1346608 -> 1346608 bytes
-rw-r--r--redhat/core/tdewebdev/tdewebdev.spec (renamed from redhat/main/tdewebdev/tdewebdev.spec)18
-rw-r--r--redhat/core/tdewebdev/trinity-tdewebdev-rpmlintrc (renamed from redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc)0
-rw-r--r--redhat/dependencies/akode/akode.spec33
-rw-r--r--redhat/dependencies/arts/arts.spec47
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt.spec21
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec7
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt.spec6
-rw-r--r--redhat/dependencies/libart-lgpl/libart-lgpl.spec9
-rw-r--r--redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc1
-rw-r--r--redhat/dependencies/libcaldav/libcaldav.spec16
-rw-r--r--redhat/dependencies/libcarddav/libcarddav.spec16
-rw-r--r--redhat/dependencies/polkit-tqt/polkit-tqt.spec12
-rw-r--r--redhat/dependencies/pytqt/pytqt.spec (renamed from redhat/dependencies/python-tqt/python-tqt.spec)129
-rw-r--r--redhat/dependencies/sip4-tqt/sip4-tqt.spec36
-rw-r--r--redhat/dependencies/tde-cmake/tde-cmake.spec (renamed from redhat/common/cmake/cmake.spec)9
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls.spec14
-rw-r--r--redhat/dependencies/tqca/tqca.spec11
-rw-r--r--redhat/dependencies/tqscintilla/tqscintilla.spec62
-rw-r--r--[l---------]redhat/dependencies/tqt3/build-examples.sh37
-rw-r--r--redhat/dependencies/tqt3/tqt3.spec363
-rw-r--r--redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc1
-rw-r--r--redhat/dependencies/tqtinterface/tqtinterface.spec33
-rwxr-xr-xredhat/docker/build.sh4
-rw-r--r--redhat/docker/el5/Dockerfile.i6862
-rw-r--r--redhat/docker/el5/Dockerfile.x86_646
-rw-r--r--redhat/docker/el6/Dockerfile.i6862
-rw-r--r--redhat/docker/el6/Dockerfile.x86_642
-rw-r--r--redhat/docker/el6/packages1
-rw-r--r--redhat/docker/el7/Dockerfile.x86_6412
-rw-r--r--redhat/docker/el7/packages8
-rw-r--r--redhat/docker/el7/rpmmacros3
-rw-r--r--redhat/docker/el8/Dockerfile.x86_6422
-rw-r--r--redhat/docker/el8/packages11
-rw-r--r--redhat/docker/el8/rpmmacros2
-rw-r--r--redhat/docker/el9/Dockerfile.x86_64101
-rw-r--r--redhat/docker/el9/packages229
-rw-r--r--redhat/docker/el9/rpmbuild.repo11
-rw-r--r--redhat/docker/el9/rpmmacros8
-rw-r--r--redhat/docker/f25/Dockerfile.x86_642
-rw-r--r--redhat/docker/f26/Dockerfile.i6862
-rw-r--r--redhat/docker/f26/Dockerfile.x86_642
-rw-r--r--redhat/docker/f27/Dockerfile.i6862
-rw-r--r--redhat/docker/f27/Dockerfile.x86_642
-rw-r--r--redhat/docker/f28/Dockerfile.i6862
-rw-r--r--redhat/docker/f28/Dockerfile.x86_642
-rw-r--r--redhat/docker/f29/Dockerfile.i6862
-rw-r--r--redhat/docker/f29/Dockerfile.x86_642
-rw-r--r--redhat/docker/f30/Dockerfile.i6862
-rw-r--r--redhat/docker/f30/Dockerfile.x86_642
-rw-r--r--redhat/docker/f31/Dockerfile.x86_642
-rw-r--r--redhat/docker/f32/Dockerfile.x86_642
-rw-r--r--redhat/docker/f33/Dockerfile.x86_642
-rw-r--r--redhat/docker/f34/Dockerfile.x86_642
-rw-r--r--redhat/docker/f35/Dockerfile.x86_642
-rw-r--r--redhat/docker/f35/rpmmacros1
-rw-r--r--redhat/docker/f36/Dockerfile.x86_644
-rw-r--r--redhat/docker/f36/packages2
-rw-r--r--redhat/docker/f36/rpmmacros2
-rw-r--r--redhat/docker/f37/Dockerfile.x86_6441
-rw-r--r--redhat/docker/f37/packages240
-rw-r--r--redhat/docker/f37/rpmbuild.repo11
-rw-r--r--redhat/docker/f37/rpmmacros9
-rw-r--r--redhat/docker/f38/Dockerfile.x86_6441
-rw-r--r--redhat/docker/f38/packages241
-rw-r--r--redhat/docker/f38/rpmbuild.repo11
-rw-r--r--redhat/docker/f38/rpmmacros10
-rw-r--r--redhat/docker/f39/Dockerfile.x86_6441
-rw-r--r--redhat/docker/f39/packages242
-rw-r--r--redhat/docker/f39/rpmbuild.repo11
-rw-r--r--redhat/docker/f39/rpmmacros11
-rw-r--r--redhat/docker/f40/Dockerfile.x86_6441
-rw-r--r--redhat/docker/f40/packages242
-rw-r--r--redhat/docker/f40/rpmbuild.repo11
-rw-r--r--redhat/docker/f40/rpmmacros10
-rwxr-xr-xredhat/docker/mageia.sh34
-rwxr-xr-xredhat/docker/mageia32.sh5
-rw-r--r--redhat/docker/mga5/Dockerfile.x86_642
-rw-r--r--redhat/docker/mga6/Dockerfile.i6862
-rw-r--r--redhat/docker/mga6/Dockerfile.x86_642
-rw-r--r--redhat/docker/mga7/Dockerfile.i6862
-rw-r--r--redhat/docker/mga7/Dockerfile.x86_642
-rw-r--r--redhat/docker/mga8/Dockerfile.i6862
-rw-r--r--redhat/docker/mga8/Dockerfile.x86_642
-rw-r--r--redhat/docker/mga8/packages.i6865
-rw-r--r--redhat/docker/mga8/packages.x86_645
-rw-r--r--redhat/docker/mga9/Dockerfile.i68645
-rw-r--r--redhat/docker/mga9/Dockerfile.x86_6445
-rw-r--r--redhat/docker/mga9/packages.i686254
-rw-r--r--redhat/docker/mga9/packages.x86_64258
-rw-r--r--redhat/docker/mga9/rpmmacros10
-rw-r--r--redhat/docker/omv5000/Dockerfile.x86_6465
-rw-r--r--redhat/docker/omv5000/packages256
-rw-r--r--redhat/docker/omv5000/rpmmacros11
-rw-r--r--redhat/docker/omvcooker/Dockerfile.x86_6465
-rw-r--r--redhat/docker/omvcooker/packages256
-rw-r--r--redhat/docker/omvcooker/rpmmacros11
-rwxr-xr-xredhat/docker/openmandriva.sh27
-rwxr-xr-xredhat/docker/opensuse32.sh52
-rw-r--r--redhat/docker/oss131/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss132/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss150/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss151/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss152/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss152/packages4
-rw-r--r--redhat/docker/oss153/Dockerfile.x86_6414
-rw-r--r--redhat/docker/oss153/packages31
-rw-r--r--redhat/docker/oss154/Dockerfile.x86_6413
-rw-r--r--redhat/docker/oss154/packages10
-rw-r--r--redhat/docker/oss155/Dockerfile.x86_6438
-rw-r--r--redhat/docker/oss155/packages225
-rw-r--r--redhat/docker/oss155/rpmmacros7
-rw-r--r--redhat/docker/oss156/Dockerfile.x86_6441
-rw-r--r--redhat/docker/oss156/packages231
-rw-r--r--redhat/docker/oss156/rpmmacros7
-rw-r--r--redhat/docker/oss421/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss422/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss423/Dockerfile.x86_642
-rw-r--r--redhat/docker/osstw/Dockerfile.i68629
-rw-r--r--redhat/docker/osstw/Dockerfile.x86_6421
-rw-r--r--redhat/docker/osstw/packages16
-rw-r--r--redhat/docker/osstw/rpmmacros3
-rw-r--r--redhat/docker/pclinuxos.pkg22
-rwxr-xr-xredhat/docker/pclinuxos.sh15
-rw-r--r--redhat/docker/pclinuxos/Dockerfile.x86_6414
-rw-r--r--redhat/docker/pclinuxos/packages.x86_6413
-rw-r--r--redhat/docker/pclinuxos/rpmmacros2
-rwxr-xr-xredhat/docker/pull.sh2
-rwxr-xr-xredhat/docker/push.sh2
-rwxr-xr-xredhat/docker/remove.sh2
-rwxr-xr-xredhat/docker/run.sh8
-rw-r--r--redhat/extras/brp-check-trinity/brp-check-trinity.spec2
-rw-r--r--redhat/extras/fileshareset/fileshareset.spec4
-rw-r--r--redhat/extras/htdig/htdig.spec34
-rw-r--r--redhat/extras/htdig/patches/drop-bogus-assignment16
-rw-r--r--redhat/extras/htdig/patches/gcc-11370
-rw-r--r--redhat/extras/htdig/patches/gcc-612
-rw-r--r--redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff176
-rw-r--r--redhat/extras/htdig/patches/kfreebsd25
-rw-r--r--redhat/extras/htdig/patches/series6
-rw-r--r--redhat/extras/htdig/patches/sourceforge_logo118
-rw-r--r--redhat/extras/pinentry-tqt/pinentry-tqt.spec9
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop.spec28
-rw-r--r--redhat/extras/trinity-filesystem/trinity-filesystem.spec3
-rw-r--r--redhat/libheimdal-7.7.0-bp153.1.19.src.rpmbin0 -> 7727062 bytes
-rw-r--r--redhat/libraries/kipi-plugins/kipi-plugins.spec33
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw.spec14
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2.spec11
-rw-r--r--redhat/libraries/libkipi/libkipi.spec22
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel.spec121
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap.spec34
-rw-r--r--redhat/libraries/libtqt-perl/libtqt-perl.spec4
-rw-r--r--redhat/libraries/pytde/pytde.spec (renamed from redhat/libraries/python-trinity/python-trinity.spec)52
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions.spec34
483 files changed, 9969 insertions, 3193 deletions
diff --git a/redhat/Makefile b/redhat/Makefile
index 440ddb369..ed2805c48 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,10 +1,10 @@
SHELL := /bin/bash
PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.0})
-TDE_GIT_DIR := $(shell cd ../../tde; pwd)
+TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.2})
+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))"
-DIST := $(shell rpm -E %dist)
+DIST := $(shell ./build/rpmdist.sh --dist)
buildpkg = \
@echo "Now processing '$(1)' [from $(TDE_PACKAGING_DIR)]."; \
@@ -23,42 +23,37 @@ buildpkg = \
echo
-all: common dependencies main libraries applications i18n meta
-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
-i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-
-### Trinity Common
-
-cmake:
- $(call buildpkg,common/cmake)
+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
+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 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 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 tdebluez 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-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-suse2 wlassistant yakuake
+i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
### Trinity Dependencies
-akode: tqtinterface trinity-filesystem
+
+akode: tqtinterface trinity-filesystem
$(call buildpkg,dependencies/akode)
-arts: tqtinterface trinity-filesystem esound
+arts: tqtinterface trinity-filesystem
$(call buildpkg,dependencies/arts)
-avahi-tqt: tqtinterface
+avahi-tqt: tqtinterface
$(call buildpkg,dependencies/avahi-tqt)
-dbus-1-tqt: tqtinterface
+dbus-1-tqt: tqtinterface
$(call buildpkg,dependencies/dbus-1-tqt)
dbus-tqt: tqtinterface
$(call buildpkg,dependencies/dbus-tqt)
-libart_lgpl: tqtinterface
+libart_lgpl: tqtinterface
$(call buildpkg,dependencies/libart-lgpl)
libcaldav: tqtinterface
$(call buildpkg,dependencies/libcaldav)
-libcarddav: tqtinterface
+libcarddav: tqtinterface
$(call buildpkg,dependencies/libcarddav)
polkit-tqt: tqtinterface dbus-1-tqt
@@ -66,15 +61,16 @@ ifeq (,$(filter $(DIST), .el5 .el6 ))
$(call buildpkg,dependencies/polkit-tqt)
endif
-python-tqt: sip4-tqt tdelibs tqscintilla
-ifeq (,$(filter $(DIST), .oss154 ))
- $(call buildpkg,dependencies/python-tqt)
-endif
+pytqt: sip4-tqt tdelibs tqscintilla
+ $(call buildpkg,dependencies/pytqt)
sip4-tqt:
$(call buildpkg,dependencies/sip4-tqt)
-tqca: tqtinterface
+tde-cmake:
+ $(call buildpkg,dependencies/tde-cmake)
+
+tqca: tqtinterface
$(call buildpkg,dependencies/tqca)
tqscintilla: tqca tdelibs
@@ -83,77 +79,72 @@ tqscintilla: tqca tdelibs
tqt3:
$(call buildpkg,dependencies/tqt3)
-tqtinterface: tqt3
+tqtinterface: tqt3
$(call buildpkg,dependencies/tqtinterface)
-# Main packages
-tdeaccessibility: tdebase tdemultimedia
- $(call buildpkg,main/tdeaccessibility)
+# Core packages
+tdeaccessibility: tdebase tdemultimedia
+ $(call buildpkg,core/tdeaccessibility)
-tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim
- $(call buildpkg,main/tdeaddons)
+tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim
+ $(call buildpkg,core/tdeaddons)
-tdeadmin: tdebase
- $(call buildpkg,main/tdeadmin)
+tdeadmin: tdebase
+ $(call buildpkg,core/tdeadmin)
-tdeartwork: tdebase
- $(call buildpkg,main/tdeartwork)
+tdeartwork: tdebase
+ $(call buildpkg,core/tdeartwork)
-tdebase: tdelibs htdig fileshareset pinentry-tqt
- $(call buildpkg,main/tdebase)
+tdebase: tdelibs htdig fileshareset pinentry-tqt
+ $(call buildpkg,core/tdebase)
-tdebindings: tdebase tqscintilla
- $(call buildpkg,main/tdebindings)
+tdebindings: tdebase tqscintilla
+ $(call buildpkg,core/tdebindings)
-tdeedu: tdebase
- $(call buildpkg,main/tdeedu)
+tdeedu: tdebase
+ $(call buildpkg,core/tdeedu)
-tdegames: tdebase tdemultimedia
- $(call buildpkg,main/tdegames)
+tdegames: tdebase tdemultimedia
+ $(call buildpkg,core/tdegames)
-tdegraphics: tdebase lcms
- $(call buildpkg,main/tdegraphics)
+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
- $(call buildpkg,main/tdelibs)
+tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl tde-cmake
+ $(call buildpkg,core/tdelibs)
-tdemultimedia: tdebase akode
- $(call buildpkg,main/tdemultimedia)
+tdemultimedia: tdebase akode
+ $(call buildpkg,core/tdemultimedia)
-tdenetwork: tdebase rdesktop
- $(call buildpkg,main/tdenetwork)
+tdenetwork: tdebase rdesktop tqca
+ $(call buildpkg,core/tdenetwork)
-tdepim: tdebase libcaldav libcarddav
- $(call buildpkg,main/tdepim)
+tdepim: tdebase libcaldav libcarddav
+ $(call buildpkg,core/tdepim)
-tdesdk: tdebase tdebindings tdepim
- $(call buildpkg,main/tdesdk)
+tdesdk: tdebase tdebindings tdepim
+ $(call buildpkg,core/tdesdk)
-tdetoys: tdebase
- $(call buildpkg,main/tdetoys)
+tdetoys: tdebase
+ $(call buildpkg,core/tdetoys)
-tdeutils: tdebase
- $(call buildpkg,main/tdeutils)
+tdeutils: tdebase
+ $(call buildpkg,core/tdeutils)
-tdevelop: tdebase tdesdk
- $(call buildpkg,main/tdevelop)
+tdevelop: tdebase tdesdk
+ $(call buildpkg,core/tdevelop)
-tdewebdev: tdebase tdesdk
- $(call buildpkg,main/tdewebdev)
+tdewebdev: tdebase tdesdk
+ $(call buildpkg,core/tdewebdev)
### 3rd party libraries and tools
brp-check-trinity:
-ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw ))
$(call buildpkg,3rdparty/brp-check-trinity)
endif
-esound:
-ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
- $(call buildpkg,3rdparty/esound)
-endif
-
htdig:
-ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 .mga8 ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv5000 ))
$(call buildpkg,extras/htdig)
endif
@@ -163,15 +154,12 @@ 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 .mga9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw ))
$(call buildpkg,3rdparty/lcms)
endif
-libbeagle:
- $(call buildpkg,3rdparty/libbeagle)
-
mp4v2:
-ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw ))
$(call buildpkg,3rdparty/mp4v2)
endif
@@ -193,459 +181,473 @@ 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 .fc38 .fc39 .fc40))
$(call buildpkg,3rdparty/wv2)
endif
### Trinity Libraries
-kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
+kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
$(call buildpkg,libraries/kipi-plugins)
-libkdcraw: tqtinterface lcms
+libkdcraw: tqtinterface lcms
$(call buildpkg,libraries/libkdcraw)
-libkexiv2: tqtinterface tdelibs
+libkexiv2: tqtinterface tdelibs
$(call buildpkg,libraries/libkexiv2)
-libkipi: tqtinterface
+libkipi: tqtinterface
$(call buildpkg,libraries/libkipi)
-libksquirrel: tdelibs
+libksquirrel: tdelibs
$(call buildpkg,libraries/libksquirrel)
-libtdeldap: tqtinterface
+libtdeldap: tqtinterface
$(call buildpkg,libraries/libtdeldap)
-libtqt-perl: tqtinterface
+libtqt-perl: tqtinterface
$(call buildpkg,libraries/libtqt-perl)
-mlt: tqtinterface
+mlt: tqtinterface
$(call buildpkg,libraries/mlt)
-pytdeextensions: tqtinterface python-trinity
-ifeq (,$(filter $(DIST), .oss154 ))
+pytdeextensions: tqtinterface pytde
$(call buildpkg,libraries/pytdeextensions)
-endif
-python-trinity: tqtinterface python-tqt
-ifeq (,$(filter $(DIST), .oss154 ))
- $(call buildpkg,libraries/python-trinity)
-endif
+pytde: tqtinterface pytqt sip4-tqt
+ $(call buildpkg,libraries/pytde)
### Trinity Applications
-abakus: tdebase
- $(call buildpkg,applications/abakus)
+abakus: tdebase
+ $(call buildpkg,applications/utilities/abakus)
-adept: tdebase
- $(call buildpkg,applications/adept)
+adept: tdebase
+ $(call buildpkg,applications/system/adept)
-amarok: tdebase mp4v2
- $(call buildpkg,applications/amarok)
+amarok: tdebase mp4v2
+ $(call buildpkg,applications/multimedia/amarok)
-basket: tdebase tdepim
- $(call buildpkg,applications/basket)
+basket: tdebase tdepim
+ $(call buildpkg,applications/office/basket)
-bibletime: tdebase
- $(call buildpkg,applications/bibletime)
+bibletime: tdebase
+ $(call buildpkg,applications/misc/bibletime)
-codeine: tdebase
- $(call buildpkg,applications/codeine)
+codeine: tdebase
+ $(call buildpkg,applications/multimedia/codeine)
-compizconfig-backend-kconfig: tdebase
- $(call buildpkg,applications/compizconfig-backend-kconfig)
+compizconfig-backend-tdeconfig: tdebase
+ $(call buildpkg,applications/misc/compizconfig-backend-tdeconfig)
-desktop-effects-tde: tdebase
- $(call buildpkg,applications/desktop-effects-tde)
+desktop-effects-tde: tdebase
+ $(call buildpkg,applications/misc/desktop-effects-tde)
-digikam: tdebase libkdcraw libkexiv2 libkipi libksquirrel
- $(call buildpkg,applications/digikam)
+digikam: tdebase libkdcraw libkexiv2 libkipi libksquirrel
+ $(call buildpkg,applications/graphics/digikam)
-dolphin: tdebase
- $(call buildpkg,applications/dolphin)
+dolphin: tdebase
+ $(call buildpkg,applications/system/dolphin)
-filelight: tdebase
- $(call buildpkg,applications/filelight)
+filelight: tdebase
+ $(call buildpkg,applications/utilities/filelight)
-filelight-l10n: tdebase
+filelight-l10n: tdebase
$(call buildpkg,applications/filelight-l10n)
-fusion-icon: tdebase
- $(call buildpkg,applications/fusion-icon)
+fusion-icon: tdebase
+ $(call buildpkg,applications/misc/fusion-icon)
-gtk3-tqt-engine: tdebase
+gtk3-tqt-engine: tdebase
ifeq (,$(filter $(DIST),.el5 .el6))
- $(call buildpkg,applications/gtk3-tqt-engine)
+ $(call buildpkg,applications/themes/gtk3-tqt-engine)
endif
-gtk-qt-engine: tdebase
+gtk-qt-engine: tdebase
ifeq (,$(filter $(DIST),.el5))
- $(call buildpkg,applications/gtk-qt-engine)
+ $(call buildpkg,applications/themes/gtk-qt-engine)
endif
-gwenview: tdebase
- $(call buildpkg,applications/gwenview)
+gwenview: tdebase libkipi
+ $(call buildpkg,applications/graphics/gwenview)
-k3b: tdebase
- $(call buildpkg,applications/k3b)
+k3b: tdebase
+ $(call buildpkg,applications/multimedia/k3b)
-k9copy: tdebase k3b
- $(call buildpkg,applications/k9copy)
+k9copy: tdebase k3b
+ $(call buildpkg,applications/multimedia/k9copy)
-kaffeine: tdebase
- $(call buildpkg,applications/kaffeine)
+kaffeine: tdebase
+ $(call buildpkg,applications/multimedia/kaffeine)
-kaffeine-mozilla: tdebase kaffeine
- $(call buildpkg,applications/kaffeine-mozilla)
+kaffeine-mozilla: tdebase kaffeine
+ $(call buildpkg,applications/multimedia/kaffeine-mozilla)
-kasablanca: tdebase
- $(call buildpkg,applications/kasablanca)
+kasablanca: tdebase
+ $(call buildpkg,applications/internet/kasablanca)
-katapult: tdebase
- $(call buildpkg,applications/katapult)
+katapult: tdebase
+ $(call buildpkg,applications/system/katapult)
-kbarcode: tdebase
- $(call buildpkg,applications/kbarcode)
+kbarcode: tdebase
+ $(call buildpkg,applications/utilities/kbarcode)
-kbfx: tdebase
- $(call buildpkg,applications/kbfx)
+kbfx: tdebase
+ $(call buildpkg,applications/system/kbfx)
-kbibtex: tdebase
- $(call buildpkg,applications/kbibtex)
+kbibtex: tdebase
+ #$(call buildpkg,applications/office/kbibtex)
-kbiff: tdebase
- $(call buildpkg,applications/kbiff)
+kbiff: tdebase
+ $(call buildpkg,applications/internet/kbiff)
-kbookreader: tdebase
- $(call buildpkg,applications/kbookreader)
+kbookreader: tdebase
+ $(call buildpkg,applications/office/kbookreader)
-kchmviewer: tdebase
- $(call buildpkg,applications/kchmviewer)
+kchmviewer: tdebase
+ $(call buildpkg,applications/utilities/kchmviewer)
-kcmautostart: tdebase
- $(call buildpkg,applications/kcmautostart)
+kcmautostart: tdebase
+ $(call buildpkg,applications/system/kcmautostart)
-kcmldap: tdebase libtdeldap
- $(call buildpkg,applications/kcmldap)
+kcmldap: tdebase libtdeldap
+ $(call buildpkg,applications/misc/kcmldap)
-kcmldapcontroller: tdebase kcmldap
- $(call buildpkg,applications/kcmldapcontroller)
+kcmldapcontroller: tdebase kcmldap
+ $(call buildpkg,applications/misc/kcmldapcontroller)
-kcmldapmanager: tdebase kcmldap
- $(call buildpkg,applications/kcmldapmanager)
+kcmldapmanager: tdebase kcmldap
+ $(call buildpkg,applications/misc/kcmldapmanager)
-kcpuload: tdebase
- $(call buildpkg,applications/kcpuload)
+kcpuload: tdebase
+ $(call buildpkg,applications/utilities/kcpuload)
-kdbg: tdebase
- $(call buildpkg,applications/kdbg)
+kdbg: tdebase
+ $(call buildpkg,applications/development/kdbg)
-kdbusnotification: tdebase
- $(call buildpkg,applications/kdbusnotification)
+kdbusnotification: tdebase
+ $(call buildpkg,applications/system/kdbusnotification)
-kdiff3: tdebase
- $(call buildpkg,applications/kdiff3)
+kdiff3: tdebase
+ $(call buildpkg,applications/development/kdiff3)
-kdirstat: tdebase
- $(call buildpkg,applications/kdirstat)
+kdirstat: tdebase
+ $(call buildpkg,applications/utilities/kdirstat)
-kdpkg: tdebase
- $(call buildpkg,applications/kdpkg)
+kdpkg: tdebase
+ $(call buildpkg,applications/settings/kdpkg)
-keep: tdebase rdiff-backup
- $(call buildpkg,applications/keep)
+keep: tdebase rdiff-backup
+ $(call buildpkg,applications/utilities/keep)
-kerberostray: tdebase
- $(call buildpkg,applications/kerberostray)
+kerberostray: tdebase
+ $(call buildpkg,applications/misc/kerberostray)
-keximdb: tdebase koffice
- $(call buildpkg,applications/keximdb)
+keximdb: tdebase koffice
+ $(call buildpkg,applications/office/keximdb)
-kftpgrabber: tdebase
- $(call buildpkg,applications/kftpgrabber)
+kftpgrabber: tdebase
+ $(call buildpkg,applications/internet/kftpgrabber)
-kgtk-qt3: tdebase
- $(call buildpkg,applications/kgtk-qt3)
+kgtk-qt3: tdebase
+ $(call buildpkg,applications/themes/kgtk-qt3)
-kile: tdebase
- $(call buildpkg,applications/kile)
+kile: tdebase
+ $(call buildpkg,applications/office/kile)
-kima: tdebase
- $(call buildpkg,applications/kima)
+kima: tdebase
+ $(call buildpkg,applications/settings/kima)
-kiosktool: tdebase
- $(call buildpkg,applications/kiosktool)
+kiosktool: tdebase
+ $(call buildpkg,applications/settings/kiosktool)
-kkbswitch: tdebase
- $(call buildpkg,applications/kkbswitch)
+kkbswitch: tdebase
+ $(call buildpkg,applications/settings/kkbswitch)
-klamav: tdebase
+klamav: tdebase
# Requires clamav >= 0.101.0
ifeq (,$(filter $(DIST), .el5 .el6 .mga6))
- $(call buildpkg,applications/klamav)
+ $(call buildpkg,applications/system/klamav)
endif
-klcddimmer: tdebase
- $(call buildpkg,applications/klcddimmer)
+klcddimmer: tdebase
+ $(call buildpkg,applications/settings/klcddimmer)
-kmplayer: tdebase
- $(call buildpkg,applications/kmplayer)
+kmplayer: tdebase koffice
+ $(call buildpkg,applications/multimedia/kmplayer)
-kmyfirewall: tdebase
- $(call buildpkg,applications/kmyfirewall)
+kmyfirewall: tdebase
+ $(call buildpkg,applications/settings/kmyfirewall)
-kmymoney: tdebase recode
- $(call buildpkg,applications/kmymoney)
+kmymoney: tdebase recode
+ $(call buildpkg,applications/office/kmymoney)
-knemo: tdebase
- $(call buildpkg,applications/knemo)
+knemo: tdebase
+ $(call buildpkg,applications/system/knemo)
-knetload: tdebase
- $(call buildpkg,applications/knetload)
+knetload: tdebase
+ $(call buildpkg,applications/system/knetload)
-knetstats: tdebase
- $(call buildpkg,applications/knetstats)
+knetstats: tdebase
+ $(call buildpkg,applications/system/knetstats)
-knetworkmanager8: tdebase
-ifneq (,$(filter $(DIST),.el6))
- $(call buildpkg,applications/knetworkmanager8)
-endif
+knights: tdebase
+ $(call buildpkg,applications/games/knights)
-knights: tdebase
- $(call buildpkg,applications/knights)
+knmap: tdebase
+ $(call buildpkg,applications/internet/knmap)
-knmap: tdebase
- $(call buildpkg,applications/knmap)
+knowit: tdebase
+ $(call buildpkg,applications/office/knowit)
-knowit: tdebase
- $(call buildpkg,applications/knowit)
+knutclient: tdebase
+ $(call buildpkg,applications/utilities/knutclient)
-knutclient: tdebase
- $(call buildpkg,applications/knutclient)
+koffice: tdebase tdegraphics wv2
+ $(call buildpkg,applications/office/koffice)
-koffice: tdebase tdegraphics wv2
- $(call buildpkg,applications/koffice)
+kommando: tdebase
+ $(call buildpkg,applications/utilities//kommando)
-kompose: tdebase
- $(call buildpkg,applications/kompose)
+kompose: tdebase
+ $(call buildpkg,applications/utilities/kompose)
-konversation: tdebase
- $(call buildpkg,applications/konversation)
+konversation: tdebase
+ $(call buildpkg,applications/internet/konversation)
-kooldock: tdebase
- $(call buildpkg,applications/kooldock)
+kooldock: tdebase
+ $(call buildpkg,applications/system/kooldock)
-kopete-otr: tdebase tdenetwork
- $(call buildpkg,applications/kopete-otr)
+kopete-otr: tdebase tdenetwork
+ $(call buildpkg,applications/internet/kopete-otr)
-kpicosim: tdebase
- $(call buildpkg,applications/kpicosim)
+kpicosim: tdebase
+ $(call buildpkg,applications/development/kpicosim)
-kpilot: tdebase tdepim
-ifeq (,$(filter $(DIST),.el5 .oss154 .osstw))
- $(call buildpkg,applications/kpilot)
+kpilot: tdebase tdepim
+ifeq (,$(filter $(DIST),.el5 .oss154 .oss155 .oss156 .osstw))
+ $(call buildpkg,applications/office/kpilot)
endif
-kpowersave: tdebase
- $(call buildpkg,applications/kpowersave)
+kplayer: tdebase
+ $(call buildpkg,applications/multimedia/kplayer)
+
+kpowersave: tdebase
+ $(call buildpkg,applications/system/kpowersave)
-krecipes: tdebase
- $(call buildpkg,applications/krecipes)
+krecipes: tdebase
+ $(call buildpkg,applications/misc/krecipes)
-krename: tdebase
- $(call buildpkg,applications/krename)
+krename: tdebase
+ $(call buildpkg,applications/utilities/krename)
-krusader: tdebase tdebindings
- $(call buildpkg,applications/krusader)
+krusader: tdebase tdebindings
+ $(call buildpkg,applications/system/krusader)
-kscope: tdebase
- $(call buildpkg,applications/kscope)
+kscope: tdebase
+ $(call buildpkg,applications/development/kscope)
-ksensors: tdebase
- $(call buildpkg,applications/ksensors)
+ksensors: tdebase
+ $(call buildpkg,applications/utilities/ksensors)
-kshowmail: tdebase tdepim
- $(call buildpkg,applications/kshowmail)
+kshowmail: tdebase tdepim
+ $(call buildpkg,applications/internet/kshowmail)
-kshutdown: tdebase
- $(call buildpkg,applications/kshutdown)
+kshutdown: tdebase
+ $(call buildpkg,applications/system/kshutdown)
-ksplash-engine-moodin: tdebase
- $(call buildpkg,applications/ksplash-engine-moodin)
+ksplash-engine-moodin: tdebase
+ $(call buildpkg,applications/themes/ksplash-engine-moodin)
-ksquirrel: tdebase libkipi libksquirrel
- $(call buildpkg,applications/ksquirrel)
+ksquirrel: tdebase libkipi libksquirrel
+ $(call buildpkg,applications/graphics/ksquirrel)
-kstreamripper: tdebase
- $(call buildpkg,applications/kstreamripper)
+kstreamripper: tdebase
+ $(call buildpkg,applications/internet/kstreamripper)
-ksystemlog: tdebase
- $(call buildpkg,applications/ksystemlog)
+ksystemlog: tdebase
+ $(call buildpkg,applications/system/ksystemlog)
-ktechlab: tdebase
- $(call buildpkg,applications/ktechlab)
+ktechlab: tdebase
+ $(call buildpkg,applications/development/ktechlab)
-ktorrent: tdebase
- $(call buildpkg,applications/ktorrent)
+ktorrent: tdebase
+ $(call buildpkg,applications/internet/ktorrent)
-kvirc: tdebase
- $(call buildpkg,applications/kvirc)
+kvirc: tdebase
+ #$(call buildpkg,applications/internet/kvirc)
-kvkbd: tdebase
- $(call buildpkg,applications/kvkbd)
+kvkbd: tdebase
+ $(call buildpkg,applications/system/kvkbd)
-kvpnc: tdebase
- $(call buildpkg,applications/kvpnc)
+kvpnc: tdebase
+ $(call buildpkg,applications/internet/kvpnc)
-kxmleditor: tdebase
- $(call buildpkg,applications/kxmleditor)
+kxmleditor: tdebase
+ $(call buildpkg,applications/development/kxmleditor)
mathemagics: tdebase
- $(call buildpkg,applications/mathemagics)
+ $(call buildpkg,applications/utilities/mathemagics)
-mplayerthumbs: tdebase
- $(call buildpkg,applications/mplayerthumbs)
+mplayerthumbs: tdebase
+ $(call buildpkg,applications/multimedia/mplayerthumbs)
-piklab: tdebase
- $(call buildpkg,applications/piklab)
+piklab: tdebase
+ $(call buildpkg,applications/development/piklab)
-polkit-agent-tde: tdebase
+polkit-agent-tde: tdebase polkit-tqt
ifeq (,$(filter $(DIST), .el5 .el6 ))
- $(call buildpkg,applications/polkit-agent-tde)
+ $(call buildpkg,applications/system/polkit-agent-tde)
endif
-potracegui: tdebase
- $(call buildpkg,applications/potracegui)
+potracegui: tdebase
+ $(call buildpkg,applications/graphics/potracegui)
qalculate-tde:
- $(call buildpkg,applications/qalculate-tde)
+ $(call buildpkg,applications/utilities/qalculate-tde)
-qt4-tqt-theme-engine: tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el8 .oss153 .oss154 .osstw))
- $(call buildpkg,applications/qt4-tqt-theme-engine)
+qt4-tqt-theme-engine: tdebase
+ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .omv2490 .omv5000 .oss153 .oss154 .oss155 .oss156 .osstw))
+ $(call buildpkg,applications/themes/qt4-tqt-theme-engine)
endif
-rosegarden: tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8))
- $(call buildpkg,applications/rosegarden)
+rosegarden: tdebase
+ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9))
+ $(call buildpkg,applications/multimedia/rosegarden)
endif
-smartcardauth: tdebase
- $(call buildpkg,applications/smartcardauth)
+smartcardauth: tdebase
+ $(call buildpkg,applications/system/smartcardauth)
-smb4k: tdebase
- $(call buildpkg,applications/smb4k)
+smb4k: tdebase
+ $(call buildpkg,applications/internet/smb4k)
-soundkonverter: tdebase
- $(call buildpkg,applications/soundkonverter)
+soundkonverter: tdebase
+ $(call buildpkg,applications/multimedia/soundkonverter)
tastymenu:
- $(call buildpkg,applications/tastymenu)
+ $(call buildpkg,applications/system/tastymenu)
+
+tdebluez:
+ $(call buildpkg,applications/system/tdebluez)
-tdedocker: tdebase
- $(call buildpkg,applications/tdedocker)
+tdedocker: tdebase
+ $(call buildpkg,applications/system/tdedocker)
-tde-guidance: tdebase pytdeextensions
-ifeq (,$(filter $(DIST), .oss154 ))
- $(call buildpkg,applications/tde-guidance)
+tde-guidance: tdebase pytdeextensions
+ $(call buildpkg,applications/settings/tde-guidance)
+
+tdeio-appinfo: tdebase
+ifeq (,$(filter $(DIST), .el5 .el6 ))
+ $(call buildpkg,applications/tdeio/tdeio-appinfo)
endif
-tdeio-apt: tdebase
- $(call buildpkg,applications/tdeio-apt)
+tdeio-apt: tdebase
+ $(call buildpkg,applications/tdeio/tdeio-apt)
-tdeio-ftps: tdebase
- $(call buildpkg,applications/tdeio-ftps)
+tdeio-ftps: tdebase
+ $(call buildpkg,applications/tdeio/tdeio-ftps)
-tdeio-gopher: tdebase
- $(call buildpkg,applications/tdeio-gopher)
+tdeio-gopher: tdebase
+ $(call buildpkg,applications/tdeio/tdeio-gopher)
-tdeio-locate: tdebase
- $(call buildpkg,applications/tdeio-locate)
+tdeio-locate: tdebase
+ $(call buildpkg,applications/tdeio/tdeio-locate)
-tdeio-sword: tdebase
- $(call buildpkg,applications/tdeio-sword)
+tdeio-sword: tdebase
+ $(call buildpkg,applications/tdeio/tdeio-sword)
-tdeio-umountwrapper: tdebase
- $(call buildpkg,applications/tdeio-umountwrapper)
+tdeio-umountwrapper: tdebase
+ $(call buildpkg,applications/tdeio/tdeio-umountwrapper)
-tdenetworkmanager: tdebase
+tdenetworkmanager: tdebase
ifeq (,$(filter $(DIST),.el5 .el6))
- $(call buildpkg,applications/tdenetworkmanager)
+ $(call buildpkg,applications/settings/tdenetworkmanager)
endif
-tdepacman: tdebase
- $(call buildpkg,applications/tdepacman)
+tdepacman: tdebase
+ $(call buildpkg,applications/games/tdepacman)
-tdepowersave: tdebase
+tdepowersave: tdebase
ifeq (,$(filter $(DIST),.el5))
- $(call buildpkg,applications/tdepowersave)
+ $(call buildpkg,applications/system/tdepowersave)
endif
-tderadio: tdebase
- $(call buildpkg,applications/tderadio)
+tderadio: tdebase
+ $(call buildpkg,applications/multimedia/tderadio)
-tdesshaskpass: tdebase
- $(call buildpkg,applications/tdesshaskpass)
+tdesshaskpass: tdebase
+ $(call buildpkg,applications/system/tdesshaskpass)
-tde-style-baghira: tdebase
- $(call buildpkg,applications/tde-style-baghira)
+tde-style-baghira: tdebase
+ $(call buildpkg,applications/themes/tde-style-baghira)
-tde-style-domino: tdebase
- $(call buildpkg,applications/tde-style-domino)
+tde-style-domino: tdebase
+ $(call buildpkg,applications/themes/tde-style-domino)
-tde-style-ia-ora: tdebase
- $(call buildpkg,applications/tde-style-ia-ora)
+tde-style-ia-ora: tdebase
+ $(call buildpkg,applications/themes/tde-style-ia-ora)
-tde-style-lipstik: tdebase
- $(call buildpkg,applications/tde-style-lipstik)
+tde-style-lipstik: tdebase
+ $(call buildpkg,applications/themes/tde-style-lipstik)
-tde-style-qtcurve: tdebase
- $(call buildpkg,applications/tde-style-qtcurve)
+tde-style-polyester: tdebase
+ $(call buildpkg,applications/themes/tde-style-polyester)
-tdesudo: tdebase
- $(call buildpkg,applications/tdesudo)
+tde-style-qtcurve: tdebase
+ $(call buildpkg,applications/themes/tde-style-qtcurve)
-tdesvn: tdebase
- $(call buildpkg,applications/tdesvn)
+tdesudo: tdebase
+ $(call buildpkg,applications/settings/tdesudo)
-tde-systemsettings: tdebase
- $(call buildpkg,applications/tde-systemsettings)
+tdesvn: tdebase
+ $(call buildpkg,applications/development/tdesvn)
-tdmtheme: tdebase
+tde-systemsettings: tdebase
+ $(call buildpkg,applications/settings/tde-systemsettings)
+
+tdmtheme: tdebase
$(call buildpkg,applications/tdmtheme)
-tellico: tdebase tdegraphics tdemultimedia tdepim
- $(call buildpkg,applications/tellico)
+tellico: tdebase tdegraphics tdemultimedia tdepim
+ $(call buildpkg,applications/office/tellico)
+
+tork: tdebase
+ $(call buildpkg,applications/internet/tork)
-tork: tdebase
- $(call buildpkg,applications/tork)
+twin-style-crystal: tdebase
+ $(call buildpkg,applications/themes/twin-style-crystal)
-twin-style-crystal: tdebase
- $(call buildpkg,applications/twin-style-crystal)
+twin-style-dekorator: tdebase
+ $(call buildpkg,applications/themes/twin-style-dekorator)
-twin-style-dekorator: tdebase
- $(call buildpkg,applications/twin-style-dekorator)
+twin-style-fahrenheit: tdebase
+ $(call buildpkg,applications/themes/twin-style-fahrenheit)
+
+twin-style-machbunt: tdebase
+ $(call buildpkg,applications/themes/twin-style-machbunt)
twin-style-suse2: tdebase
- $(call buildpkg,applications/twin-style-suse2)
+ $(call buildpkg,applications/themes/twin-style-suse2)
-wlassistant: tdebase
- $(call buildpkg,applications/wlassistant)
+wlassistant: tdebase
+ifeq (,$(filter $(DIST), .omv2490 .omv5000 ))
+ $(call buildpkg,applications/settings/wlassistant)
+endif
-yakuake: tdebase
- $(call buildpkg,applications/yakuake)
+yakuake: tdebase
+ $(call buildpkg,applications/system/yakuake)
### Trinity Translations
-gwenview-i18n: tdebase
- $(call buildpkg,applications/gwenview-i18n)
+gwenview-i18n: tdebase
+ $(call buildpkg,applications/graphics/gwenview-i18n)
-k3b-i18n: tdebase
- $(call buildpkg,applications/k3b-i18n)
+k3b-i18n: tdebase
+ $(call buildpkg,applications/multimedia/k3b-i18n)
-koffice-i18n: tdebase
- $(call buildpkg,applications/koffice-i18n)
+koffice-i18n: tdebase
+ $(call buildpkg,applications/office/koffice-i18n)
-tde-i18n: tdebase
+tde-i18n: tdebase
$(call buildpkg,tde-i18n)
### Meta packages
@@ -656,8 +658,8 @@ meta:
fileshareset:
$(call buildpkg,extras/fileshareset)
-pinentry-tqt: tqtinterface
-ifeq (,$(filter $(DIST), .el5 .el6 .el7 ))
+pinentry-tqt: tqtinterface
+ifeq (,$(filter $(DIST), .el5 .el6 .el7 .omv2490 .omv5000 ))
$(call buildpkg,extras/pinentry-tqt)
endif
diff --git a/redhat/applications/adept/adept.spec b/redhat/applications/adept/adept.spec
deleted file mode 100644
index ba1c416f4..000000000
--- a/redhat/applications/adept/adept.spec
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# spec file for package adept (version R14)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# Default version for this component
-%define tde_pkg adept
-%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
-%endif
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{tde_pkg}
-Summary: Package management suite for Trinity
-Version: 2.1.3
-Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://lpnotfr.free.fr/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-util
-
-BuildRequires: libapt-front-devel
-
-Requires: %{name}-manager = %{version}-%{release}
-Requires: %{name}-installer = %{version}-%{release}
-Requires: %{name}-updater = %{version}-%{release}
-Requires: %{name}-notifier = %{version}-%{release}
-Requires: %{name}-batch = %{version}-%{release}
-
-
-%description
-These packages belong to the adept suite:
- * adept-manager - package manager
- * adept-installer - application manager
- * adept-updater - system upgrade wizard
- * adept-notifier - systray notification of available updates
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG ChangeLog COPYING
-
-##########
-
-%package common
-Requires: trinity-konsole
-Summary: Package manager for Trinity -- common files
-
-%description common
-Icons and other common files for all adept components.
-
-##########
-
-%package manager
-Requires: %{name}-common = %{version}-%{release}
-Summary: package manager for Trinity
-
-%description manager
-Adept Manager is a graphical user interface for package management.
-
-Besides these basic functions the following features are provided:
- * Search and filter the list of available packages (also using debtags)
- * Perform smart system upgrades
- * Edit the list of used repositories (sources.list)
- * Configure packages through the debconf system
-
-Please also install libtqt-perl if you want the TDE Debconf frontend
-to function.
-
-##########
-
-%package installer
-Requires: %{name}-common = %{version}-%{release}
-Summary: simple user interface for application management (for Trinity)
-
-%description installer
-Adept Installer presents a list of applications available through the
-Advanced Package Tool (APT). An application is considered a package
-that contains a .desktop file for use with TDE, GNOME or other
-desktop environment.
-
-##########
-
-%package updater
-Requires: %{name}-common = %{version}-%{release}
-Summary: system update tool for Trinity
-
-%description updater
-Adept Updater provides a simple wizard-style user interface to system
-upgrades. It uses same algorithms as apt-get dist-upgrade.
-
-##########
-
-%package notifier
-Requires: %{name}-common = %{version}-%{release}
-Requires: %{name}-updater = %{version}-%{release}
-Summary: System tray notifier of available system updates
-
-%description notifier
-Adept Notifier provides a system tray icon notifying the user of
-available updates. It will run Adept Updater for the user when
-clicked.
-
-##########
-
-%package batch
-Requires: %{name}-manager = %{version}-%{release}
-Summary: command line install for Adept
-
-%description batch
-Adept Batch lets you install packages with Adept from the
-command line. It is intended for shell scripts and being run
-by external applications.
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- \
- --enable-rpath \
- --enable-closure \
- \
- --with-extra-includes=%{_includedir}/tqt3 \
- \
- --enable-adept
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%changelog
diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec
index 628167d81..0a0040b0d 100644
--- a/redhat/applications/kdbg/kdbg.spec
+++ b/redhat/applications/development/kdbg/kdbg.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kdbg
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -120,7 +120,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -130,6 +130,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec
index 6eba92631..bd55c3ed1 100644
--- a/redhat/applications/kdiff3/kdiff3.spec
+++ b/redhat/applications/development/kdiff3/kdiff3.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kdiff3
%define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -71,13 +71,21 @@ BuildRequires: update-desktop-files
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -106,7 +114,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -116,6 +124,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec
index 187bcf3c1..a1a5cf4d6 100644
--- a/redhat/applications/kpicosim/kpicosim.spec
+++ b/redhat/applications/development/kpicosim/kpicosim.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kpicosim
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -70,10 +70,18 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ simulator and export functions to VHDL, HEX and MEM files.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -120,6 +128,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec
index ad3b6bbd7..464bc87a9 100644
--- a/redhat/applications/kscope/kscope.spec
+++ b/redhat/applications/development/kscope/kscope.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kscope
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
Requires: cscope
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -129,7 +129,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -140,6 +140,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec
index 095cdfeaf..b29b35c3c 100644
--- a/redhat/applications/ktechlab/ktechlab.spec
+++ b/redhat/applications/development/ktechlab/ktechlab.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg ktechlab
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -106,7 +106,7 @@ Homepage: http://ktechlab.org/
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -116,6 +116,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec
index 13fc08a17..02f005d10 100644
--- a/redhat/applications/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/development/kxmleditor/kxmleditor.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kxmleditor
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -76,8 +76,6 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-Requires: mplayer
-
%description
KXML Editor is a simple program, that displays and edits the contents of an
@@ -89,6 +87,21 @@ contents.
##########
+%package devel
+Group: Applications/Multimedia
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary: XML Editor for TDE (development files)
+
+%description devel
+Development files for KXMLEditor.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkxmleditorpart.la
+%{tde_libdir}/libkxmleditorpart.so
+
+##########
+
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -100,7 +113,7 @@ contents.
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -110,6 +123,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -131,10 +145,6 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
-# Move desktop icon to correct location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor
@@ -148,8 +158,6 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/kxmleditor
-%{tde_libdir}/libkxmleditorpart.la
-%{tde_libdir}/libkxmleditorpart.so
%{tde_libdir}/libkxmleditorpart.so.1
%{tde_libdir}/libkxmleditorpart.so.1.0.0
%{tde_tdeappdir}/kxmleditor.desktop
diff --git a/redhat/applications/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec
index ff8d574d2..6c354769d 100644
--- a/redhat/applications/piklab/piklab.spec
+++ b/redhat/applications/development/piklab/piklab.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg piklab
%define tde_prefix /opt/trinity
@@ -80,11 +80,16 @@ BuildRequires: brp-check-trinity
BuildRequires: readline-devel
# LIBUSB support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} || 0%{?pclinuxos}
BuildRequires: %{_lib}usb1.0-devel
BuildRequires: %{_lib}usb-compat0.1-devel
%else
-BuildRequires: libusb-devel
+%if 0%{?fedora} >= 37
+BuildRequires: libusb1-devel
+BuildRequires: libusb-compat-0.1-devel
+%else
+BuildRequires: libusb-devel
+%endif
%endif
@@ -111,7 +116,7 @@ are supported. A command-line programmer and debugger are also available.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec
index 7ee60eec3..f77bbd3b5 100644
--- a/redhat/applications/tdesvn/tdesvn.spec
+++ b/redhat/applications/development/tdesvn/tdesvn.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdesvn
%define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -79,25 +79,37 @@ BuildRequires: brp-check-trinity
# SVN support
BuildRequires: subversion-devel
-# SQLITE support
-BuildRequires: sqlite-devel
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
BuildRequires: libtqt3-mt-sqlite3
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -117,7 +129,7 @@ applications like konqueror via the TDE component technology KParts.
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING
%{tde_bindir}/tdesvn
%{tde_bindir}/tdesvnaskpass
%{tde_tdelibdir}/tdesvnpart.la
@@ -257,7 +269,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -267,6 +279,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -275,7 +288,7 @@ fi
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
- -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
+ -DMAN_INSTALL_DIR=%{tde_mandir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec
deleted file mode 100644
index 1525e5eb3..000000000
--- a/redhat/applications/filelight-l10n/filelight-l10n.spec
+++ /dev/null
@@ -1,112 +0,0 @@
-# Default version for this component
-%define kdecomp filelight-l10n
-
-%define debug_package %{nil}
-
-
-# TDE 3.5.13 specific building variables
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name: trinity-%{kdecomp}
-Summary: Localization (l10n) for Filelight, disk space usage tool [Trinity]
-Version: 1.0
-Release: 2%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6
-BuildArch: noarch
-%endif
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-Requires: trinity-filelight
-
-%description
-This package provides localization(l10n) files (translations and docs) for
-Filelight, Filelight allows you to understand your disk usage by graphically
-representing your filesystem as a set of concentric, segmented rings.
-
-See the 'filelight' package description for more information.
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Removes 'en' (primary) language HTML doc, since it is already in main package.
-%__rm -rf doc/filelight
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
- -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{_includedir}"
-
-./configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_tdedocdir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang filelight --with-kde
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%files -f filelight.lang
-%defattr(-,root,root,-)
-
-
-%changelog
diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/games/knights/knights.spec
index 200d6e915..5962f316b 100644
--- a/redhat/applications/knights/knights.spec
+++ b/redhat/applications/games/knights/knights.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg knights
%define tde_prefix /opt/trinity
@@ -61,19 +61,27 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -131,6 +139,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec
index f6ab3805d..3c4989111 100644
--- a/redhat/applications/tdepacman/tdepacman.spec
+++ b/redhat/applications/games/tdepacman/tdepacman.spec
@@ -18,7 +18,7 @@
# Default version for this component
%define tde_pkg tdepacman
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
# TDE specific building variables
@@ -66,7 +66,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -93,7 +93,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -103,6 +103,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/digikam/digikam-open_in_digikam.desktop b/redhat/applications/graphics/digikam/digikam-open_in_digikam.desktop
index ddf7f93b4..ddf7f93b4 100644
--- a/redhat/applications/digikam/digikam-open_in_digikam.desktop
+++ b/redhat/applications/graphics/digikam/digikam-open_in_digikam.desktop
diff --git a/redhat/applications/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec
index 5c4815399..16753d951 100644
--- a/redhat/applications/digikam/digikam.spec
+++ b/redhat/applications/graphics/digikam/digikam.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg digikam
%define tde_prefix /opt/trinity
@@ -70,7 +70,13 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
+# TIFF support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}tiff-devel
+%else
BuildRequires: libtiff-devel
+%endif
+
BuildRequires: gettext
# SUSE desktop files utility
@@ -92,7 +98,11 @@ BuildRequires: lcms-devel
# GPHOTO2 support
%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gphoto-devel
+%else
BuildRequires: gphoto2-devel
+%endif
%else
BuildRequires: libgphoto2-devel
%endif
@@ -324,7 +334,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
index 2c11af151..f4c3d5a2e 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec
+++ b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg gwenview-i18n
%define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -112,7 +112,7 @@ KIPI image framework.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -151,7 +151,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f gwenview.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
+%doc AUTHORS COPYING
%lang(da) %{tde_tdedocdir}/HTML/da/gwenview/
%lang(de) %{tde_tdedocdir}/HTML/de/gwenview/
%lang(et) %{tde_tdedocdir}/HTML/et/gwenview/
diff --git a/redhat/applications/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec
index 723996a29..77b1fc987 100644
--- a/redhat/applications/gwenview/gwenview.spec
+++ b/redhat/applications/graphics/gwenview/gwenview.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg gwenview
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -118,40 +118,46 @@ KIPI image framework.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_tdedocdir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
# Removes useless files (-devel ?)
%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
@@ -207,8 +213,10 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
%{tde_datadir}/man/man1/gwenview.1*
+%{tde_datadir}/pixmaps/gwenview.xpm
%{tde_datadir}/services/gvdirpart.desktop
%{tde_datadir}/services/gvimagepart.desktop
%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
+
%changelog
diff --git a/redhat/applications/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
index fc17cceda..751ceac79 100644
--- a/redhat/applications/ksquirrel/ksquirrel.spec
+++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg ksquirrel
%define tde_prefix /opt/trinity
@@ -85,8 +85,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -118,13 +122,14 @@ OpenGL and dynamic format support.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export kde_confdir="%{tde_confdir}"
# Specific path for RHEL4
@@ -132,6 +137,14 @@ if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
+# FIXME: error during ./configure solved by CXXFLAGS below
+export CXXFLAGS="${CXXFLAGS} -I%{tde_tdeincludedir}"
+
+# FIXME: FTBFS during ./configure under rhel8/rhel9
+%if 0%{?rhel} >= 8
+export CXXFLAGS="${CXXFLAGS} -fPIC"
+%endif
+
# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
@@ -160,13 +173,14 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
+%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README
%{tde_bindir}/ksquirrel
%{tde_bindir}/ksquirrel-libs-configurator
%{tde_bindir}/ksquirrel-libs-configurator-real
@@ -187,9 +201,9 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/mimelnk/image/*.desktop
%{tde_datadir}/services/ksquirrelpart.desktop
%{tde_mandir}/man1/ksquirrel.1
+%{tde_mandir}/man1/ksquirrel-libs-configurator.1*
%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc
%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc
%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc
-
%changelog
diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec
index 87760d1cf..db50315dc 100644
--- a/redhat/applications/potracegui/potracegui.spec
+++ b/redhat/applications/graphics/potracegui/potracegui.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg potracegui
%define tde_prefix /opt/trinity
@@ -60,19 +60,27 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -120,6 +128,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
deleted file mode 120000
index 373c65ab3..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh \ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
deleted file mode 120000
index 62aa57f04..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 \ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
deleted file mode 120000
index 2d0ca2867..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 \ No newline at end of file
diff --git a/redhat/applications/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec
index a9c342fcd..7d956ef72 100644
--- a/redhat/applications/kasablanca/kasablanca.spec
+++ b/redhat/applications/internet/kasablanca/kasablanca.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kasablanca
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -78,13 +78,21 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# UTEMPTER support
%if 0%{?suse_version}
@@ -129,7 +137,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -139,6 +147,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec
index 8cca38c4f..bdfbc1fc1 100644
--- a/redhat/applications/kbiff/kbiff.spec
+++ b/redhat/applications/internet/kbiff/kbiff.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kbiff
%define tde_prefix /opt/trinity
@@ -57,25 +57,32 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: tqt3-compat-headers >= 3.5.0
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -112,7 +119,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -122,6 +129,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
index 1757ef3a0..3c6ef1d42 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber.spec
+++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kftpgrabber
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -76,7 +76,11 @@ BuildRequires: brp-check-trinity
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -129,7 +133,7 @@ Requires: %{name} = %{version}-%{release}
unset QTDIR QTINC QTDIR
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -139,6 +143,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec
index 4b9b3b822..14ade96fd 100644
--- a/redhat/applications/knmap/knmap.spec
+++ b/redhat/applications/internet/knmap/knmap.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg knmap
%define tde_prefix /opt/trinity
@@ -62,19 +62,27 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -123,7 +131,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -133,6 +141,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec
index 80e0b7e39..69f7bc141 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/internet/konversation/konversation.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg konversation
%define tde_prefix /opt/trinity
@@ -61,19 +61,34 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
+# PYTHON support
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -86,7 +101,12 @@ BuildRequires: brp-check-trinity
%endif
# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
+
%if 0%{?suse_version}
BuildRequires: docbook-xsl-stylesheets
%else
@@ -110,6 +130,7 @@ BuildRequires: libXi6-devel
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
# RHEL 8: available in EPEL
+# RHEL 9: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
@@ -182,7 +203,7 @@ and experienced users alike will appreciate its many features:
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
%__sed -i "konversation/scripts/media" \
"konversation/scripts/weather" \
- -e "s|/usr/bin/env python|/usr/bin/env python2|"
+ -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
%endif
@@ -191,7 +212,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -201,6 +222,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -263,6 +285,8 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz
%{tde_datadir}/icons/hicolor/*/apps/konversation.png
%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz
+%{tde_mandir}/man1/konversation.1*
+%{tde_mandir}/man1/konversationircprotocolhandler.1*
%changelog
diff --git a/redhat/applications/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec
index 90d3bf659..1bc95975d 100644
--- a/redhat/applications/kopete-otr/kopete-otr.spec
+++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kopete-otr
%define tde_prefix /opt/trinity
@@ -68,7 +68,7 @@ BuildRequires: trinity-tdenetwork-devel >= %{tde_version}
# Kopete is provided by tdenetwork
Requires: trinity-kopete >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -83,8 +83,11 @@ BuildRequires: brp-check-trinity
%endif
# OTR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}otr-devel
+%else
BuildRequires: libotr-devel
-
+%endif
%description
This plugin enables Off-The-Record encryption for the TDE instant
@@ -110,7 +113,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -120,6 +123,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec
index 74044fd96..e1c7d3e1a 100644
--- a/redhat/applications/kshowmail/kshowmail.spec
+++ b/redhat/applications/internet/kshowmail/kshowmail.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kshowmail
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: trinity-tdepim-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -77,13 +77,21 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -108,7 +116,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -118,6 +126,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec
index b7bd141c4..fa2fbcb33 100644
--- a/redhat/applications/kstreamripper/kstreamripper.spec
+++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kstreamripper
%define tde_prefix /opt/trinity
@@ -75,7 +75,7 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
%description
@@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -113,6 +113,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec
index ce6aaea3e..d67deae4f 100644
--- a/redhat/applications/ktorrent/ktorrent.spec
+++ b/redhat/applications/internet/ktorrent/ktorrent.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg ktorrent
%define tde_prefix /opt/trinity
@@ -123,7 +123,7 @@ enabling background downloading.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -214,6 +214,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdelibdir}/ktzeroconfplugin.la
%{tde_tdelibdir}/ktzeroconfplugin.so
%endif
+%{tde_mandir}/man1/ktorrent.1*
%changelog
diff --git a/redhat/applications/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec
index da3af96ad..a4b2b7fcc 100644
--- a/redhat/applications/kvirc/kvirc.spec
+++ b/redhat/applications/internet/kvirc/kvirc.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kvirc
%define tde_prefix /opt/trinity
@@ -143,7 +143,7 @@ with the K Desktop Environment version 3.
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
./autogen.sh
@@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}"
--with-kde-services-dir=%{tde_datadir}/services \
--with-kde-library-dir=%{tde_libdir} \
--with-kde-include-dir=%{tde_tdeincludedir} \
- --with-qt-name=tqt \
- --with-qt-library-dir=%{_libdir} \
- --with-qt-include-dir=%{_includedir}/tqt3 \
- --with-qt-moc=%{_bindir}/tmoc
+ --with-tqt-name=tqt \
+ --with-tqt-library-dir=%{_libdir} \
+ --with-tqt-include-dir=%{_includedir}/tqt3 \
+ --with-tqt-moc=%{_bindir}/tmoc
# Symbolic links must exist prior to parallel building
%__make symlinks -C src/kvilib/build
@@ -227,6 +227,8 @@ export PATH="%{tde_bindir}:${PATH}"
%exclude %{tde_libdir}/kvirc/*/modules/*.so
%{tde_libdir}/kvirc/
%{tde_tdeappdir}/kvirc.desktop
+%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem.upd
+%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem_upd.sh
%{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_datadir}/icons/hicolor/*/*/*.svgz
%{tde_datadir}/icons/hicolor/*/*/*.xpm
diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec
index 9377caf39..9983af3e4 100644
--- a/redhat/applications/kvpnc/kvpnc.spec
+++ b/redhat/applications/internet/kvpnc/kvpnc.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kvpnc
%define tde_prefix /opt/trinity
@@ -61,19 +61,34 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
+
+# GCRYPT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gcrypt-devel >= 1.2.0
+%else
+BuildRequires: libgcrypt-devel >= 1.2.0
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -85,9 +100,6 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-BuildRequires: libgcrypt-devel >= 1.2.0
-
-
%description
KVpnc is a TDE frontend for various vpn clients.
@@ -116,7 +128,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -126,6 +138,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec
index 8d1ee44d5..73799b17c 100644
--- a/redhat/applications/smb4k/smb4k.spec
+++ b/redhat/applications/internet/smb4k/smb4k.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg smb4k
%define tde_prefix /opt/trinity
@@ -58,11 +58,13 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
+BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -143,41 +145,44 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-final \
- --enable-new-ldflags \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ ..
-# SMP safe !
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
%find_lang %{tde_pkg}
diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/internet/tork/tork.spec
index d9d1cf771..97c96d3a4 100644
--- a/redhat/applications/tork/tork.spec
+++ b/redhat/applications/internet/tork/tork.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tork
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: trinity-tdepim-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -80,12 +80,18 @@ BuildRequires: brp-check-trinity
BuildRequires: torsocks
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# GEOIP
%if 0%{?suse_version}
%if 0%{?suse_version} < 1550
BuildRequires: libGeoIP-devel
+%else
+%define with_embedded_geoip 1
%endif
%else
BuildRequires: geoip-devel
@@ -114,7 +120,7 @@ on the Tor network.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -124,6 +130,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -134,6 +141,8 @@ fi
\
-DBUILD_ALL=ON \
-DWITH_ALL_OPTIONS=ON \
+ -DWITH_EMBEDDED_GEOIP=%{?with_embedded_geoip:ON}%{?!with_embedded_geoip:OFF} \
+ -DWITH_GNUTLS=ON \
\
..
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec
deleted file mode 100644
index 923d189f4..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager8.spec
+++ /dev/null
@@ -1,193 +0,0 @@
-#
-# spec file for package knetworkmanager8 (version R14)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
-%endif
-%define tde_pkg knetworkmanager
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name: trinity-%{tde_pkg}
-Epoch: %{tde_epoch}
-Version: 0.8
-Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary: Trinity applet for Network Manager
-Group: Applications/Internet
-URL: http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License: GPL-2.0+
-%else
-License: GPLv2+
-%endif
-
-#Vendor: Trinity Desktop
-#Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}8-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: autoconf automake libtool m4
-BuildRequires: gcc-c++
-BuildRequires: pkgconfig
-BuildRequires: libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires: update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires: brp-check-trinity
-%endif
-
-%if 0%{?rhel} || 0%{?fedora}
-Requires: NetworkManager-gnome
-%else
-Requires: networkmanager
-%endif
-
-# NetworkManager support
-BuildRequires: NetworkManager-glib-devel
-
-# HAL support
-BuildRequires: hal-devel
-
-Obsoletes: trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-%files -f knetworkmanager.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_tdelibdir}/knetworkmanager_openvpn.so.*
-%{tde_tdelibdir}/knetworkmanager_pptp.so.*
-%{tde_tdelibdir}/knetworkmanager_vpnc.so.*
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-%{tde_datadir}/services/knetworkmanager_openvpn.desktop
-%{tde_datadir}/services/knetworkmanager_pptp.desktop
-%{tde_datadir}/services/knetworkmanager_vpnc.desktop
-
-##########
-
-%package devel
-Summary: Common data shared among the MySQL GUI Suites
-Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes: trinity-knetworkmanager-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: trinity-knetworkmanager-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}8-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --disable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
- \
- --with-openvpn \
- --with-vpnc \
- --with-pptp
-
-# Does not support parallel build
-%__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot}
-%find_lang knetworkmanager
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec
index 4ecd291ea..edb5ff5c9 100644
--- a/redhat/applications/bibletime/bibletime.spec
+++ b/redhat/applications/misc/bibletime/bibletime.spec
@@ -23,7 +23,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg bibletime
%define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -114,67 +114,64 @@ texts, write own notes, save, print etc.).
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
-CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11"
-%endif
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
-
-# Not SMP safe !
-%__make -C bibletime/frontend
-
-# SMP safe !
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
+
%__make %{?_smp_mflags} || %__make
%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop"
+%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/bibletime
%{tde_tdeincludedir}/bibletimeinterface.h
-%{tde_datadir}/applications/bibletime.desktop
+%{tde_tdeappdir}/bibletime.desktop
%{tde_datadir}/apps/bibletime/
%{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_tdedocdir}/HTML/en/bibletime/
+%lang(de) %dir %{tde_mandir}/de/
+%lang(de) %dir %{tde_mandir}/de/man1/
+%lang(de) %{tde_mandir}/de/man1/bibletime.1*
+%{tde_mandir}/man1/bibletime.1*
%changelog
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec
index e3f8bf5cb..986dec31c 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec
@@ -1,6 +1,6 @@
# Default version for this component
%define tde_pkg fusion-icon
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%if "%{?python2_sitelib}" == ""
%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
index 1f83bf798..b44904f44 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/misc/kcmldap/kcmldap.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kcmldap
%define tde_prefix /opt/trinity
@@ -58,7 +58,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
+#BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -67,18 +67,26 @@ BuildRequires: trinity-libtdeldap-devel >= 0.5
Requires: trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -92,8 +100,12 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -115,8 +127,12 @@ BuildRequires: libheimdal-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -152,6 +168,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms
%dir %{tde_datadir}/pixmaps
%{tde_datadir}/pixmaps/kcmldapbonding_step1.png
%{tde_datadir}/pixmaps/kcmldapbonding_step3.png
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldap.mo
##########
@@ -186,7 +203,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -196,6 +213,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
index fe4121f07..cacb6565a 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kcmldapcontroller
%define tde_prefix /opt/trinity
@@ -57,13 +57,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
+#BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-libtdeldap-devel >= 0.5
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?mgaversion} >= 6
BuildRequires: openldap-servers-devel
%endif
@@ -105,8 +109,12 @@ BuildRequires: libheimdal-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -117,13 +125,21 @@ BuildRequires: %{_lib}ext2fs-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -146,7 +162,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/primaryrccertupdater
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?rhel} >= 7
%{tde_libdir}/slapi-acl-manager.la
%{tde_libdir}/slapi-acl-manager.so
%endif
@@ -157,6 +173,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker
%dir %{tde_datadir}/pixmaps
%{tde_datadir}/pixmaps/kcmldapcontroller_step1.png
%{tde_datadir}/pixmaps/kcmldapcontroller_step4.png
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldapcontroller.mo
##########
@@ -180,7 +197,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -190,6 +207,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
index 16aec6e48..06875f9c1 100644
--- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec
+++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kcmldapmanager
%define tde_prefix /opt/trinity
@@ -57,13 +57,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
+#BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-libtdeldap-devel >= 0.5
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -102,8 +106,12 @@ BuildRequires: libheimdal-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -114,13 +122,21 @@ BuildRequires: %{_lib}ext2fs-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -164,7 +180,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -174,6 +190,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec
index 5bc1c3709..10ea73152 100644
--- a/redhat/applications/kerberostray/kerberostray.spec
+++ b/redhat/applications/misc/kerberostray/kerberostray.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kerberostray
%define tde_prefix /opt/trinity
@@ -57,13 +57,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
+#BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-libtdeldap-devel >= 0.5
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -79,8 +79,12 @@ BuildRequires: brp-check-trinity
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -102,8 +106,12 @@ BuildRequires: libheimdal-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -114,13 +122,21 @@ BuildRequires: %{_lib}ext2fs-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -143,7 +159,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -153,6 +169,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec
index c2b24ef16..d457bfd82 100644
--- a/redhat/applications/krecipes/krecipes.spec
+++ b/redhat/applications/misc/krecipes/krecipes.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg krecipes
%define tde_prefix /opt/trinity
@@ -79,20 +79,19 @@ BuildRequires: brp-check-trinity
BuildRequires: mysql-devel
# POSTGRESQL support
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
-BuildRequires: postgresql10
-BuildRequires: postgresql10-devel
-%else
-BuildRequires: postgresql
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql-server-devel
%else
BuildRequires: postgresql-devel
%endif
-%endif
-# SQLITE support
-BuildRequires: sqlite-devel
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
%description
@@ -114,7 +113,7 @@ databases.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -130,6 +129,7 @@ export PATH="%{tde_bindir}:${PATH}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
+ --mandir=%{tde_mandir} \
\
--disable-dependency-tracking \
--disable-debug \
@@ -185,6 +185,6 @@ export PATH="%{tde_bindir}:${PATH}"
%lang(et) %{tde_tdedocdir}/HTML/et/
%lang(pt) %{tde_tdedocdir}/HTML/pt/
%lang(sv) %{tde_tdedocdir}/HTML/sv/
-
+%{tde_mandir}/man1/krecipes.1*
%changelog
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index eee0076ca..fc21004b8 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg amarok
%define tde_prefix /opt/trinity
@@ -66,13 +66,17 @@ BuildRequires: trinity-filesystem >= %{tde_version}
Requires: trinity-filesystem >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: gettext
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -84,11 +88,15 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-# ALSA support
-BuildRequires: alsa-lib-devel
+# ALSA supportl
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
# ESOUND support
-BuildRequires: esound-devel
+#BuildRequires: esound-devel
# PCRE support
BuildRequires: pcre-devel
@@ -99,24 +107,36 @@ BuildRequires: libtool
BuildRequires: libtool-ltdl-devel
%endif
+%if 0%{?fedora} >= 37
+BuildRequires: libusb1-devel
+BuildRequires: libusb-compat-0.1-devel
+%else
BuildRequires: libusb-devel
+%endif
BuildRequires: mysql-devel
-BuildRequires: SDL-devel
BuildRequires: taglib-devel
-BuildRequires: sqlite-devel
-# POSTGRESQL support
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
-BuildRequires: postgresql10
-BuildRequires: postgresql10-devel
+# SDL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}SDL-devel
%else
-BuildRequires: postgresql
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: SDL-devel
+%endif
+
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
+
+# POSTGRESQL support
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql-server-devel
%else
BuildRequires: postgresql-devel
%endif
-%endif
# not used anymore, in favor of libvisual ? -- Rex
#{?fedora:BuildRequires: xmms-devel}
@@ -126,7 +146,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -153,13 +173,13 @@ BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
%if 0%{?pclinuxos} == 0
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_ifp 1
-BuildRequires: libifp-devel
+BuildRequires: %{_lib}ifp-devel
%endif
%endif
# KARMA support
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
+%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000
%define with_karma 1
BuildRequires: libkarma-devel
BuildRequires: karma-sharp
@@ -167,7 +187,7 @@ BuildRequires: karma-sharp
%endif
# GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_gpod 1
BuildRequires: libgpod-devel >= 0.4.2
%endif
@@ -175,29 +195,45 @@ BuildRequires: libgpod-devel >= 0.4.2
# MTP players
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_mtp 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mtp-devel
+%else
BuildRequires: libmtp-devel
%endif
+%endif
# Creative Nomad Jukebox
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
%define with_njb 1
-BuildRequires: libnjb-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}njb-devel
+%else
+BuildRequires: libmtp-devel
+%endif
%endif
# VISUAL support
%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_libvisual 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}visual-devel
+%else
BuildRequires: libvisual-devel
%endif
+%endif
# MUSICBRAINZ support
%if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version}
%if 0%{?fedora} >= 24
BuildRequires: libmusicbrainz5-devel
%else
+%if 0%{?mgaversion} >= 9
+BuildRequires: %{_lib}musicbrainz5-devel
+%else
BuildRequires: libmusicbrainz-devel
%endif
%endif
+%endif
# TUNEPIMP support
%if 0%{?pclinuxos}
@@ -232,8 +268,12 @@ BuildRequires: xine-lib-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%define with_xine 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?sle_version} && 0%{?sle_version} <= 150000
%define with_xine 1
BuildRequires: libxine-devel
@@ -252,9 +292,11 @@ BuildRequires: trinity-akode-devel
# MP4V2 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?mdkver} < 24090000
%define with_mp4v2 1
BuildRequires: libmp4v2-devel
%endif
+%endif
# ruby
BuildRequires: ruby
@@ -264,19 +306,10 @@ BuildRequires: rubypick
%endif
# PYTHON support
-%if 0%{?sle_version} >= 150400
-%define python python3
-%define __python %__python3
-%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
@@ -466,7 +499,7 @@ fi
"amarok/src/scripts/webcontrol/Playlist.py" \
"amarok/src/scripts/webcontrol/RequestHandler.py" \
"amarok/src/scripts/webcontrol/WebControl.py" \
- -e "s|/usr/bin/env python|/usr/bin/env python2|"
+ -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
%endif
@@ -480,7 +513,7 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -491,6 +524,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec
index 3207527cf..8dad74e8c 100644
--- a/redhat/applications/codeine/codeine.spec
+++ b/redhat/applications/multimedia/codeine/codeine.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg codeine
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -81,8 +81,12 @@ BuildRequires: brp-check-trinity
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
@@ -114,7 +118,7 @@ Features:
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -124,6 +128,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
index 81266f348..ba760d943 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n.spec
+++ b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg k3b-i18n
%define tde_prefix /opt/trinity
@@ -70,7 +70,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -351,7 +351,7 @@ This package contains the Ukrainian translations for K3B.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -361,6 +361,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec
index 2edb92088..be721bee9 100644
--- a/redhat/applications/k3b/k3b.spec
+++ b/redhat/applications/multimedia/k3b/k3b.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg k3b
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -77,32 +77,57 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-BuildRequires: alsa-lib-devel
+# ALSA supportl
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
+
BuildRequires: audiofile-devel
BuildRequires: gettext
-BuildRequires: libmpcdec-devel
-BuildRequires: libvorbis-devel
BuildRequires: taglib-devel
BuildRequires: zlib-devel
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
Requires(post): coreutils
Requires(postun): coreutils
@@ -126,8 +151,12 @@ Requires: cdrdao
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# HAL support
%if 0%{?rhel} == 5
@@ -149,13 +178,21 @@ Requires: trinity-dbus-tqt >= 1:0.63
# SNDFILE support
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
%define with_sndfile 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}sndfile-devel
+%else
BuildRequires: libsndfile-devel
%endif
+%endif
# SAMPLERATE support
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
%define with_samplerate 1
-BuildRequires: libsamplerate-devel
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}samplerate-devel
+%else
+BuildRequires: libsamplerate-devel
+%endif
%endif
# DVDREAD support
@@ -227,6 +264,17 @@ BuildRequires: ffmpeg-devel
%endif
%endif
+# MUSEPACK
+%if 0%{?fedora} == 0 || 0%{?fedora} <= 37
+# Looking for mpc_decoder_setup in mpcdec - not found
+%define with_musepack 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}mpcdec-devel
+%else
+BuildRequires: libmpcdec-devel
+%endif
+%endif
+
%description
K3b provides a comfortable user interface to perform most CD/DVD
@@ -260,8 +308,10 @@ start.
%{tde_tdelibdir}/libk3blibsndfiledecoder.la
%{tde_tdelibdir}/libk3blibsndfiledecoder.so
%endif
+%if 0%{?with_musepack}
%{tde_tdelibdir}/libk3bmpcdecoder.la
%{tde_tdelibdir}/libk3bmpcdecoder.so
+%endif
%{tde_tdelibdir}/libk3boggvorbisdecoder.la
%{tde_tdelibdir}/libk3boggvorbisdecoder.so
%{tde_tdelibdir}/libk3boggvorbisencoder.la
@@ -271,7 +321,7 @@ start.
%{tde_tdelibdir}/libk3bwavedecoder.la
%{tde_tdelibdir}/libk3bwavedecoder.so
%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
+%{tde_mandir}/man1/k3b.1*
##########
@@ -426,7 +476,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11"
%endif
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -436,6 +486,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -452,7 +503,7 @@ fi
-DWITH_ALL_OPTIONS="ON" \
-DWITH_MUSICBRAINZ="OFF" \
-DWITH_FFMPEG_ALL_CODECS="ON" \
- -DWITH_MUSEPACK="ON" \
+ -DWITH_MUSEPACK="%{!?with_musepack:OFF}%{?with_musepack:ON}" \
-DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \
-DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \
%if 0%{?rhel} == 5
diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/multimedia/k3b/k3brc
index 5d967f599..5d967f599 100644
--- a/redhat/applications/k3b/k3brc
+++ b/redhat/applications/multimedia/k3b/k3brc
diff --git a/redhat/applications/k3b/trinity-k3b-rpmlintrc b/redhat/applications/multimedia/k3b/trinity-k3b-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/k3b/trinity-k3b-rpmlintrc
+++ b/redhat/applications/multimedia/k3b/trinity-k3b-rpmlintrc
diff --git a/redhat/applications/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec
index 656727906..e677cc48e 100644
--- a/redhat/applications/k9copy/k9copy.spec
+++ b/redhat/applications/multimedia/k9copy/k9copy.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg k9copy
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: trinity-k3b-devel
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -94,8 +94,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -129,37 +133,43 @@ This is the Trinity version.
# Fix permissions on doc files
chmod -x AUTHORS COPYING
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# FFMPEG ...
if [ -d /usr/include/ffmpeg ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
fi
-
-# NOTICE: --enable-final causes FTBFS !
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
\
- --disable-dependency-tracking \
- --disable-debug \
- --disable-final \
- --enable-new-ldflags \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --enable-k3bdevices
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS=ON \
+ ..
%__make %{?_smp_mflags} || %__make
@@ -167,7 +177,7 @@ fi
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make -C build install DESTDIR=%{buildroot}
%find_lang %{tde_pkg}
@@ -185,6 +195,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
+%{tde_mandir}/man1/k9copy.1*
%changelog
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
index 2b72a1dff..12eca9676 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
+++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
@@ -19,7 +19,7 @@
%define tde_pkg kaffeine-mozilla
%define tde_prefix /opt/trinity
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
# TDE specific building variables
@@ -59,7 +59,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -73,8 +73,12 @@ BuildRequires: desktop-file-utils
%if 0%{?suse_version}
BuildRequires: mozilla-nspr-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}nspr-devel
+%else
BuildRequires: nspr-devel
%endif
+%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xaw-devel
@@ -107,7 +111,7 @@ if [ -d "%{_includedir}/nspr4" ]; then
RPM_OPT_FLAGS="-I%{_includedir}/nspr4 ${RPM_OPT_FLAGS}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -117,17 +121,14 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
-DWITH_GCC_VISIBILITY=ON \
\
- -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
\
..
diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec
index f09429271..e445da856 100644
--- a/redhat/applications/kaffeine/kaffeine.spec
+++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kaffeine
%define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -79,13 +79,22 @@ BuildRequires: brp-check-trinity
%endif
# VORBIS support
-BuildRequires: libvorbis-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
# CDDA support
BuildRequires: libcdio-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}cdda-devel
+%else
BuildRequires: libcdda-devel
%endif
+%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: cdparanoia
BuildRequires: cdparanoia-devel
@@ -134,9 +143,14 @@ BuildRequires: %{_lib}xcb-devel
%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gstreamer 1
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gstreamer-devel
+BuildRequires: %{_lib}gst-plugins-base1.0-devel
+%else
BuildRequires: %{_lib}gstreamer1.0-devel
BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel
%endif
+%endif
%if 0%{?rhel} == 4
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel
@@ -155,8 +169,12 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
@@ -283,7 +301,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -293,6 +311,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc b/redhat/applications/multimedia/kaffeine/trinity-kaffeine-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc
+++ b/redhat/applications/multimedia/kaffeine/trinity-kaffeine-rpmlintrc
diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec
index 6132f7d9f..09a2fd48b 100644
--- a/redhat/applications/kmplayer/kmplayer.spec
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kmplayer
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -84,9 +84,14 @@ BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gstreamer-devel
+BuildRequires: %{_lib}gst-plugins-base1.0-devel
+%else
BuildRequires: %{_lib}gstreamer1.0-devel
BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel
%endif
+%endif
%if 0%{?rhel} == 4
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel
@@ -104,8 +109,12 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
@@ -130,7 +139,11 @@ BuildRequires: xorg-x11-libXv-devel
%endif
# GTK2 stuff
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk2-devel
+%endif
# DBUS stuff
%if 0%{?suse_version}
@@ -202,8 +215,6 @@ Core files needed for KMPlayer.
%files base
%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
%{tde_bindir}/kgstplayer
%{tde_bindir}/kxineplayer
%dir %{tde_datadir}/config
@@ -254,6 +265,21 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
##########
+%package devel
+Group: Applications/Multimedia
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary: Media player for Trinity (devlopment files)
+
+%description devel
+Development files for KMPlayer, a basic audio/video viewer application for TDE.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmplayercommon.la
+%{tde_libdir}/libkmplayercommon.so
+
+##########
+
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -269,7 +295,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -279,6 +305,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec
index 2246f8d37..c63c48e0d 100644
--- a/redhat/applications/kplayer/kplayer.spec
+++ b/redhat/applications/multimedia/kplayer/kplayer.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kplayer
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -70,10 +70,18 @@ BuildRequires: libtool
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -131,6 +139,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
index af8bb6924..e1830719f 100644
--- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec
+++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg mplayerthumbs
%define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -69,7 +69,11 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -114,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -124,6 +128,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -164,6 +169,7 @@ fi
%{tde_datadir}/services/mplayer-thumbnailer.desktop
%{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/mplayer-thumbnailer.mo
%changelog
diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec
index 94c5bfee1..99fb2abbb 100644
--- a/redhat/applications/rosegarden/rosegarden.spec
+++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg rosegarden
%define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -81,28 +81,51 @@ BuildRequires: brp-check-trinity
%endif
BuildRequires: fftw-devel
-BuildRequires: liblo-devel
BuildRequires: fontconfig-devel
+# LO support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}lo-devel
+%else
+BuildRequires: liblo-devel
+%endif
+
# DSSI support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
BuildRequires: dssi-devel
%endif
# LRDF support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}lrdf-devel
+%endif
+%if 0%{?fedora} || 0%{?suse_version}
BuildRequires: liblrdf-devel
%endif
+# LADSPA support
+%if 0%{?mdkver}
+BuildRequires: ladspa-devel
+%endif
+
+# RAPTOR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}raptor-devel
+%endif
+
# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: %{_lib}jack-devel
%else
BuildRequires: jack-audio-connection-kit-devel
%endif
# ACL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# LIRC support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
@@ -115,7 +138,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -134,7 +157,11 @@ Requires: libsndfile-utils
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -177,7 +204,7 @@ This package provides the data files necessary for running Rosegarden
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -187,6 +214,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -233,6 +261,10 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_bindir}/rosegarden-lilypondview
%{tde_bindir}/rosegarden-project-package
%{tde_bindir}/rosegardensequencer
+%{tde_mandir}/man1/rosegarden-audiofile-importer.1*
+%{tde_mandir}/man1/rosegarden-lilypondview.1*
+%{tde_mandir}/man1/rosegarden-project-package.1*
+%{tde_mandir}/man1/rosegarden.1*
%files data -f %{tde_pkg}.lang
%defattr(-,root,root,-)
diff --git a/redhat/applications/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
index 6c3ffae19..6b713c452 100644
--- a/redhat/applications/soundkonverter/soundkonverter.spec
+++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg soundkonverter
%define tde_prefix /opt/trinity
@@ -80,8 +80,12 @@ BuildRequires: taglib-devel
# CDDA support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}cdda-devel
+%else
BuildRequires: libcdda-devel
%endif
+%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: cdparanoia-devel
%endif
@@ -130,7 +134,7 @@ See the 'trinity-soundkonverter' package for more information.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -178,7 +182,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README
%{tde_bindir}/soundkonverter
%{tde_bindir}/userscript.sh
%{tde_tdeappdir}/soundkonverter.desktop
diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec
index 47ef2c7ca..8032ed76f 100644
--- a/redhat/applications/tderadio/tderadio.spec
+++ b/redhat/applications/multimedia/tderadio/tderadio.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tderadio
%define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -80,7 +80,12 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}sndfile-devel
+%else
BuildRequires: libsndfile-devel
+%endif
+
%{?with_lirc:BuildRequires: lirc-devel}
# LAME support
@@ -147,45 +152,37 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-visibility causes applications fails to start !
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-final \
- --enable-new-ldflags \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \
- --enable-v4l2 \
- --enable-lame \
- --enable-ogg \
- --enable-alsa \
- --enable-oss
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||"
-%endif
+ -DBUILD_ALL=ON \
+ ..
%__make %{?_smp_mflags}
@@ -193,24 +190,31 @@ export PATH="%{tde_bindir}:${PATH}"
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
+%__make install DESTDIR=%{buildroot} -C build
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
%endif
+# Remove devel files
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.la
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.so
+
+# Remove pixmas
+%__rm -fr %{?buildroot}%{tde_datadir}/pixmaps/
+
%clean
%__rm -rf %{buildroot}
-%files -f %{tde_pkg}.lang
+%files
%defattr(-,root,root,-)
%{tde_bindir}/convert-presets
%{tde_bindir}/tderadio
+%{tde_libdir}/libtderadio.so.0
+%{tde_libdir}/libtderadio.so.0.0.0
%dir %{tde_libdir}/tderadio
%dir %{tde_libdir}/tderadio/plugins
%{tde_libdir}/tderadio/plugins/*.la
@@ -222,9 +226,14 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/hicolor/*/*/tderadio*.png
%{tde_datadir}/icons/locolor/*/*/tderadio*.png
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
+%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo
%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
+%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
%{tde_tdedocdir}/HTML/en/tderadio/
+%{tde_mandir}/man1/convert-presets.1*
+%{tde_mandir}/man1/tderadio.1*
+
%changelog
diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/office/basket/basket.spec
index 2f66f7f8f..fa032db4d 100644
--- a/redhat/applications/basket/basket.spec
+++ b/redhat/applications/office/basket/basket.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg basket
%define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires: trinity-kontact-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gpgme-devel
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -107,7 +107,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -117,6 +117,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec
index 4777b3b36..f16cae934 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/office/kbibtex/kbibtex.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kbibtex
%define tde_prefix /opt/trinity
@@ -63,24 +63,36 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
# YAZ support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
BuildRequires: libyaz-devel
%endif
@@ -115,7 +127,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -125,6 +137,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec
index 8cc7ca8c4..7add6600f 100644
--- a/redhat/applications/kbookreader/kbookreader.spec
+++ b/redhat/applications/office/kbookreader/kbookreader.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kbookreader
%define tde_prefix /opt/trinity
@@ -62,18 +62,26 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -119,6 +127,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec
index bf89c420e..f1d311cd3 100644
--- a/redhat/applications/keximdb/keximdb.spec
+++ b/redhat/applications/office/keximdb/keximdb.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg keximdb
%define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils
BuildRequires: trinity-koffice-devel
BuildRequires: trinity-koffice-kexi
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -73,10 +73,18 @@ BuildRequires: libtool
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -115,7 +123,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -125,6 +133,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kile/kile.spec b/redhat/applications/office/kile/kile.spec
index 31b8d0947..e9e333318 100644
--- a/redhat/applications/kile/kile.spec
+++ b/redhat/applications/office/kile/kile.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kile
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -149,45 +149,43 @@ Kile can support large projects consisting of several smaller files.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes the KCM not to work at all !
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ ..
%__make %{?_smp_mflags}
+
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh
-
-# Unwanted files ...
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
+%__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg}
@@ -221,6 +219,7 @@ export PATH="%{tde_bindir}:${PATH}"
%lang(pt) %{tde_tdedocdir}/HTML/pt/kile/
%lang(sv) %{tde_tdedocdir}/HTML/sv/kile/
+%{tde_mandir}/man1/kile.1*
%changelog
diff --git a/redhat/applications/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec
index ac1fe772a..2be7ff5c0 100644
--- a/redhat/applications/kmymoney/kmymoney.spec
+++ b/redhat/applications/office/kmymoney/kmymoney.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kmymoney
%define tde_prefix /opt/trinity
@@ -86,7 +86,13 @@ BuildRequires: brp-check-trinity
BuildRequires: html2ps
BuildRequires: recode
+
+# OFX support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}ofx-devel
+%else
BuildRequires: libofx-devel
+%endif
# OPENSP support
%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion}
@@ -204,7 +210,7 @@ This package contains development files needed for KMyMoney plugins.
unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -215,6 +221,7 @@ fi
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kmymoney/kmymoneytitlelabel.png b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png
index 70d72ac98..70d72ac98 100644
--- a/redhat/applications/kmymoney/kmymoneytitlelabel.png
+++ b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png
Binary files differ
diff --git a/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc b/redhat/applications/office/kmymoney/trinity-kmymoney-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc
+++ b/redhat/applications/office/kmymoney/trinity-kmymoney-rpmlintrc
diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec
index d9b671aa0..38e1219ca 100644
--- a/redhat/applications/knowit/knowit.spec
+++ b/redhat/applications/office/knowit/knowit.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg knowit
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -70,10 +70,18 @@ BuildRequires: libtool
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ but TDE-based, and requires Trinity.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -119,6 +127,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
index f71f0fe38..c21d72bf7 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n.spec
+++ b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg koffice-i18n
%define tde_prefix /opt/trinity
@@ -74,7 +74,7 @@ BuildRequires: desktop-file-utils
BuildRequires: findutils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -573,45 +573,67 @@ Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release}
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
%build
+unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+(
+for l in . %{TDE_LANGS}; do
+ if [ $l != '.' ]; then
+ pushd "%{tde_pkg}-${l}"
+ else
+ pushd ${l}
+ fi
+
+ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+ fi
+
+ %cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ -DBUILD_ALL=ON \
+ \
+ ..
+
+ %__make %{?_smp_mflags}
+
+ popd
+done
+) 2>&1 | tee /tmp/rpmbuild.$$
-export kde_htmldir="%{tde_tdedocdir}/HTML"
+if grep -qw TDE_Error /tmp/rpmbuild.$$; then
+ echo "Error while building. See '/tmp/rpmbuild.$$'"
+ exit 1
+fi
-for l in %{TDE_LANGS}; do
- for f in koffice-i18n-${l}/; do
- if [ -d "${f}" ]; then
- pushd ${f}
- %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|"
- %__make -f "admin/Makefile.common"
- %configure \
- --prefix=%{tde_prefix} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_tdedocdir}
- %__make %{?_smp_mflags}
- popd
- fi
- done
-done
+wait
+rm -f /tmp/rpmbuild.$$
%install
-%__rm -rf %{?buildroot}
export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
for l in %{TDE_LANGS}; do
- for f in koffice-i18n-${l}/; do
- if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then
- %__make install DESTDIR="%{?buildroot}" -C "${f}"
- fi
- done
+ %__make DESTDIR=%{buildroot} -C build install-${l}
done
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%clean
%__rm -rf %{buildroot}
@@ -888,7 +910,6 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != ""
%files Latvian
%defattr(-,root,root,-)
-%{tde_datadir}/locale/lv
%{tde_datadir}/locale/lv/*
%endif
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index 43b5365eb..39e1ddcdb 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg koffice
%define tde_prefix /opt/trinity
@@ -46,7 +46,7 @@
%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
+%global _disable_ld_no_undefined 1
Name: trinity-%{tde_pkg}
@@ -96,35 +96,75 @@ BuildRequires: brp-check-trinity
BuildRequires: fontconfig-devel
BuildRequires: libart_lgpl-devel
-BuildRequires: libtiff-devel
-BuildRequires: libjpeg-devel
-BuildRequires: ImageMagick-devel
BuildRequires: zlib-devel
-BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: gettext-devel
BuildRequires: mysql-devel
BuildRequires: perl
BuildRequires: doxygen
BuildRequires: aspell-devel
-BuildRequires: libxslt-devel
-BuildRequires: OpenEXR-devel
-BuildRequires: libexif-devel
BuildRequires: readline-devel
-# PYTHON support
-%if 0%{?sle_version} >= 150400
-%define with_python 0
+# EXIF support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}exif-devel
+%else
+BuildRequires: libexif-devel
+%endif
+
+# IMAGEMAGICK support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}magick-devel
+%else
+BuildRequires: ImageMagick-devel
+%endif
+
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
+
+# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
+BuildRequires: openssl-devel
+%endif
+
+# OPENEXR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openexr-devel
%else
-%define with_python 1
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
+BuildRequires: OpenEXR-devel
+%endif
+
+# TIFF support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}tiff-devel
%else
-%global python python
+BuildRequires: libtiff-devel
%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
+BuildRequires: libxslt-devel
+%endif
+
+# PYTHON support
+# lib/kross/configure.in.in :
+# WARNING: Building Kross python plugin is now prohibited at all times,
+# because it is not compatible with Python >= 3.
+%define with_python 0
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%if 0%{?with_python}
BuildRequires: %{python}
BuildRequires: %{python}-devel
%endif
@@ -167,10 +207,10 @@ BuildRequires: freetype-devel
%endif
# LIBPNG support
-%if 0%{?mgaversion}
+%if 0%{?mdkver} || 0%{?mgaversion}
BuildRequires: %{_lib}png-devel
%endif
-%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
+%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
BuildRequires: %{_lib}png15-devel
%endif
%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
@@ -184,9 +224,13 @@ BuildRequires: libpng-devel
BuildRequires: GraphicsMagick >= 1.1.0
%endif
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}graphicsmagick-devel
+%else
BuildRequires: GraphicsMagick-devel >= 1.1.0
%endif
%endif
+%endif
# UTEMPTER support
%if 0%{?suse_version}
@@ -223,10 +267,15 @@ BuildRequires: trinity-poppler-devel >= 0.12
%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0
%define with_postgresql 1
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql-server-devel
%else
BuildRequires: postgresql-devel
+%endif
+%if 0%{?mdkver}
+BuildRequires: %{_lib}pqxx-devel
+%else
BuildRequires: libpqxx-devel
%endif
%endif
@@ -235,22 +284,34 @@ Obsoletes: trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release}
# WPD support
# For chalk and filters
+%if 0%{?mdkver}
+BuildRequires: %{_lib}wpd-devel
+%else
BuildRequires: libwpd-devel
+%endif
Obsoletes: trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
# WV2 support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver} < 24090000
BuildRequires: %{_lib}wv2-devel
%endif
+%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: wv2-devel
%endif
# MESA support
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}mesagl1-devel
+%if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
+BuildRequires: %{_lib}mesagl-devel
+%endif
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: %{_lib}mesaglu1-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
@@ -260,11 +321,6 @@ BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
-# OPENJPEG
-%if 0%{?mgaversion} || 0%{?mdkversion}
-#BuildRequires: %{_lib}openjpeg-devel
-%endif
-
# LIBXI support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xi-devel
@@ -394,6 +450,10 @@ Requires: perl
%{tde_tdelibdir}/krossruby.*
%endif
%endif
+%{tde_mandir}/man1/koconverter.1*
+%{tde_mandir}/man1/koscript.1*
+%{tde_mandir}/man1/koshell.1*
+%{tde_mandir}/man1/kthesaurus.1*
##########
@@ -430,6 +490,7 @@ License: LGPLv2+
%{tde_libdir}/libkrossapi.so.*
%{tde_libdir}/libkrossmain.so.*
%endif
+%{tde_mandir}/man1/kspread.1*
##########
@@ -475,6 +536,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/templates/TextDocument.desktop
%{tde_datadir}/templates/.source/TextDocument.kwt
%{tde_tdeappdir}/*kword.desktop
+%{tde_mandir}/man1/kword.1*
##########
@@ -537,6 +599,8 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/templates/Presentation.desktop
%{tde_datadir}/templates/.source/Presentation.kpt
%{tde_tdeappdir}/*kpresenter.desktop
+%{tde_mandir}/man1/kprconverter.pl.1*
+%{tde_mandir}/man1/kpresenter.1*
##########
@@ -561,6 +625,7 @@ Obsoletes: kivio < %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/config.kcfg/kivio.kcfg
%{tde_datadir}/services/kivio*.desktop
%{tde_tdeappdir}/*kivio.desktop
+%{tde_mandir}/man1/kivio.1*
##########
@@ -587,6 +652,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/templates/Illustration.desktop
%{tde_datadir}/templates/.source/Illustration.karbon
%{tde_tdeappdir}/*karbon.desktop
+%{tde_mandir}/man1/karbon.1*
##########
@@ -616,6 +682,8 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/services/kugar*.desktop
%{tde_tdeappdir}/*kugar.desktop
%{tde_tdeappdir}/*kudesigner.desktop
+%{tde_mandir}/man1/kudesigner.1*
+%{tde_mandir}/man1/kugar.1*
##########
@@ -721,6 +789,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/apps/kchart/
%{tde_datadir}/services/kchart*.desktop
%{tde_tdeappdir}/*kchart.desktop
+%{tde_mandir}/man1/kchart.1*
##########
@@ -761,6 +830,7 @@ Requires: dejavu
%{tde_datadir}/apps/kformula/
%{tde_datadir}/services/kformula*.desktop
%{tde_tdeappdir}/*kformula.desktop
+%{tde_mandir}/man1/kformula.1*
##########
@@ -1065,8 +1135,12 @@ This package is part of the TDE Office Suite.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?mdkver}
+touch config.h.in
+%endif
+
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -1115,6 +1189,12 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
%{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
%{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
+%if %{?with_postgresql}
+# Ensure PQXX was detected
+
+
+%endif
+
%__make %{?_smp_mflags} || %__make
@@ -1122,11 +1202,6 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
-#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do
-# mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/;
-#done
-
# Fix desktop icon location
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}"
diff --git a/redhat/applications/koffice/koshell.png b/redhat/applications/office/koffice/koshell.png
index c66ef99e8..c66ef99e8 100644
--- a/redhat/applications/koffice/koshell.png
+++ b/redhat/applications/office/koffice/koshell.png
Binary files differ
diff --git a/redhat/applications/koffice/trinity-koffice-rpmlintrc b/redhat/applications/office/koffice/trinity-koffice-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/koffice/trinity-koffice-rpmlintrc
+++ b/redhat/applications/office/koffice/trinity-koffice-rpmlintrc
diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec
index 39f4382f6..828963b48 100644
--- a/redhat/applications/kpilot/kpilot.spec
+++ b/redhat/applications/office/kpilot/kpilot.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kpilot
%define tde_prefix /opt/trinity
@@ -63,22 +63,34 @@ BuildRequires: desktop-file-utils
BuildRequires: trinity-tdepim-devel >= %{tde_version}
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ICAL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}ical-devel
+%else
BuildRequires: libical-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -130,7 +142,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -140,9 +152,9 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
- -DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
@@ -168,7 +180,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Unwanted files
%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/
+%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{tde_includedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/
# Updates applications categories for openSUSE
%if 0%{?suse_version}
diff --git a/redhat/applications/kpilot/trinity-kpilot-rpmlintrc b/redhat/applications/office/kpilot/trinity-kpilot-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kpilot/trinity-kpilot-rpmlintrc
+++ b/redhat/applications/office/kpilot/trinity-kpilot-rpmlintrc
diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec
index 76e327043..e51a25226 100644
--- a/redhat/applications/tellico/tellico.spec
+++ b/redhat/applications/office/tellico/tellico.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 23
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 9
%define _hardened_ldflags %nil
%endif
@@ -13,7 +13,7 @@
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
+# license that confolrms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tellico
%define tde_prefix /opt/trinity
@@ -69,7 +69,7 @@ BuildRequires: trinity-libpoppler-tqt-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -110,7 +110,12 @@ BuildRequires: %{_lib}yaz-devel
BuildRequires: libxml2-devel
# XSLT support
-BuildRequires: libxslt-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
+BuildRequires: libxslt-devel
+%endif
+
%if 0%{?rhel} == 4
# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
BuildRequires: libgcrypt-devel
@@ -139,34 +144,38 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
-
-# PYTHON support
-%if 0%{?sle_version} >= 150400
-%define python python3
-%define __python %__python3
-%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
%else
-%global python python
-%endif
+%define libattr_devel libattr-devel
%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires: %{libattr_devel}
+
+# PYTHON support
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
@@ -197,6 +206,7 @@ It also makes it easy for other softwares to use the Tellico data.
%{tde_bindir}/tellico
%{tde_datadir}/applications
%config(noreplace) %{tde_confdir}/tellicorc
+%{tde_mandir}/man1/tellico.1*
##########
@@ -229,6 +239,9 @@ documentation.
%{tde_datadir}/apps/tellico/*.png
%{tde_datadir}/apps/tellico/entry-templates
%{tde_datadir}/apps/tellico/*.py*
+%if 0%{?rhel} == 7 || 0%{?mgaversion} == 8
+%{tde_datadir}/apps/tellico/__pycache__/
+%endif
%{tde_datadir}/apps/tellico/pics
%{tde_datadir}/apps/tellico/report-templates
%{tde_datadir}/apps/tellico/tellico.dtd
@@ -297,7 +310,7 @@ fi
"src/fetch/scripts/ministerio_de_cultura.py" \
"src/fetch/scripts/fr.allocine.py" \
"src/translators/griffith2tellico.py" \
- -e "s|/usr/bin/env python|/usr/bin/env python2|"
+ -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
%endif
@@ -306,7 +319,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -317,6 +330,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kima/kima.spec b/redhat/applications/settings/kima/kima.spec
index 279725f90..b5dcaed59 100644
--- a/redhat/applications/kima/kima.spec
+++ b/redhat/applications/settings/kima/kima.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kima
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -80,14 +80,22 @@ BuildRequires: brp-check-trinity
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -124,6 +132,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec
index 913ff3ed4..0fae4bcdc 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/settings/kiosktool/kiosktool.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kiosktool
%define tde_prefix /opt/trinity
@@ -64,18 +64,26 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -112,7 +120,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -122,6 +130,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec
index 0f6c24db8..81cea639a 100644
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kkbswitch
%define tde_prefix /opt/trinity
@@ -61,21 +61,33 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# XKBFILES support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}xkbfile-devel
+%else
BuildRequires: libxkbfile-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -119,7 +131,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -129,6 +141,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec
index c62c09936..00dc8836c 100644
--- a/redhat/applications/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg klcddimmer
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -69,7 +69,11 @@ BuildRequires: pkgconfig
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -104,7 +108,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -114,6 +118,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
index 7998140e5..16d3e34ca 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall.spec
+++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kmyfirewall
%define tde_prefix /opt/trinity
@@ -146,6 +146,7 @@ university etc.)
%{tde_datadir}/mimelnk/application/kmfrs.desktop
%{tde_datadir}/services/kmf*.desktop
%{tde_datadir}/servicetypes/kmf*.desktop
+%{tde_mandir}/man1/kmyfirewall.1*
##########
@@ -177,7 +178,7 @@ Requires: %{name} = %{version}-%{release}
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc b/redhat/applications/settings/kmyfirewall/trinity-kmyfirewall-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc
+++ b/redhat/applications/settings/kmyfirewall/trinity-kmyfirewall-rpmlintrc
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
new file mode 100644
index 000000000..ccacc149f
--- /dev/null
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -0,0 +1,385 @@
+#
+# spec file for package tde-guidance (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.2
+%endif
+%define tde_pkg tde-guidance
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define __arch_install_post %{nil}
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.8.0svn20080103
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: A collection of system administration tools for Trinity
+Group: Applications/Utilities
+URL: http://www.simonzone.com/software/guidance
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1: trinity-%{tde_pkg}-rpmlintrc
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
+BuildRequires: trinity-tde-cmake >= %{tde_version}
+BuildRequires: trinity-pytdeextensions
+BuildRequires: trinity-libpythonize0-devel
+BuildRequires: trinity-pytde
+BuildRequires: chrpath
+
+BuildRequires: libtool
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# SIP support
+BuildRequires: sip4-tqt-devel >= 4.10.5
+Requires: sip4-tqt >= 4.10.5
+
+# PYTHON-QT support
+BuildRequires: pytqt-devel
+BuildRequires: trinity-pytde-devel
+BuildRequires: trinity-pytqt-tools
+
+# XSCREENSAVER support
+# RHEL 4: disabled
+# RHEL 6: available in EPEL
+# RHEL 7: available in NUX
+# RHEL 8: available in EPEL
+# RHEL 9: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+BuildRequires: xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires: xscreensaver-extras-base
+%endif
+BuildRequires: xscreensaver-gl-base
+BuildRequires: xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-data
+BuildRequires: xscreensaver-data-extra
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xscrnsaver-devel
+%else
+BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+%if 0%{?pclinuxos} == 0
+BuildRequires: xscreensaver-extrusion
+%endif
+BuildRequires: xscreensaver-gl
+%endif
+%endif
+
+# PYTHON support
+%if "%{python}" == ""
+%global python python3
+%endif
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
+
+Requires: pytqt
+Requires: trinity-pytde
+Requires: trinity-pytdeextensions
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+Requires: hwdata
+%endif
+
+Requires: %{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# POWERMANAGER support (requires HAL)
+#define with_powermanager 1
+Obsoletes: trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes: trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+Guidance currently consists of four programs designed to help you
+look after your system:
+ o userconfig - User and Group administration
+ o serviceconfig - Service/daemon administration
+ o mountconfig - Disk and filesystem administration
+
+These tools are available in Trinity Control Center, System Settings
+or can be run as standalone applications.
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING README TODO
+%{tde_bindir}/mountconfig
+%{tde_bindir}/serviceconfig
+%{tde_bindir}/userconfig
+%attr(0644,root,root) %{tde_tdelibdir}/*.so
+%attr(0644,root,root) %{tde_tdelibdir}/*.la
+%{tde_datadir}/apps/guidance/
+%{tde_tdeappdir}/*.desktop
+%{tde_datadir}/icons/crystalsvg/*/*/*.png
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitelib}/tde-guidance/SMBShareSelectDialog.py*
+%{python_sitelib}/tde-guidance/SimpleCommandRunner.py*
+%{python_sitelib}/tde-guidance/fuser.py*
+%{python_sitelib}/tde-guidance/fuser_ui.py*
+%{python_sitelib}/tde-guidance/mountconfig.py*
+%{python_sitelib}/tde-guidance/serviceconfig.py*
+%{python_sitelib}/tde-guidance/sizeview.py*
+%{python_sitelib}/tde-guidance/unixauthdb.py*
+%{python_sitelib}/tde-guidance/userconfig.py*
+%if 0%{?rhel} == 7
+%{python_sitelib}/tde-guidance/__pycache__/SMBShareSelectDialog.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/SimpleCommandRunner.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/fuser.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/fuser_ui.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/mountconfig.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/serviceconfig.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/sizeview.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/unixauthdb.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/userconfig.*.pyc
+%endif
+%else
+%pycached %{python_sitelib}/tde-guidance/SMBShareSelectDialog.py
+%pycached %{python_sitelib}/tde-guidance/SimpleCommandRunner.py
+%pycached %{python_sitelib}/tde-guidance/fuser.py
+%pycached %{python_sitelib}/tde-guidance/fuser_ui.py
+%pycached %{python_sitelib}/tde-guidance/mountconfig.py
+%pycached %{python_sitelib}/tde-guidance/serviceconfig.py
+%pycached %{python_sitelib}/tde-guidance/sizeview.py
+%pycached %{python_sitelib}/tde-guidance/unixauthdb.py
+%pycached %{python_sitelib}/tde-guidance/userconfig.py
+%endif
+
+# Files from powermanager
+%if 0%{?with_powermanager}
+%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
+%exclude %{tde_datadir}/apps/guidance/pics/processor.png
+%endif
+
+%{tde_tdedocdir}/HTML/en/tde-guidance/
+%{tde_mandir}/man1/mountconfig-trinity.1*
+%{tde_mandir}/man1/serviceconfig-trinity.1*
+%{tde_mandir}/man1/userconfig-trinity.1*
+
+##########
+
+%package backends
+Group: Applications/Utilities
+Summary: collection of system administration tools for GNU/Linux [Trinity]
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+Requires: hwdata
+%endif
+Requires: %{python}
+
+Obsoletes: trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description backends
+This package contains the platform neutral backends used in the
+Guidance configuration tools.
+
+%files backends
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/tde-guidance
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitelib}/tde-guidance/MicroHAL.py*
+%if 0%{?rhel} == 7
+%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc
+%endif
+%else
+%pycached %{python_sitelib}/tde-guidance/MicroHAL.py
+%endif
+
+##########
+
+%if 0%{?with_powermanager}
+
+%package powermanager
+Group: Applications/Utilities
+Summary: HAL based power manager applet [Trinity]
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: hal
+
+Obsoletes: trinity-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-guidance-powermanager = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if "%{tde_prefix}" == "/usr"
+Conflicts: guidance-power-manager
+Conflicts: kde-guidance-powermanager
+%endif
+
+%description powermanager
+A power management applet to indicate battery levels and perform hibernate or
+suspend using HAL.
+
+%files powermanager
+%defattr(-,root,root,-)
+%{tde_bindir}/guidance-power-manager
+%if 0%{?mdkver} ||0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitelib}/tde-guidance/MicroHAL.py*
+%{python_sitelib}/tde-guidance/guidance-power-manager.py*
+%{python_sitelib}/tde-guidance/powermanage.py*
+%{python_sitelib}/tde-guidance/gpmhelper.py*
+%{python_sitelib}/tde-guidance/powermanager_ui.py*
+%{python_sitelib}/tde-guidance/guidance_power_manager_ui.py*
+%{python_sitelib}/tde-guidance/notify.py*
+%{python_sitelib}/tde-guidance/tooltip.py*
+%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/guidance-power-manager.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/powermanage.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/gpmhelper.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/powermanager_ui.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/guidance_power_manager_ui.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/notify.*.pyc
+%{python_sitelib}/tde-guidance/__pycache__/tooltip.*.pyc
+%else
+%pycached %{python_sitelib}/tde-guidance/MicroHAL.py
+%pycached %{python_sitelib}/tde-guidance/guidance-power-manager.py
+%pycached %{python_sitelib}/tde-guidance/powermanage.py
+%pycached %{python_sitelib}/tde-guidance/gpmhelper.py
+%pycached %{python_sitelib}/tde-guidance/powermanager_ui.py
+%pycached %{python_sitelib}/tde-guidance/guidance_power_manager_ui.py
+%pycached %{python_sitelib}/tde-guidance/notify.py
+%pycached %{python_sitelib}/tde-guidance/tooltip.py
+%endif
+%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%{tde_datadir}/apps/guidance/pics/battery*.png
+%{tde_datadir}/apps/guidance/pics/processor.png
+%{tde_datadir}/autostart/guidance-power-manager.desktop
+
+%endif
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
+%__sed -i "userconfig/unixauthdb.py" \
+ -e "s|self.first_uid = .*|self.first_uid = 500|" \
+ -e "s|self.first_gid = .*|self.first_gid = 500|"
+%endif
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc b/redhat/applications/settings/tde-guidance/trinity-tde-guidance-rpmlintrc
index bd7a50a17..bd7a50a17 100644
--- a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc
+++ b/redhat/applications/settings/tde-guidance/trinity-tde-guidance-rpmlintrc
diff --git a/redhat/applications/tde-systemsettings/tde-settings-laptops.directory b/redhat/applications/settings/tde-systemsettings/tde-settings-laptops.directory
index d37d9ba13..d37d9ba13 100644
--- a/redhat/applications/tde-systemsettings/tde-settings-laptops.directory
+++ b/redhat/applications/settings/tde-systemsettings/tde-settings-laptops.directory
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
index c51e46f4c..39cf4c8dc 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tde-systemsettings
%define tde_prefix /opt/trinity
@@ -69,7 +69,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -110,7 +110,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -121,6 +121,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
index b8e37c2c5..78b5236f7 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdenetworkmanager
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -98,7 +98,7 @@ Requires: NetworkManager-gnome
Requires: networkmanager
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} != 8
+%if 0%{?mgaversion} && 0%{?mgaversion} <= 7
BuildRequires: %{_lib}nm-util-devel
%endif
%endif
@@ -107,42 +107,62 @@ BuildRequires: %{_lib}nm-util-devel
%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
BuildRequires: NetworkManager-libnm-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}nm-devel
+%else
BuildRequires: NetworkManager-glib-devel
%endif
%endif
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: NetworkManager-devel
Requires: NetworkManager
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# DBUS support
BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -209,7 +229,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -219,6 +239,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc b/redhat/applications/settings/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
index 8668d5e81..8668d5e81 100644
--- a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
+++ b/redhat/applications/settings/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec
index 89ffa7add..e14e40149 100644
--- a/redhat/applications/tdesudo/tdesudo.spec
+++ b/redhat/applications/settings/tdesudo/tdesudo.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdesudo
%define tde_prefix /opt/trinity
@@ -60,19 +60,27 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -113,7 +121,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -123,6 +131,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
index 823f48b66..b60b75b61 100644
--- a/redhat/applications/wlassistant/wlassistant.spec
+++ b/redhat/applications/settings/wlassistant/wlassistant.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg wlassistant
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -96,30 +96,25 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# PYTHON support
-%if 0%{?sle_version} >= 150400
-%define python python3
-%define __python %__python3
-%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -152,7 +147,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -162,6 +157,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec
index 09b73918d..b9278b00a 100644
--- a/redhat/applications/dolphin/dolphin.spec
+++ b/redhat/applications/system/dolphin/dolphin.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg dolphin
%define tde_prefix /opt/trinity
@@ -62,19 +62,27 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -119,6 +127,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/system/katapult/katapult.spec
index 456a9958b..ec9756fd2 100644
--- a/redhat/applications/katapult/katapult.spec
+++ b/redhat/applications/system/katapult/katapult.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg katapult
%define tde_prefix /opt/trinity
@@ -61,18 +61,26 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -120,6 +128,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec
index 3e5c06b1b..849735a3c 100644
--- a/redhat/applications/kbfx/kbfx.spec
+++ b/redhat/applications/system/kbfx/kbfx.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kbfx
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -82,7 +82,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -91,10 +91,18 @@ BuildRequires: gamin-devel
BuildRequires: pcre-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -137,7 +145,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -147,6 +155,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -227,6 +236,7 @@ export PATH="%{tde_bindir}:${PATH}"
%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo
%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo
%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kbfxconfigapp.mo
%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec
index bd0a90c70..fcf85ed7d 100644
--- a/redhat/applications/kcmautostart/kcmautostart.spec
+++ b/redhat/applications/system/kcmautostart/kcmautostart.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kcmautostart
%define tde_prefix /opt/trinity
@@ -61,18 +61,26 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -119,6 +127,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
index 194020fbc..693084f0d 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification.spec
+++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kdbusnotification
%define tde_prefix /opt/trinity
@@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -75,7 +75,11 @@ BuildRequires: brp-check-trinity
%endif
# GTK2 stuff
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk2-devel
+%endif
# DBUS stuff
%if 0%{?suse_version}
@@ -85,13 +89,21 @@ BuildRequires: dbus-glib-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -123,7 +135,7 @@ if [ -r "/usr/include/harfbuzz/hb.h" ]; then
RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -133,6 +145,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec
index 41882f16e..4b892dcf1 100644
--- a/redhat/applications/klamav/klamav.spec
+++ b/redhat/applications/system/klamav/klamav.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.2
%endif
%define tde_pkg klamav
%define tde_prefix /opt/trinity
@@ -58,7 +58,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -67,7 +67,14 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: curl-devel
BuildRequires: gmp-devel
-BuildRequires: sqlite-devel
+
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
+
#BuildRequires: unsermake
# CLAMAV support
@@ -76,7 +83,11 @@ BuildRequires: clamav-devel
Requires: clamav
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -95,7 +106,7 @@ A TDE front-end for the Clam AntiVirus antivirus toolkit.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -105,6 +116,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec
index 29ef60d10..0b8398d96 100644
--- a/redhat/applications/knemo/knemo.spec
+++ b/redhat/applications/system/knemo/knemo.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg knemo
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -89,28 +89,44 @@ Requires: net-tools-deprecated
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# Wireless support
-%define with_wifi 1
+# Wifi support
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
+%define wifi_devel wireless-tools-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires: %{_lib}iw29-devel
+%define wifi_devel %{_lib}iw29-devel
%endif
%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
+%define wifi_devel wireless-tools
%endif
%if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires: libiw-devel
+%define wifi_devel libiw-devel
%endif
+%if 0%{?mdkver}
+%define wifi_devel %nil
+%endif
+%if "%{wifi_devel}" != ""
+%define with_wifi 1
+BuildRequires: %{wifi_devel}
+%endif
+
%description
@@ -141,7 +157,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -151,6 +167,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec
index c6d482b2f..3eccc8401 100644
--- a/redhat/applications/knetload/knetload.spec
+++ b/redhat/applications/system/knetload/knetload.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg knetload
%define tde_prefix /opt/trinity
@@ -61,19 +61,27 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -124,6 +132,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec
index d6dfad2c8..7f8f0a3ce 100644
--- a/redhat/applications/knetstats/knetstats.spec
+++ b/redhat/applications/system/knetstats/knetstats.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg knetstats
%define tde_prefix /opt/trinity
@@ -61,19 +61,27 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -109,7 +117,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -119,6 +127,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec
index 4d5338bc0..36cc07ac7 100644
--- a/redhat/applications/kooldock/kooldock.spec
+++ b/redhat/applications/system/kooldock/kooldock.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kooldock
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -71,10 +71,18 @@ BuildRequires: libtool
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -118,7 +126,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -128,6 +136,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -161,7 +170,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING TODO
%{tde_bindir}/kooldock
%{tde_datadir}/apps/kooldock/
%{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png
diff --git a/redhat/applications/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec
index cf314c68f..e07247721 100644
--- a/redhat/applications/krusader/krusader.spec
+++ b/redhat/applications/system/krusader/krusader.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg krusader
%define tde_prefix /opt/trinity
@@ -110,7 +110,7 @@ great on your desktop.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -169,6 +169,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%{tde_tdeappdir}/krusader.desktop
%{tde_tdeappdir}/krusader_root-mode.desktop
%{tde_datadir}/apps/krusader
+%{tde_datadir}/apps/tdeconf_update/krusader_tqt_selection.upd
%{tde_datadir}/icons/crystalsvg/*/apps/*.png
%{tde_datadir}/icons/locolor/*/apps/*.png
%{tde_datadir}/services/krarc.protocol
diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec
index 3889525f7..ef3ca8ff9 100644
--- a/redhat/applications/kshutdown/kshutdown.spec
+++ b/redhat/applications/system/kshutdown/kshutdown.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kshutdown
%define tde_prefix /opt/trinity
@@ -60,19 +60,27 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -115,7 +123,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -125,6 +133,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec
index 412aab89d..6af7a8049 100644
--- a/redhat/applications/ksystemlog/ksystemlog.spec
+++ b/redhat/applications/system/ksystemlog/ksystemlog.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg ksystemlog
%define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -114,6 +114,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec
index 14d1ae3bd..74a5caa52 100644
--- a/redhat/applications/kvkbd/kvkbd.spec
+++ b/redhat/applications/system/kvkbd/kvkbd.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kvkbd
%define tde_prefix /opt/trinity
@@ -60,19 +60,27 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -108,7 +116,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -118,6 +126,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
index 4bf776156..790250940 100644
--- a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec
+++ b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
@@ -17,7 +17,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.0.11
+%define tde_version 14.1.2
%endif
%define tde_pkg polkit-agent-tde
%define tde_prefix /opt/trinity
@@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: libpolkit-tqt-devel
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -89,7 +89,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -99,6 +99,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec
index 1578431a9..0bb7cda1f 100644
--- a/redhat/applications/smartcardauth/smartcardauth.spec
+++ b/redhat/applications/system/smartcardauth/smartcardauth.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg smartcardauth
%define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -163,7 +163,7 @@ in addition to the PKCS certificate functionality
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -173,6 +173,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
diff --git a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc b/redhat/applications/system/smartcardauth/trinity-smartcardauth-rpmlintrc
index 7dc0bac20..7dc0bac20 100644
--- a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc
+++ b/redhat/applications/system/smartcardauth/trinity-smartcardauth-rpmlintrc
diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/system/tastymenu/tastymenu.spec
index 59e0991ab..1956800a0 100644
--- a/redhat/applications/tastymenu/tastymenu.spec
+++ b/redhat/applications/system/tastymenu/tastymenu.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tastymenu
%define tde_prefix /opt/trinity
@@ -62,19 +62,27 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -107,7 +115,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -117,6 +125,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/system/tdebluez/tdebluez.spec b/redhat/applications/system/tdebluez/tdebluez.spec
new file mode 100644
index 000000000..7bffd6839
--- /dev/null
+++ b/redhat/applications/system/tdebluez/tdebluez.spec
@@ -0,0 +1,258 @@
+#
+# spec file for package tdebluez (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.2
+%endif
+%define tde_pkg tdebluez
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 1.0.8
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: TDE Bluetooth Framework
+Group: Applications/Multimedia
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
+
+BuildRequires: trinity-tde-cmake >= %{tde_version}
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
+
+# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
+BuildRequires: libacl-devel
+%endif
+
+# IDN support
+BuildRequires: libidn-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+
+%description
+The TDE Bluetooth Framework is a set of tools built on top of Linux' Bluetooth
+stack BlueZ5. It provides easy access to the most common Bluetooth profiles and
+makes data exchange with Bluetooth devices like phones and PDAs as
+straightforward as possible.
+
+Features:
+* tdebluez -- a tray applet to handle incoming inquiries and control
+ adapters and devices
+* tdebluezauth -- authentication agent
+* tdeioclient -- cli to obex
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/tdebluez
+%{tde_bindir}/tdebluezauth
+%{tde_bindir}/tdebluezioclient
+%{tde_libdir}/libtdeinit_tdebluez.so
+%{tde_libdir}/libtdeinit_tdebluez.la
+%{tde_tdelibdir}/tdebluez.so
+%{tde_tdelibdir}/tdebluez.la
+%{tde_tdelibdir}/tdeio_bluetooth.so
+%{tde_tdelibdir}/tdeio_bluetooth.la
+%{tde_tdelibdir}/tdeio_obex.so
+%{tde_tdelibdir}/tdeio_obex.la
+%{tde_tdedocdir}/HTML/*
+%{tde_datadir}/apps/tdebluez/
+%{tde_tdeappdir}/tdebluez.desktop
+%{tde_tdeappdir}/tdebluezauth.desktop
+%{tde_datadir}/autostart/tdebluez.autostart.desktop
+%{tde_datadir}/icons/hicolor/*/apps/tdebluez.png
+%{tde_datadir}/icons/hicolor/scalable/apps/tdebluez.svgz
+%{tde_datadir}/mimelnk/bluetooth/*
+%{tde_datadir}/services/bluetooth.protocol
+%{tde_datadir}/services/obexftp.protocol
+%{tde_datadir}/services/obexopp.protocol
+%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/bluetooth_sidebarentry.desktop
+%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/obex_sidebarentry.desktop
+%{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.tdebluez.conf
+
+
+##########
+
+%package -n trinity-libtdebluez
+Summary: Bluetooth library for TDE
+
+%description -n trinity-libtdebluez
+This package is part of the TDE Bluetooth Framework.
+It contains a Bluetooth library for TDE.
+
+See the 'trinity-tdebluez' package for more informations.
+
+%files -n trinity-libtdebluez
+%defattr(-,root,root,-)
+%{tde_libdir}/libtdebluez.la
+%{tde_libdir}/libtdebluez.so.*
+
+##########
+
+%package -n trinity-libtdeobex
+Summary: Obex library for TDE
+
+%description -n trinity-libtdeobex
+This package is part of the TDE Bluetooth Framework.
+It contains a Bluetooth library for TDE.
+
+See the 'trinity-tdebluez' package for more informations.
+
+%files -n trinity-libtdeobex
+%defattr(-,root,root,-)
+%{tde_libdir}/libtdeobex.la
+%{tde_libdir}/libtdeobex.so.*
+
+##########
+
+%package -n trinity-libtdebluez-devel
+Summary: Development files for libtdebluez
+
+%description -n trinity-libtdebluez-devel
+This package is part of the TDE Bluetooth Framework.
+It contains the development files for libtdebluez.
+
+See the 'trinity-tdebluez' package for more informations.
+
+%files -n trinity-libtdebluez-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/tdebluez/*
+%{tde_libdir}/libtdebluez.so
+%{tde_datadir}/cmake/libtdebluez.cmake
+
+##########
+
+%package -n trinity-libtdeobex-devel
+Summary: Development files for libtdeobex
+
+%description -n trinity-libtdeobex-devel
+This package is part of the TDE Bluetooth Framework.
+It contains the development files for libtdeobex.
+
+See the 'trinity-tdebluez' package for more informations.
+
+%files -n trinity-libtdeobex-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/tdeobex/*
+%{tde_libdir}/libtdeobex.so
+%{tde_datadir}/cmake/libtdeobex.cmake
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec
index 2a88d64c2..811015d8d 100644
--- a/redhat/applications/tdedocker/tdedocker.spec
+++ b/redhat/applications/system/tdedocker/tdedocker.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdedocker
%define tde_prefix /opt/trinity
@@ -61,21 +61,33 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# XKBFILES support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}xkbfile-devel
+%else
BuildRequires: libxkbfile-devel
+%endif
# XMU support
%if 0%{?suse_version} == 1140
@@ -85,7 +97,7 @@ BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
@@ -136,7 +148,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -146,6 +158,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -189,7 +202,6 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdeappdir}/tdedocker.desktop
%{tde_datadir}/apps/tdedocker/
%{tde_datadir}/icons/hicolor/*/apps/tdedocker.png
-%{tde_datadir}/apps/tdedocker/icons/question.png
%{tde_mandir}/man1/tdedocker.1*
diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec
index 461b1c98e..ebbce92b3 100644
--- a/redhat/applications/tdepowersave/tdepowersave.spec
+++ b/redhat/applications/system/tdepowersave/tdepowersave.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdepowersave
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63
BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -82,12 +82,17 @@ BuildRequires: brp-check-trinity
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# XSCREENSAVER support
# Disabled on RHEL4
# RHEL 8: available in EPEL
+# RHEL 9: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?rhel} == 5
@@ -110,20 +115,28 @@ BuildRequires: xscreensaver
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Obsoletes: trinity-kpowersave < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -178,7 +191,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -188,6 +201,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -232,7 +246,7 @@ fi
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING TODO
%{tde_bindir}/tdepowersave
%{tde_libdir}/libtdeinit_tdepowersave.la
%{tde_libdir}/libtdeinit_tdepowersave.so
diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
index 191e9949e..93761e347 100644
--- a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
+++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.1.2
%endif
%define tde_pkg tdesshaskpass
%define tde_prefix /opt/trinity
@@ -60,19 +60,27 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -120,6 +128,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -144,12 +153,14 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING README.md
%{tde_bindir}/*
diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec
index 2dd8f3cf9..bacb6c882 100644
--- a/redhat/applications/yakuake/yakuake.spec
+++ b/redhat/applications/system/yakuake/yakuake.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg yakuake
%define tde_prefix /opt/trinity
@@ -60,19 +60,27 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -105,7 +113,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -115,6 +123,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec
deleted file mode 100644
index 202b88003..000000000
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ /dev/null
@@ -1,462 +0,0 @@
-#
-# spec file for package tde-guidance (version R14)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
-%endif
-%define tde_pkg tde-guidance
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define __arch_install_post %{nil}
-
-
-Name: trinity-%{tde_pkg}
-Epoch: %{tde_epoch}
-Version: 0.8.0svn20080103
-Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary: A collection of system administration tools for Trinity
-Group: Applications/Utilities
-URL: http://www.simonzone.com/software/guidance
-
-%if 0%{?suse_version}
-License: GPL-2.0+
-%else
-License: GPLv2+
-%endif
-
-#Vendor: Trinity Desktop
-#Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1: trinity-%{tde_pkg}-rpmlintrc
-
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: trinity-pytdeextensions
-BuildRequires: trinity-libpythonize0-devel
-BuildRequires: trinity-python-trinity
-BuildRequires: chrpath
-
-BuildRequires: autoconf automake libtool m4
-BuildRequires: gcc-c++
-BuildRequires: pkgconfig
-BuildRequires: fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires: update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires: brp-check-trinity
-%endif
-
-# SIP support
-BuildRequires: sip4-tqt-devel >= 4.10.5
-Requires: sip4-tqt >= 4.10.5
-
-# PYTHON-QT support
-BuildRequires: python-tqt-devel
-BuildRequires: trinity-python-trinity-devel
-BuildRequires: trinity-pytqt-tools
-
-# LIBXXF86VM support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xxf86vm-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires: libXxf86vm-devel
-%endif
-
-# XSCREENSAVER support
-# RHEL 4: disabled
-# RHEL 6: available in EPEL
-# RHEL 7: available in NUX
-# RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires: libXScrnSaver-devel
-BuildRequires: xscreensaver
-BuildRequires: xscreensaver-base
-BuildRequires: xscreensaver-extras
-%if 0%{?fedora}
-BuildRequires: xscreensaver-extras-base
-%endif
-BuildRequires: xscreensaver-gl-base
-BuildRequires: xscreensaver-gl-extras
-%endif
-
-%if 0%{?suse_version}
-BuildRequires: libXScrnSaver-devel
-BuildRequires: xscreensaver
-BuildRequires: xscreensaver-data
-BuildRequires: xscreensaver-data-extra
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires: %{_lib}xscrnsaver-devel
-%else
-BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-BuildRequires: xscreensaver
-BuildRequires: xscreensaver-base
-%if 0%{?pclinuxos} == 0
-BuildRequires: xscreensaver-extrusion
-%endif
-BuildRequires: xscreensaver-gl
-%endif
-%endif
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires: %{python}
-BuildRequires: %{python}-devel
-
-Requires: python-tqt
-Requires: trinity-python-trinity
-Requires: trinity-pytdeextensions
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires: hwdata
-%endif
-
-Requires: %{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# POWERMANAGER support (requires HAL)
-#define with_powermanager 1
-Obsoletes: trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes: trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-Guidance currently consists of four programs designed to help you
-look after your system:
- o userconfig - User and Group administration
- o serviceconfig - Service/daemon administration
- o mountconfig - Disk and filesystem administration
- o wineconfig - Wine configuration
-
-These tools are available in Trinity Control Center, System Settings
-or can be run as standalone applications.
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-%{tde_bindir}/grubconfig
-%{tde_bindir}/mountconfig
-%{tde_bindir}/serviceconfig
-%{tde_bindir}/userconfig
-%{tde_bindir}/wineconfig
-%attr(0644,root,root) %{tde_tdelibdir}/*.so
-%attr(0644,root,root) %{tde_tdelibdir}/*.la
-%{tde_datadir}/apps/guidance/
-%{tde_tdeappdir}/*.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
-%{python_sitearch}/%{name}/SimpleCommandRunner.py*
-%{python_sitearch}/%{name}/fuser.py*
-%{python_sitearch}/%{name}/fuser_ui.py*
-%{python_sitearch}/%{name}/grubconfig.py*
-%{python_sitearch}/%{name}/mountconfig.py*
-%{python_sitearch}/%{name}/serviceconfig.py*
-%{python_sitearch}/%{name}/sizeview.py*
-%{python_sitearch}/%{name}/unixauthdb.py*
-%{python_sitearch}/%{name}/userconfig.py*
-%{python_sitearch}/%{name}/wineconfig.py*
-%{tde_tdedocdir}/HTML/en/guidance/
-
-
-# Files from powermanager
-%if 0%{?with_powermanager}
-%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
-%exclude %{tde_datadir}/apps/guidance/pics/processor.png
-%endif
-
-##########
-
-%package backends
-Group: Applications/Utilities
-Summary: collection of system administration tools for GNU/Linux [Trinity]
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires: hwdata
-%endif
-Requires: %{python}
-
-Obsoletes: trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description backends
-This package contains the platform neutral backends used in the
-Guidance configuration tools.
-
-%files backends
-%defattr(-,root,root,-)
-%dir %{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/drivedetect.py*
-%{python_sitearch}/%{name}/wineread.py*
-%{python_sitearch}/%{name}/winewrite.py*
-%{python_sitearch}/%{name}/xf86misc.py*
-%{python_sitearch}/ixf86misc.so
-
-##########
-
-%if 0%{?with_powermanager}
-
-%package powermanager
-Group: Applications/Utilities
-Summary: HAL based power manager applet [Trinity]
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: hal
-
-Obsoletes: trinity-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: trinity-guidance-powermanager = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if "%{tde_prefix}" == "/usr"
-Conflicts: guidance-power-manager
-Conflicts: kde-guidance-powermanager
-%endif
-
-%description powermanager
-A power management applet to indicate battery levels and perform hibernate or
-suspend using HAL.
-
-%files powermanager
-%defattr(-,root,root,-)
-%{tde_bindir}/guidance-power-manager
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/guidance-power-manager.py*
-%{python_sitearch}/%{name}/powermanage.py*
-%{python_sitearch}/%{name}/gpmhelper.py*
-%{python_sitearch}/%{name}/powermanager_ui.py*
-%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%{python_sitearch}/%{name}/notify.py*
-%{python_sitearch}/%{name}/tooltip.py*
-%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%{tde_datadir}/apps/guidance/pics/battery*.png
-%{tde_datadir}/apps/guidance/pics/processor.png
-%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
-%__sed -i "userconfig/unixauthdb.py" \
- -e "s|self.first_uid = .*|self.first_uid = 500|" \
- -e "s|self.first_gid = .*|self.first_gid = 500|"
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-#export PYTHONPATH=%{python_sitearch}/python-tqt
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-# FTBFS on PCLOS ...
-export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
- export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
- %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g"
-fi
-
-%__python ./setup.py build
-
-
-%install
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-export SIPTQT_DIR="%{python_sitearch}/sip4_tqt"
-export PYTHONPATH="%{python_sitearch}/python-tqt"
-
-# Support for 'sip4-tqt'
-export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
-
-# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-%__python ./setup.py install \
- --prefix=%{tde_prefix} \
- --root=%{buildroot}
-
-# Fix temporary build directories remaining inside .py files
-for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
- %__sed -i "${f}" -e "s|%{buildroot}||g"
-done
-
-##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules)
-# install icons to right place
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
-%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
- %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
-
-# fix binary-or-shlib-defines-rpath
-chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
-
-# fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
-
-# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages)
-%__mkdir_p %{buildroot}%{python_sitearch}/%{name}
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name}
-
-# Generates the startup scripts
-%__rm -f %{buildroot}%{tde_bindir}/*
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
-
-# fix script-not-executable
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
-
-##### BACKENDS INSTALLATION
-
-# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%endif
-
-%if 0%{?with_powermanager}
-##### POWERMANAGER INSTALLATION
-# install icon to right place
-%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
- %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%__install -D -p -m0644 kde/powermanager/pics/*.png \
- %{buildroot}%{tde_datadir}/apps/guidance/pics/
-
-# install desktop file
-%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
- %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-# copy python modules in PYSUPPORT_PATH
-%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
-
-# generate guidance-power-manager script
-cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/sip4-tqt
-%{python_sitearch}/%{name}/guidance-power-manager.py &
-EOF
-chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
-
-# fix script-not-executable
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
-
-%else
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py*
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui
-
-%endif
-
-# Replace all '#!' calls to python with /usr/bin/python
-# and make them executable
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-%define python /usr/bin/python2
-%else
-%define python /usr/bin/python
-%endif
-for i in `find %{buildroot} -type f`; do
- sed '1s,#!.*python[^ ]*\(.*\),#! %python\1,' \
- $i > $i.temp;
- if cmp --quiet $i $i.temp; then
- rm -f $i.temp;
- else
- mv -f $i.temp $i;
- chmod 755 $i;
- echo "fixed interpreter: $i";
- fi;
-done
-
-# Removes useless files
-find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
-find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
new file mode 100644
index 000000000..aa49a5634
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
@@ -0,0 +1,169 @@
+#
+# spec file for package tdeio-appinfo (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.2
+%endif
+%define tde_pkg tdeio-appinfo
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.3
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: TDEIO slave for the appinfo protocol
+Group: Productivity/Networking/Ftp/Clients
+URL: http://lukeplant.me.uk/kio-appinfo/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+
+BuildRequires: trinity-tde-cmake >= %{tde_version}
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
+BuildRequires: libacl-devel
+%endif
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
+BuildRequires: openssl-devel
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+
+%description
+Adds support for the "appinfo:" protocol
+to Konqueror and other TDE applications.
+.
+This enables you to perform appinfo: searches in TDE.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_tdelibdir}/tdeio_appinfo.la
+%{tde_tdelibdir}/tdeio_appinfo.so
+%{tde_datadir}/services/appinfo.protocol
+
+
+%changelog
diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
index d52db658a..f4631631e 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt.spec
+++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeio-apt
%define tde_prefix /opt/trinity
@@ -60,13 +60,17 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -108,7 +112,7 @@ browsing the packages easier. It provides:
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -118,6 +122,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
index efb471c97..8dc6b9097 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec
+++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeio-ftps
%define tde_prefix /opt/trinity
@@ -61,19 +61,27 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -111,7 +119,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -121,6 +129,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
index c8fd9e09d..18dab2b6b 100644
--- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec
+++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeio-gopher
%define tde_prefix /opt/trinity
@@ -61,13 +61,17 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
@@ -107,7 +111,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -117,6 +121,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
index cdbfafeef..c58492e13 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate.spec
+++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeio-locate
%define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -77,20 +77,28 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Obsoletes: trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -123,7 +131,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -133,6 +141,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -155,19 +164,20 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-%find_lang %{tde_pkg}
+%find_lang tdeio_locate
+
%clean
%__rm -rf %{buildroot}
-%files -f %{tde_pkg}.lang
+%files -f tdeio_locate.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING TODO
%{tde_tdelibdir}/tdeio_locate.la
%{tde_tdelibdir}/tdeio_locate.so
-%{tde_tdedocdir}/HTML/en/tdeio-locate/
+%{tde_tdedocdir}/HTML/en/tdeioslave/locate/
%{tde_datadir}/services/locate.protocol
%{tde_datadir}/services/locater.protocol
%{tde_datadir}/services/rlocate.protocol
diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
index c95b32631..5881bdfbe 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword.spec
+++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
@@ -23,7 +23,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeio-sword
%define tde_prefix /opt/trinity
@@ -66,19 +66,27 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -131,6 +139,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop
index 22b716ad5..22b716ad5 100644
--- a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop
diff --git a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop_tdeio b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
index 38fa25d92..38fa25d92 100644
--- a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
index 3509b473d..73a3a7b33 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeio-umountwrapper
%define tde_prefix /opt/trinity
@@ -65,19 +65,27 @@ BuildRequires: desktop-file-utils
Obsoletes: trinity-kio-umountwrapper < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-kio-umountwrapper = %{?epoch:%{epoch}:}%{version}-%{release}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -113,7 +121,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -123,6 +131,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
index 843cd5440..833a7dcd9 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
+++ b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg gtk-qt-engine
%define tde_prefix /opt/trinity
@@ -56,9 +56,6 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1: gtk-qt-engine.rc.sh
-Source2: gtkrc-2.0-kde4
-Source3: gtkrc-2.0-kde-kde4
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -66,7 +63,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -82,9 +79,13 @@ BuildRequires: %{_lib}gtk+2.0-devel
%if 0%{?pclinuxos}
BuildRequires: %{_lib}gtk+2.0_0-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk+2.0-devel
%endif
%endif
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -125,7 +126,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -136,6 +137,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -154,29 +156,20 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-%find_lang gtkqtengine
-
-# Adds TDE's specific GTKRC
-%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh"
-%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4"
-%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4"
+%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
-%files -f gtkqtengine.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING TODO
%{tde_tdelibdir}/kcm_kcmgtk.la
%{tde_tdelibdir}/kcm_kcmgtk.so
-%{tde_appdir}/kcmgtk.desktop
-%dir %{tde_datadir}/apps/kgtk
-%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4
-%{tde_tdedocdir}/HTML/en/kcmgtk/
+%{tde_tdeappdir}/kcmgtk.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/gtk/
# The following files are outside TDE's directory
%dir %{_libdir}/gtk-2.0
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
index e4100aaca..43c565fd1 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec
+++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg gtk3-tqt-engine
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -86,6 +86,34 @@ BuildRequires: gtk+3.0-devel
%description
GTK3 style engine which uses the active TDE style to draw its widgets
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_libdir}/libtqtcairo.so.0
+%{tde_libdir}/libtqtcairo.so.0.0.0
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0
+%dir %{_datadir}/themes/tdegtk
+%dir %{_datadir}/themes/tdegtk/gtk-3.0
+%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css
+
+##########
+
+%package devel
+Summary: Files for the development of applications which will use %{name}
+Group: Development/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+%{summary}.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libtqtcairo.la
+%{tde_libdir}/libtqtcairo.so
+
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -96,78 +124,50 @@ GTK3 style engine which uses the active TDE style to draw its widgets
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if "%_lib" == "lib64"
-%__sed -i "tdegtk/Makefile.am" -e "s|/lib/|/lib64/|g"
-%endif
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if [ -d "/usr/include/atk-1.0" ]; then
- extra_includes="%{_includedir}/atk-1.0:${extra_includes}"
-fi
-if [ -d "/usr/include/gdk-pixbuf-2.0" ]; then
- extra_includes="%{_includedir}/gdk-pixbuf-2.0:${extra_includes}"
-fi
-if [ -d "/usr/include/gtk-3.0" ]; then
- extra_includes="%{_includedir}/gtk-3.0:${extra_includes}"
-fi
-if [ -d "/usr/include/pango-1.0" ]; then
- extra_includes="%{_includedir}/pango-1.0:${extra_includes}"
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
fi
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --docdir=%{tde_tdedocdir} \
- --libdir=%{tde_libdir} \
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- --with-extra-includes=${extra_includes}
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
%clean
%__rm -rf %{buildroot}
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_libdir}/libtqtcairo.la
-%{tde_libdir}/libtqtcairo.so
-%{tde_libdir}/libtqtcairo.so.0
-%{tde_libdir}/libtqtcairo.so.0.0.0
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0
-%dir %{_datadir}/themes/tdegtk
-%dir %{_datadir}/themes/tdegtk/gtk-3.0
-%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css
-
-
%changelog
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
index cff4f8b69..029d46345 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kgtk-qt3
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -84,21 +84,33 @@ BuildRequires: libidn-devel
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
BuildRequires: gtk2-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk+2.0-devel
%endif
+%endif
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -128,7 +140,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -139,6 +151,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
index 8a6c3aeac..1d2ae2a1a 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
+++ b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg ksplash-engine-moodin
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -70,7 +70,11 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -119,7 +123,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -129,6 +133,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -164,9 +169,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%{tde_tdelibdir}/ksplashmoodin.la
%{tde_tdelibdir}/ksplashmoodin.so
-%if "%{?tde_version}" == "14.1.0"
%{tde_datadir}/apps/ksplash/Themes/Architecture/
-%endif
%{tde_datadir}/apps/ksplash/Themes/FingerPrint/
%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/
%{tde_datadir}/services/ksplashmoodin.desktop
diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
index d564e576e..588d43858 100644
--- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
+++ b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg qt4-tqt-theme-engine
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
index 7cab17109..eb1c1224d 100644
--- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tde-style-baghira
%define tde_prefix /opt/trinity
@@ -62,13 +62,19 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-BuildRequires: libjpeg-devel
+BuildRequires: %{libjpeg}-devel
%else
BuildRequires: jpeg-devel
%endif
@@ -92,7 +98,7 @@ Panther and Jaguar looks, and also includes its own 'Baghira' look
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -102,6 +108,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -190,6 +197,8 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_white.png
%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_yellow.png
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo
+%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/baghira-usermanager.mo
+%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/baghira-usermanager.mo
%{tde_mandir}/man1/bab.1*
diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
index 7bb66c619..7bde60350 100644
--- a/redhat/applications/tde-style-domino/tde-style-domino.spec
+++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tde-style-domino
%define tde_prefix /opt/trinity
@@ -62,15 +62,21 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-BuildRequires: libjpeg-devel
+BuildRequires: %{libjpeg}-devel
%else
-BuildRequires: jpeg-devel
+BuildRequires: jpeg-devel
%endif
%description
@@ -88,7 +94,7 @@ of the widgets by customizable color gradients.
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -98,6 +104,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
index 14277f757..8f6d5dbea 100644
--- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
+++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tde-style-ia-ora
%define tde_prefix /opt/trinity
@@ -60,19 +60,27 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: trinity-twin
@@ -96,7 +104,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -106,6 +114,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -144,6 +153,10 @@ fi
%{tde_tdelibdir}/twin_iaora_config.so
%{tde_datadir}/apps/tdestyle/themes/ia_ora.themerc
%{tde_datadir}/apps/twin/iaora.desktop
+%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.la
+%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.so
+%{_datadir}/themes/Ia*
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin_iaora.mo
%changelog
diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
index 629182637..351022128 100644
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
+++ b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tde-style-lipstik
%define tde_prefix /opt/trinity
@@ -65,7 +65,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -84,7 +84,11 @@ BuildRequires: brp-check-trinity
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -111,7 +115,7 @@ Lipstik also provides Lipstik-color-schemes
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -121,6 +125,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
diff --git a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec
new file mode 100644
index 000000000..fe9f3ef40
--- /dev/null
+++ b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec
@@ -0,0 +1,149 @@
+#
+# spec file for package tde-style-polyester (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.2
+%endif
+%define tde_pkg tde-style-polyester
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 1.0.3
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: Domino widget style and twin decoration for TDE
+Group: Graphical desktop/TDE
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires: trinity-tde-cmake >= %{tde_version}
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
+
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+BuildRequires: %{libjpeg}-devel
+%else
+BuildRequires: jpeg-devel
+%endif
+
+%description
+Domino is a style with a soft look. It allows to fine adjust the shininess
+of the widgets by customizable color gradients.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DBUILD_ALL=ON \
+ ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{tde_tdelibdir}/plugins/styles/polyester.la
+%{tde_tdelibdir}/plugins/styles/polyester.so
+%{tde_tdelibdir}/tdestyle_polyester_config.la
+%{tde_tdelibdir}/tdestyle_polyester_config.so
+%{tde_tdelibdir}/twin3_polyester.la
+%{tde_tdelibdir}/twin3_polyester.so
+%{tde_tdelibdir}/twin_polyester_config.la
+%{tde_tdelibdir}/twin_polyester_config.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterBlue.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterEmerald.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterOrangeJuice.kcsrc
+%{tde_datadir}/apps/tdestyle/themes/polyester.themerc
+%{tde_datadir}/apps/twin/polyester.desktop
+
+
+%changelog
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
index 368233282..c6c675070 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
+++ b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tde-style-qtcurve
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -81,17 +81,25 @@ BuildRequires: brp-check-trinity
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Obsoletes: trinity-kde-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -137,7 +145,7 @@ fi
%__rm -f "po/tr.po"
%endif
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -147,6 +155,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec
index 0dcf28d8c..94a76585f 100644
--- a/redhat/applications/tdmtheme/tdmtheme.spec
+++ b/redhat/applications/themes/tdmtheme/tdmtheme.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdmtheme
%define tde_prefix /opt/trinity
@@ -61,19 +61,27 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -120,6 +128,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
index 093d4e599..2397c1ed6 100644
--- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec
+++ b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg twin-style-crystal
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -105,7 +105,7 @@ And it is of course nice to look at. Upstream says:
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -115,6 +115,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -135,13 +136,15 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_tdelibdir}/twin3_crystal.la
diff --git a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
index 47950e707..c522aa406 100644
--- a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec
+++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.1.2
%endif
%define tde_pkg twin-style-dekorator
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -114,6 +114,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
new file mode 100644
index 000000000..6c440c0fe
--- /dev/null
+++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
@@ -0,0 +1,158 @@
+#
+# spec file for package twin-style-fahrenheit (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.2
+%endif
+%define tde_pkg twin-style-fahrenheit
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.1
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: TDE window decoration from SUSE 9.3
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+
+BuildRequires: trinity-tde-cmake >= %{tde_version}
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+
+%description
+This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE.
+
+It features in additon to the original theme several new button
+styles and a changeable titlebar image.
+
+A color scheme for TDE is provided too.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/twin3_fahrenheit.la
+%{tde_tdelibdir}/twin3_fahrenheit.so
+%{tde_datadir}/apps/twin/fahrenheit.desktop
+%{tde_datadir}/apps/twin/fahrenheit/close.png
+%{tde_datadir}/apps/twin/fahrenheit/help.png
+%{tde_datadir}/apps/twin/fahrenheit/maximize.png
+%{tde_datadir}/apps/twin/fahrenheit/minimize.png
+%{tde_datadir}/apps/twin/fahrenheit/minmax.png
+%{tde_datadir}/apps/twin/fahrenheit/sticky.png
+%{tde_datadir}/apps/twin/fahrenheit/unsticky.png
+
+
+%changelog
diff --git a/redhat/applications/kuickshow/kuickshow.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
index d8a94d07c..dc504b67a 100644
--- a/redhat/applications/kuickshow/kuickshow.spec
+++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kuickshow (version R14)
+# spec file for package twin-style-machbunt (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -18,9 +18,9 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
-%define tde_pkg kuickshow
+%define tde_pkg twin-style-machbunt
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -36,9 +36,9 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
-Version: 0.8.13
+Version: 0.1
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary: Quick picture viewer for TDE
+Summary: TDE window decoration from SUSE 9.1/9.2
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
@@ -59,8 +59,9 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -75,26 +76,11 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-# IMLIB1 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: imlib-devel
-%endif
-%if 0%{?mgaversion}
-BuildRequires: imlib1-devel
-%endif
-
-# GIF support
-%if 0%{?suse_version} || 0%{?fedora} >= 28
-BuildRequires: giflib-devel
-%else
-BuildRequires: libungif-devel
-%endif
-
%description
-Kuickshow is a picture viewer for TDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size.
+This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+
+An example color scheme is provided too.
##########
@@ -105,46 +91,51 @@ Clicking on an image shows the image in its normal size.
##########
-
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-final \
- --enable-new-ldflags \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Missing category will make this fail.
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%__make install DESTDIR=%{buildroot} -C build
%clean
@@ -154,15 +145,10 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{tde_bindir}/kuickshow
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/kuickshow/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/libtdeinit_%{tde_pkg}.so
-%{tde_libdir}/*.la
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/kuickshow/
-
+%{tde_tdelibdir}/twin3_MachBunt.la
+%{tde_tdelibdir}/twin3_MachBunt.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc
+%{tde_datadir}/apps/twin/MachBunt.desktop
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin-style-machbunt.mo
%changelog
diff --git a/redhat/applications/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
index c53e0e878..d688430b5 100644
--- a/redhat/applications/twin-style-suse2/twin-style-suse2.spec
+++ b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.1.2
%endif
%define tde_pkg twin-style-suse2
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -102,7 +102,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -112,6 +112,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec
index ecc87ddbb..4e11d387e 100644
--- a/redhat/applications/abakus/abakus.spec
+++ b/redhat/applications/utilities/abakus/abakus.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg abakus
%define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -68,20 +68,28 @@ BuildRequires: bison
BuildRequires: flex
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -121,7 +129,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -131,6 +139,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -168,6 +177,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/hicolor/*/apps/abakus.png
%{tde_tdedocdir}/HTML/en/abakus/
%{tde_tdeappdir}/abakus.desktop
+%{tde_mandir}/man1/abakus.1*
%changelog
diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec
index f3a4a5897..32825f481 100644
--- a/redhat/applications/filelight/filelight.spec
+++ b/redhat/applications/utilities/filelight/filelight.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg filelight
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -70,19 +70,32 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -117,7 +130,7 @@ directories on your computer.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -127,6 +140,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec
index 8684d27bb..6164dc971 100644
--- a/redhat/applications/kbarcode/kbarcode.spec
+++ b/redhat/applications/utilities/kbarcode/kbarcode.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kbarcode
%define tde_prefix /opt/trinity
@@ -64,18 +64,26 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# PCRE support
BuildRequires: pcre-devel
@@ -163,7 +171,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -173,6 +181,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
index b6c21725b..b3c11038d 100644
--- a/redhat/applications/kchmviewer/kchmviewer.spec
+++ b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kchmviewer
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -84,13 +84,21 @@ BuildRequires: chmlib-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
@@ -131,7 +139,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -141,6 +149,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec
index 12749667d..04cc9a1cd 100644
--- a/redhat/applications/kcpuload/kcpuload.spec
+++ b/redhat/applications/utilities/kcpuload/kcpuload.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kcpuload
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -70,7 +70,11 @@ BuildRequires: pkgconfig
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +114,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -120,6 +124,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec
index cddd115ee..08cd58522 100644
--- a/redhat/applications/kdirstat/kdirstat.spec
+++ b/redhat/applications/utilities/kdirstat/kdirstat.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kdirstat
%define tde_prefix /opt/trinity
@@ -61,19 +61,27 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -115,7 +123,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -125,6 +133,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec
index e4c67749a..d76f6b613 100644
--- a/redhat/applications/keep/keep.spec
+++ b/redhat/applications/utilities/keep/keep.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg keep
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -78,13 +78,21 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Requires: rdiff-backup
@@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -124,6 +132,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec
index e171f037e..2f96d7d0b 100644
--- a/redhat/applications/knutclient/knutclient.spec
+++ b/redhat/applications/utilities/knutclient/knutclient.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg knutclient
%define tde_prefix /opt/trinity
@@ -61,19 +61,27 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -114,7 +122,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -124,6 +132,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -170,8 +179,7 @@ fi
%doc AUTHORS ChangeLog COPYING README.md
%{tde_bindir}/knutclient
%{tde_tdeappdir}/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
+%{tde_datadir}/apps/knutclient/
%{tde_tdedocdir}/HTML/cs/knutclient
%{tde_tdedocdir}/HTML/en/knutclient
%{tde_datadir}/icons/hicolor/*/apps/*.png
diff --git a/redhat/applications/kpowersave/kpowersave.spec b/redhat/applications/utilities/kommando/kommando.spec
index 30563e4fd..cc39c7652 100644
--- a/redhat/applications/kpowersave/kpowersave.spec
+++ b/redhat/applications/utilities/kommando/kommando.spec
@@ -1,5 +1,5 @@
#
-# spec file for package kpowersave (version R14)
+# spec file for package kommando (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -18,9 +18,9 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
-%define tde_pkg kpowersave
+%define tde_pkg kommando
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -36,9 +36,9 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
-Version: 0.7.3
+Version: 0.5.2
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary: HAL based power management applet for Trinityfiles or directories.
+Summary: Calculator for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
@@ -54,20 +54,16 @@ License: GPLv2+
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
BuildRequires: desktop-file-utils
-BuildRequires: hal-devel
-BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
-BuildRequires: trinity-cmake >= %{tde_version}
-BuildRequires: libtool
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
-BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -79,104 +75,55 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-# XSCREENSAVER support
-# RHEL 4: disabled
-# RHEL 6: available in EPEL
-# RHEL 7: available in NUX
-# RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires: libXScrnSaver-devel
-BuildRequires: xscreensaver
-BuildRequires: xscreensaver-base
-BuildRequires: xscreensaver-extras
-%if 0%{?fedora}
-BuildRequires: xscreensaver-extras-base
-%endif
-BuildRequires: xscreensaver-gl-base
-BuildRequires: xscreensaver-gl-extras
-%endif
-
-%if 0%{?suse_version}
-BuildRequires: libXScrnSaver-devel
-BuildRequires: xscreensaver
-BuildRequires: xscreensaver-data
-BuildRequires: xscreensaver-data-extra
-%endif
-
-%endif
-
%description
-KPowersave is a TDE systray applet which allows to control the power
-management settings and policies of your computer.
-It relies on HAL to do the heavy lifting.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
- (warning) states
- * applet tooltip with information about battery fill and remaining battery
- time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a
- defined time)
- * a global configurable blacklist with programs which prevent autosuspend
- (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
-
-KPowersave supports schemes with following configurable specific
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-##########
+AbaKus is a complex calculator, which provides
+many different kinds of calculations.
+Think of it as bc (the command-line calculator) with a nice GUI.
+It also gives information about mathematical variables and
+has the user-friendly menu options of a normal TDE application.
+
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
-##########
-
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
+
+# Specific path for RHEL4
+if [ -d "/usr/X11R6" ]; then
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DCMAKE_SKIP_RPATH="OFF" \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
..
%__make %{?_smp_mflags}
@@ -187,6 +134,10 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+# Clean unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/libkommando.la
+%__rm -f %{?buildroot}%{tde_libdir}/libkommando.so
+
%clean
%__rm -rf %{buildroot}
@@ -194,17 +145,18 @@ export PATH="%{tde_bindir}:${PATH}"
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README.md TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libtdeinit_kpowersave.la
-%{tde_libdir}/libtdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
+%doc AUTHORS COPYING
+%{tde_datadir}/icons/hicolor/*/apps/kommando.png
+%{tde_tdedocdir}/HTML/en/kommando/
+%{tde_tdeappdir}/kommando.desktop
+%{tde_mandir}/man1/kommando.1*
+%{tde_datadir}/services/kded/kommandod.desktop
+%{tde_libdir}/libkommando.so.1
+%{tde_libdir}/libkommando.so.1.0.0
+%{tde_tdelibdir}/kcm_kommando.la
+%{tde_tdelibdir}/kcm_kommando.so
+%{tde_tdelibdir}/kded_kommandod.la
+%{tde_tdelibdir}/kded_kommandod.so
+
%changelog
diff --git a/redhat/applications/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec
index bdda7fcd9..e9d65c5a4 100644
--- a/redhat/applications/kompose/kompose.spec
+++ b/redhat/applications/utilities/kompose/kompose.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.1.2
%endif
%define tde_pkg kompose
%define tde_prefix /opt/trinity
@@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -103,7 +103,7 @@ by a scaled screen shot of it. It appears as a panel applet.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -113,6 +113,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec
index 5cbec4e22..5b1b0e216 100644
--- a/redhat/applications/krename/krename.spec
+++ b/redhat/applications/utilities/krename/krename.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg krename
%define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -69,10 +69,18 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -108,7 +116,7 @@ or Exif informations of an image.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -118,6 +126,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec
index aa329febc..f9f515aa2 100644
--- a/redhat/applications/ksensors/ksensors.spec
+++ b/redhat/applications/utilities/ksensors/ksensors.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg ksensors
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -70,7 +70,11 @@ BuildRequires: fdupes
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -116,7 +120,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -126,6 +130,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec
index 3eb6700dd..be04a512f 100644
--- a/redhat/applications/mathemagics/mathemagics.spec
+++ b/redhat/applications/utilities/mathemagics/mathemagics.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg mathemagics
%define tde_prefix /opt/trinity
@@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -78,7 +78,7 @@ Mathemagics is a RPN Calculator.
%build
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -88,6 +88,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
index d786285a8..a343befe6 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg qalculate-tde
%define tde_prefix /opt/trinity
@@ -61,12 +61,16 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}qalculate-devel >= 0.9.6
+%else
BuildRequires: libqalculate-devel >= 0.9.6
+%endif
%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?rhel}
BuildRequires: cln-devel
@@ -114,7 +118,7 @@ This package contains the TDE user interface of qalculate.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -124,6 +128,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 3e4699cd6..895f791e5 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -1,26 +1,35 @@
#!/bin/bash -ex
# Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION]
-# Example: build_rpm_package.sh tdebase 14.1.0
+# Example: build_rpm_package.sh tdebase 14.1.2
PKGNAME="${1%/}"
PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
PATH="$(cd $(dirname $0); pwd):${PATH}"
SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :)
case "${VERSION}" in *~pre*) PREVERSION="${VERSION#*~}";; esac
+ARCH="$(uname -i)"
+if [ "${ARCH}" = "unknown" ]; then
+ ARCH="$(uname -m)"
+fi
DIST="$(rpmdist.sh --dist)"
[ -z "${TMPPATH}" ] && TMPPATH="/dev/shm"
-BUILDDIR="${TMPPATH}/BUILD${DIST}.$(uname -i)"
-BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)"
-LOGFILE="${TMPPATH}/log.${COMP##*/}"
+BUILDDIR="${TMPPATH}/BUILD${DIST}.${ARCH}"
+BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.${ARCH}"
+LOGFILE="${TMPPATH}/log.${PKGNAME##*/}"
export TEMPDIR="$(mktemp -d)"
gather_rpm_sources.sh "${PKGNAME}" "${TDE_VERSION}" "${TEMPDIR}"
+specfile="${TEMPDIR}/${SPECFILE##*/}"
+
+if [ "${DIST}" = ".omv2490" ]; then
+ sed -i "${specfile}" -e "s|^%patch|%patch |"
+fi
[ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}"
@@ -43,7 +52,7 @@ rpmbuild -ba \
--define "prevers${PREVERSION:+ion} ${PREVERSION:-0}" \
--define "tde_patch 1" \
--define "with_mpeg 1" \
- "${TEMPDIR}/${SPECFILE##*/}"
+ "${specfile}"
RET=$?
# Removes BUILDDIR if build succeeded
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index cc9a33e54..a2e6698ad 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -1,6 +1,6 @@
#!/bin/bash -x
-TDE_VERSION="${1:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${1:-${TDE_VERSION:-14.1.2}}"
ARCH=$(rpm -E %_target_cpu)
RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
@@ -8,7 +8,7 @@ RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
[ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
# RHEL / CentOS / Fedora
-if [ -x /usr/bin/yum ]; then
+if [ -x "/usr/bin/dnf" ] || [ -x "/usr/bin/yum" ]; then
cat <<EOF >/tmp/rpmbuild-tde.repo
[rpmbuild.${ARCH}]
name=rpmbuild.${ARCH}
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh
index df6cadc9d..d1ecdb3b0 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -1,13 +1,13 @@
#!/bin/bash
# Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>
-# Example: gather_rpm_sources.sh tdebase 14.1.0 /tmp/tdebase
+# Example: gather_rpm_sources.sh tdebase 14.1.2 /tmp/tdebase
PKGNAME="${1%/}"
PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
-DIST="$4"
+DIST="$(rpmdist.sh --dist)"
SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
[ -z "${SPECFILE}" ] && exit 1
@@ -17,7 +17,6 @@ TARBALL=$(get_latest_tarball_filename.sh ${PKGNAME} ${TDE_VERSION} || :)
VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :)
case "${VERSION}" in *~pre*) PREVERSION="${VERSION#*~}";; esac
-DIST="$(rpmdist.sh --dist)"
[ -z "${TMPPATH}" ] && TMPPATH="/dev/shm"
BUILDDIR="${TMPPATH}/BUILD${DIST}.$(uname -i)"
BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)"
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index b89f9bb7f..bbb18b0cd 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Sample package name: trinity-tdelibs-14.1.0-0_pre727+6be06b3d.mga3.opt
+# Sample package name: trinity-tdelibs-14.1.2-0_pre727+6be06b3d.mga3.opt
PKGNAME="${1##*/}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index 3f7dca3b1..51c46e476 100755
--- a/redhat/build/get_latest_built_package_filename.sh
+++ b/redhat/build/get_latest_built_package_filename.sh
@@ -2,7 +2,7 @@
PKGNAME="$1"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)"
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh
index 62954bd01..1f3cebbfe 100755
--- a/redhat/build/get_latest_built_package_version.sh
+++ b/redhat/build/get_latest_built_package_version.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PKGNAME="$1"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index c3f971c0b..66429b0d7 100755
--- a/redhat/build/get_latest_tarball_filename.sh
+++ b/redhat/build/get_latest_tarball_filename.sh
@@ -1,18 +1,24 @@
#!/bin/bash
PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
[ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/
-[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/master/tde-packaging
+[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/master/tde/packaging
[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat/
EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)"
RET=""
for dir in "${TARBALLS_DIR}" "${EXTRA_DIR}" "${DIST_PACKAGING_DIR}"; do
- for v in "${PKGNAME}-${TDE_VERSION}*.tar.*" "trinity-${PKGNAME}-${TDE_VERSION}*.tar.*" "${PKGNAME}[-_][0-9]*.tar.*"; do
+ for v in \
+ "${PKGNAME}-${TDE_VERSION}.tar.*" \
+ "${PKGNAME}-${TDE_VERSION}*.tar.*" \
+ "trinity-${PKGNAME}-${TDE_VERSION}.tar.*" \
+ "trinity-${PKGNAME}-${TDE_VERSION}*.tar.*" \
+ "${PKGNAME}[-_][0-9]*.tar.*" \
+ ; do
RET=$(find "${dir}" -follow -type f -name ${v} | sort | tail -n 1)
[ -r "${RET}" ] && break
done
diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh
index 36090ef86..a2c89cfb8 100755
--- a/redhat/build/get_latest_tarball_version.sh
+++ b/redhat/build/get_latest_tarball_version.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
@@ -12,7 +12,9 @@ TARBALL=$(get_latest_tarball_filename.sh "${PKGNAME}" ${TDE_VERSION})
VERSION=${TARBALL##*/}
VERSION=${VERSION#trinity-}
VERSION=${VERSION#${PKGNAME}-}
+VERSION=${VERSION#${PKGNAME}_}
VERSION=${VERSION#*-}
VERSION=${VERSION%.tar.gz}
VERSION=${VERSION%.tar.bz2}
+VERSION=${VERSION%.orig}
echo "$VERSION"
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 11993d820..507ec499a 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -20,7 +20,7 @@ case "${PKGNAME}" in
# In case prefix is already there, don't add it again.
"trinity-"*) PREFIX="";;
# Most TDE dependencies have no prefix
- "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"polkit-tqt"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
+ "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"polkit-tqt"|"pytqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
# 3rd party dependencies
"cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
# Extra build stuff
@@ -64,6 +64,7 @@ case "${PKGNAME}" in
"tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
"tqt3") PKGRUNTIME="${lib}tqt3-mt";;
"tqtinterface") PKGRUNTIME="${lib}tqt4";;
+ "trinity-desktop") PKGRUNTIME="${PKGNAME}-all";;
"yaz") PKGRUNTIME="${lib}yaz";;
# Language package: install only French language package
"k3b-i18n"|"koffice-i18n"|"tde-i18n")
@@ -87,7 +88,7 @@ if [ -n "${DEVEL}" ]; then
# Some other packags NOT having development package
case "${PKGNAME}" in
- "autoconf"|"automake"|"brp-check-trinity"|"cmake"|"cscope"|"gnuchess"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;;
+ "autoconf"|"automake"|"brp-check-trinity"|"cscope"|"gnuchess"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"tde-cmake"|"torsocks") exit 0;;
"tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;;
esac
@@ -114,7 +115,7 @@ if [ -n "${DEVEL}" ]; then
"polkit-tqt") PKGDEVEL="${lib}polkit-tqt-devel";;
"tqca") PKGDEVEL="${lib}tqca-devel";;
"tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
- "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";;
+ "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel ${lib}tqt3-mt-sqlite3";;
"yaz") PKGDEVEL="${lib}yaz-devel";;
# Default case: development package has same name as runtime package, plus '-devel' suffix.
*) PKGDEVEL="${PKGRUNTIME}-devel";;
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index 1b0463e4c..3f42de99d 100755
--- a/redhat/build/get_source_files.sh
+++ b/redhat/build/get_source_files.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
DIST="$3"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
@@ -14,7 +14,11 @@ while read var val; do
case "${var}" in
Version:*) VERSION="${val}";;
Source*:|Source:|Patch[0-9]*:)
- FILE="${SPECDIR}/${val##*/}"
+ if [ "${val:0:7}" = "http://" ] || [ "${val:0:8}" = "https://" ]; then
+ FILE="${SPECDIR}/${val##*/}"
+ else
+ FILE="${SPECDIR}/${val}"
+ fi
if [ "${DIST}" = "any" ] && [ "${var//%\{?dist\}/}" = "${var}" ]; then
FILES="${FILE//%\{?dist\}/.}"*
else
@@ -27,7 +31,7 @@ while read var val; do
--define "tde_version ${TDE_VERSION}" \
--define "name ${name}" \
--define "version ${VERSION}" \
- --define "dist ${DIST:-$(rpm -E %dist)}" \
+ --define "dist ${DIST:-$(rpmdist.sh --dist)}" \
-E "${FILE}")
[ -r "${file}" ] && break
done
diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh
index 529b11593..a1ba33449 100755
--- a/redhat/build/get_spec_version.sh
+++ b/redhat/build/get_spec_version.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh
index 4f5dec5b2..e32d7c00f 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -1,11 +1,11 @@
#!/bin/bash
PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
-[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR="${HOME}/tde/${TDE_BRANCH:-master}/tde-packaging"
+[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR="${HOME}/tde/${TDE_BRANCH:-master}/tde/packaging"
[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR="${TDE_PACKAGING_DIR}/redhat"
# Special case for QT3
diff --git a/redhat/build/install_requires.sh b/redhat/build/install_requires.sh
index 9c901ac50..5a947539d 100755
--- a/redhat/build/install_requires.sh
+++ b/redhat/build/install_requires.sh
@@ -1,6 +1,7 @@
#!/bin/bash
-PKGFILE="packages$(rpm -E %dist)"
+DIST="$(rpmdist.sh --dist)"
+PKGFILE="packages${DIST}"
# Under Mageia/Mandriva, do not forget to enable "Tainted" and "Nonfree" repositories !
if [ -x /usr/sbin/urpmi ]; then
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 336a83cc3..70432b442 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -1,7 +1,7 @@
#!/bin/bash
PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
BUILT="$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})"
TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})"
diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index fe2d948b9..997b1f99d 100755
--- a/redhat/build/is_latest_package_installed.sh
+++ b/redhat/build/is_latest_package_installed.sh
@@ -1,11 +1,12 @@
#!/bin/bash
PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION})
TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
SPEC=$(get_spec_version.sh ${PKGNAME} ${TDE_VERSION})
+DIST="$(rpmdist.sh --dist)"
# Package containing "~" (e.g. R14 preversion tarballs):
if [ "${TARBALL/\~/}" != "${TARBALL}" ]; then
@@ -22,7 +23,7 @@ else
fi
# Other package (e.g. QT3)
- if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then
+ if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}${DIST}" = "${SPEC}" ]; then
echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed."
exit 0
fi
diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh
index 7f06af83e..d7be81993 100755
--- a/redhat/build/rpmdist.sh
+++ b/redhat/build/rpmdist.sh
@@ -5,7 +5,9 @@ RHEL=0
MGA=0
DIST=""
-if [ -r /etc/redhat-release ]; then
+if [ -r /etc/openmandriva-release ]; then
+ a="openmandriva"
+elif [ -r /etc/redhat-release ]; then
read a b c d e f g < /etc/redhat-release
elif [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ] || grep -q "opensuse" "/etc/os-release"; then
a="opensuse"
@@ -14,13 +16,13 @@ fi
case $a in
# Mageia release 1 (Official) for x86_64
Mageia*)
- DIST=".mga${c}"
-# MDKVERSION="201002"
+ DIST=".mga${c}"
+ #MDKVERSION="201002"
;;
# Mandriva Linux release 2011.0 (Official) for x86_64
Mandriva*)
- DIST=".mdv${d}"
- MDKVERSION="201100"
+ DIST=".mdv${d}"
+ MDKVERSION="201100"
;;
# CentOS release 5.7 (Final)
# CentOS Linux release 6.0 (Final)
@@ -49,6 +51,15 @@ case $a in
DIST=".oss"
fi
;;
+ # openmandriva
+ openmandriva)
+ . /etc/os-release
+ if [ "${VERSION_ID}" = "5.0" ]; then
+ DIST=".omv5000" # 5.0 (Rock)
+ else
+ DIST=".omv2490" # Cooker
+ fi
+ ;;
# PCLinuxOS
PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";;
#PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos";;
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index c00078f1e..5a8a13eb4 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -1,7 +1,7 @@
#!/bin/bash
WORKERS=$(getconf _NPROCESSORS_ONLN)
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
LOCKFILE="/tmp/lock.${0##*/}"
while [ -e "${LOCKFILE}" ]; do
@@ -11,24 +11,32 @@ done
ARCH="$(rpm -E %{_target_cpu})"
RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
+DIST="$(rpmdist.sh --dist)"
[ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch"
[ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
+if [ -x "/usr/bin/createrepo_c" ]; then
+ createrepo="/usr/bin/createrepo_c"
+else
+ createrepo="/usr/bin/createrepo"
+fi
+
if [ -x /usr/sbin/urpmi ]; then
REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/dnf ]; then
- REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)'
+ REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)'
elif [ -x /usr/bin/zypper ]; then
- REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
+ REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
+ #REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/yum ]; then
- if [ "$(rpm -E %dist)" = ".el5" ]; then
- REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
+ if [ "${DIST}" = ".el5" ]; then
+ REPOUPDATE='(cd ${RPMDIR}; ${createrepo} ${ARCH} & ${createrepo} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
else
- REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
+ REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
fi
elif [ -x /usr/bin/apt-get ]; then
- REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
+ REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir --topdir=$PWD i586 x86_64 noarch; sudo apt-get update)'
fi
eval "${REPOUPDATE}; rm -f ${LOCKFILE}" || exit 1
diff --git a/redhat/main/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec
index 418ae31d4..34bbf3a4b 100644
--- a/redhat/main/tde-i18n/tde-i18n.spec
+++ b/redhat/core/tde-i18n/tde-i18n.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tde-i18n
%define tde_prefix /opt/trinity
@@ -70,7 +70,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: findutils
BuildRequires: gettext
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
%description
@@ -1432,7 +1432,7 @@ for l in %{TDE_LANGS}; do
ln -s ../cmake cmake
fi
- if ! rpm -E %%cmake|grep -q "cd build"; then
+ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec
index 0856bcf0f..bbe0f518a 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility.spec
+++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeaccessibility
%define tde_prefix /opt/trinity
@@ -95,11 +95,23 @@ BuildRequires: trinity-akode-devel
%endif
# ALSA support
-BuildRequires: alsa-lib-devel
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
# GLIB2 support
BuildRequires: glib2-devel
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
+
# XCB support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
BuildRequires: libxcb-devel
@@ -401,7 +413,7 @@ Summary: Development files for tdeaccessibility
Group: Development/Libraries/X11
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-tdelibs-devel >= %{version}
-Requires: libjpeg-devel
+Requires: %{libjpeg}-devel
Requires: libpng-devel
Obsoletes: trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -439,7 +451,7 @@ unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -450,6 +462,7 @@ fi
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc b/redhat/core/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
+++ b/redhat/core/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec
index 83fda2d77..05e84cd79 100644
--- a/redhat/main/tdeaddons/tdeaddons.spec
+++ b/redhat/core/tdeaddons/tdeaddons.spec
@@ -21,7 +21,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeaddons
%define tde_prefix /opt/trinity
@@ -30,6 +30,7 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
@@ -70,7 +71,7 @@ BuildRequires: trinity-tdegames-devel >= %{tde_version}
BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
BuildRequires: trinity-tdepim-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -86,20 +87,32 @@ BuildRequires: brp-check-trinity
%endif
# SDL support
-BuildRequires: SDL-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}SDL-devel
+%else
+BuildRequires: SDL-devel
+%endif
-# ALSA support
+# ALSA supportl
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}asound-devel
+%else
BuildRequires: alsa-lib-devel
+%endif
# OPENSSL support
-BuildRequires: openssl-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
+BuildRequires: openssl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -111,7 +124,11 @@ BuildRequires: pcre-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# DB4/DB5 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
@@ -137,18 +154,10 @@ BuildRequires: db4-devel
#BuildRequires: xmms-devel
#%endif
-# PYTHON2 support
-%if 0%{?sle_version} >= 150400
-%define with_python 0
-%else
+# PYTHON support
%define with_python 1
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
-%global python python2
-%global __python %__python2
-%else
-%global python python
-%endif
-%endif
+%global python python3
+%global __python %__python3
Requires: trinity-atlantikdesigner = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-kaddressbook-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -198,6 +207,7 @@ America and Europe.
%{tde_tdeappdir}/atlantikdesigner.desktop
%{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
%{tde_tdedocdir}/HTML/en/atlantikdesigner/
+%{tde_mandir}/man1/atlantikdesigner.1*
##########
@@ -355,6 +365,7 @@ provided for audio and image files.
%{tde_datadir}/services/tdefile_txt.desktop
%{tde_datadir}/services/renaudiodlg.desktop
%{tde_datadir}/services/renimagedlg.desktop
+%{tde_mandir}/man1/lnkforward.1*
##########
@@ -582,6 +593,10 @@ graphical disk usage viewer and image conversions and transformations.
%{tde_tdelibdir}/libadblock.la
%{tde_tdelibdir}/libadblock.so
%{tde_tdedocdir}/HTML/en/konq-plugins/
+%{tde_mandir}/man1/exif.py.1*
+%{tde_mandir}/man1/fsview.1*
+%{tde_mandir}/man1/jpegorient.1*
+%{tde_mandir}/man1/orient.py.1*
##########
@@ -607,6 +622,7 @@ signatures in external mail clients such as KMail.
%{tde_datadir}/apps/ksig/
%{tde_datadir}/icons/hicolor/*/apps/ksig.png
%{tde_tdedocdir}/HTML/en/ksig/
+%{tde_mandir}/man1/ksig.1*
##########
@@ -664,6 +680,9 @@ of user interfaces, playlists and visualisation plugins.
%{tde_tdelibdir}/noatunwavecapture.so
%{tde_datadir}/apps/noatun/*
%{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
+%{tde_mandir}/man1/noatunsynaescope.bin.1*
+%{tde_mandir}/man1/noatuntippecanoe.bin.1*
+%{tde_mandir}/man1/noatuntyler.bin.1*
##########
@@ -689,7 +708,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -708,6 +727,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/main/tdeadmin/kpackagerc b/redhat/core/tdeadmin/kpackagerc
index 72be06d46..72be06d46 100644
--- a/redhat/main/tdeadmin/kpackagerc
+++ b/redhat/core/tdeadmin/kpackagerc
diff --git a/redhat/main/tdeadmin/ksysvrc b/redhat/core/tdeadmin/ksysvrc
index 48754643d..48754643d 100644
--- a/redhat/main/tdeadmin/ksysvrc
+++ b/redhat/core/tdeadmin/ksysvrc
diff --git a/redhat/main/tdeadmin/kuser.pam b/redhat/core/tdeadmin/kuser.pam
index 30492636a..30492636a 100644
--- a/redhat/main/tdeadmin/kuser.pam
+++ b/redhat/core/tdeadmin/kuser.pam
diff --git a/redhat/main/tdeadmin/kuser.pamd b/redhat/core/tdeadmin/kuser.pamd
index c7d67e332..c7d67e332 100644
--- a/redhat/main/tdeadmin/kuser.pamd
+++ b/redhat/core/tdeadmin/kuser.pamd
diff --git a/redhat/main/tdeadmin/kuserrc b/redhat/core/tdeadmin/kuserrc
index baeb5a53b..baeb5a53b 100644
--- a/redhat/main/tdeadmin/kuserrc
+++ b/redhat/core/tdeadmin/kuserrc
diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec
index 9eebbaa10..322b8e869 100644
--- a/redhat/main/tdeadmin/tdeadmin.spec
+++ b/redhat/core/tdeadmin/tdeadmin.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeadmin
%define tde_prefix /opt/trinity
@@ -72,7 +72,7 @@ Provides: trinity-kdeadmin = %{?epoch:%{epoch}:}%{version}-%{release}
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: libtool
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -88,13 +88,21 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# RPM support
BuildRequires: rpm-devel
@@ -351,7 +359,7 @@ touch /etc/lilo.conf
unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -361,6 +369,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -386,7 +395,7 @@ fi
-DBUILD_SECPOLICY=ON \
-DBUILD_TDEFILE_PLUGINS=ON \
\
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4
-DKU_FIRSTUID="1000" \
-DKU_FIRSTGID="1000" \
%endif
diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec
index 8f375e734..84e4ec76c 100644
--- a/redhat/main/tdeartwork/tdeartwork.spec
+++ b/redhat/core/tdeartwork/tdeartwork.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeartwork
%define tde_prefix /opt/trinity
@@ -31,6 +31,7 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
%define tde_sbindir %{tde_prefix}/sbin
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
@@ -66,7 +67,7 @@ BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: fdupes
@@ -74,10 +75,14 @@ BuildRequires: gettext
BuildRequires: libidn-devel
# ESOUND support
-BuildRequires: esound-devel
+#BuildRequires: esound-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
@@ -85,8 +90,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -104,6 +113,7 @@ BuildRequires: libart_lgpl-devel
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
# RHEL 8: available in EPEL
+# RHEL 9: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
@@ -164,13 +174,17 @@ BuildRequires: %{jack_devel}
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# Metapackage
@@ -384,12 +398,34 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop
%{tde_datadir}/apps/kfiresaver/
%{tde_datadir}/apps/tdescreensaver/
+%{tde_mandir}/man1/kbanner.kss.1*
+%{tde_mandir}/man1/kblob.kss.1*
+%{tde_mandir}/man1/kclock.kss.1*
+%{tde_mandir}/man1/keuphoria.kss.1
+%{tde_mandir}/man1/kfiresaver.kss.1
+%{tde_mandir}/man1/kflux.kss.1
+%{tde_mandir}/man1/kfountain.kss.1
+%{tde_mandir}/man1/kgravity.kss.1
+%{tde_mandir}/man1/klines.kss.1
+%{tde_mandir}/man1/klorenz.kss.1
+%{tde_mandir}/man1/kpendulum.kss.1
+%{tde_mandir}/man1/kpolygon.kss.1
+%{tde_mandir}/man1/krotation.kss.1
+%{tde_mandir}/man1/kscience.kss.1
+%{tde_mandir}/man1/kslideshow.kss.1
+%{tde_mandir}/man1/ksolarwinds.kss.1
+%{tde_mandir}/man1/kvm.kss.1
+%{tde_mandir}/man1/kwave.kss.1
+%{tde_mandir}/man1/tdeasciiquarium.kss.1
+%{tde_mandir}/man1/tdepartsaver.kss.1
%if 0%{?with_xscreensaver}
%{tde_bindir}/kspace.kss
%{tde_bindir}/kswarm.kss
%{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
+%{tde_mandir}/man1/kspace.kss.1
+%{tde_mandir}/man1/kswarm.kss.1
%endif
##########
@@ -515,6 +551,8 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
%{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
%endif
+%{tde_mandir}/man1/kxsconfig.1
+%{tde_mandir}/man1/kxsrun.1
%endif
@@ -714,7 +752,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -724,6 +762,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -735,12 +774,11 @@ fi
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
%{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
- %{!?with_libart}:-DWITH_LIBART=OFF} \
+ %{!?with_libart:-DWITH_LIBART=OFF} \
-DWITH_ALL_OPTIONS=ON \
-DWITH_ARTS=ON \
-DWITH_LIBART=ON \
-DWITH_OPENGL=ON \
- -DWITH_XSCREENSAVER=ON \
-DBUILD_ALL=ON \
..
diff --git a/redhat/main/tdebase/mgabutton.svg b/redhat/core/tdebase/mgabutton.svg
index 5897323c5..5897323c5 100644
--- a/redhat/main/tdebase/mgabutton.svg
+++ b/redhat/core/tdebase/mgabutton.svg
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el5 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el5
index 56939d5a9..56939d5a9 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el5
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el5
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el6 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el6
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el6
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el7 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el7
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el7
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el7
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el8
index dab729b22..dab729b22 120000
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el8
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.el9 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el9
new file mode 120000
index 000000000..dab729b22
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el9
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc34 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc34
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc34
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc35
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc35
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc36
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc37
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc38
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc39
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40
new file mode 120000
index 000000000..bcd188214
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc40
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.fc39 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mdv2011.0
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga8
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga8
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.opensuse1220 b/redhat/core/tdebase/pamd.kcheckpass-trinity.opensuse1220
index c6a7c9c90..c6a7c9c90 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.opensuse1220
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.opensuse1220
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos
index ad0fc6da6..ad0fc6da6 120000
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2012
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2013
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2014
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el6 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2015
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el6
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el7 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2016
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el7
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2016
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc34 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2017
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc34
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2017
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc35 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2018
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc35
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2018
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el5 b/redhat/core/tdebase/pamd.kdm-trinity-np.el5
index 8dc8ef34d..8dc8ef34d 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el5
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el5
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el6 b/redhat/core/tdebase/pamd.kdm-trinity-np.el6
index c3f7172de..c3f7172de 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el6
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el6
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el7 b/redhat/core/tdebase/pamd.kdm-trinity-np.el7
index c3f7172de..c3f7172de 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el7
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el7
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el8 b/redhat/core/tdebase/pamd.kdm-trinity-np.el8
index 3415e7d55..3415e7d55 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el8
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el8
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.el9 b/redhat/core/tdebase/pamd.kdm-trinity-np.el9
new file mode 120000
index 000000000..3415e7d55
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el9
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc34 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc34
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc34
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc34
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc35 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc35
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc35
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc35
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc36 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc36
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc36
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc36
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc37 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc37
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc37
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc38 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc38
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc38
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc39 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc39
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc39
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc40 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40
new file mode 120000
index 000000000..9d4df92f4
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc40
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.fc39 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mdv2011.0 b/redhat/core/tdebase/pamd.kdm-trinity-np.mdv2011.0
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga8 b/redhat/core/tdebase/pamd.kdm-trinity-np.mga8
index f884c1de6..f884c1de6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga8
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mga8
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.mga9 b/redhat/core/tdebase/pamd.kdm-trinity-np.mga9
new file mode 100644
index 000000000..f884c1de6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mga9
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos
index 5cde6e2c5..5cde6e2c5 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2012
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2012
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2013
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2013
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2014
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2014
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2015
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2015
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2016
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2016
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2017
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2017
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2018
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2018
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el5 b/redhat/core/tdebase/pamd.kdm-trinity.el5
index 30a26ae99..30a26ae99 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.el5
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el5
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el6 b/redhat/core/tdebase/pamd.kdm-trinity.el6
index 14f4aa748..14f4aa748 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.el6
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el7 b/redhat/core/tdebase/pamd.kdm-trinity.el7
index 14f4aa748..14f4aa748 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.el7
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el7
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el8 b/redhat/core/tdebase/pamd.kdm-trinity.el8
index f85413ec6..f85413ec6 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity.el8
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el8
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.el9 b/redhat/core/tdebase/pamd.kdm-trinity.el9
new file mode 120000
index 000000000..f85413ec6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el9
@@ -0,0 +1 @@
+pamd.kdm-trinity.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc34 b/redhat/core/tdebase/pamd.kdm-trinity.fc34
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc34
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc35 b/redhat/core/tdebase/pamd.kdm-trinity.fc35
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc35
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc36 b/redhat/core/tdebase/pamd.kdm-trinity.fc36
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc36
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc36
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc37 b/redhat/core/tdebase/pamd.kdm-trinity.fc37
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc37
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth required pam_env.so
+auth substack system-auth
+-auth optional pam_gnome_keyring.so
+-auth optional pam_kwallet.so
+-auth optional pam_kwallet5.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet.so
+-session optional pam_kwallet5.so
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc38 b/redhat/core/tdebase/pamd.kdm-trinity.fc38
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc38
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth required pam_env.so
+auth substack system-auth
+-auth optional pam_gnome_keyring.so
+-auth optional pam_kwallet.so
+-auth optional pam_kwallet5.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet.so
+-session optional pam_kwallet5.so
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc39 b/redhat/core/tdebase/pamd.kdm-trinity.fc39
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc39
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth required pam_env.so
+auth substack system-auth
+-auth optional pam_gnome_keyring.so
+-auth optional pam_kwallet.so
+-auth optional pam_kwallet5.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet.so
+-session optional pam_kwallet5.so
+session include postlogin
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc40 b/redhat/core/tdebase/pamd.kdm-trinity.fc40
new file mode 120000
index 000000000..5022f14ef
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc40
@@ -0,0 +1 @@
+pamd.kdm-trinity.fc39 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kdm-trinity.mdv2011.0
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kdm-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga8 b/redhat/core/tdebase/pamd.kdm-trinity.mga8
index cb0982c9a..cb0982c9a 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kdm-trinity.mga8
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.mga9 b/redhat/core/tdebase/pamd.kdm-trinity.mga9
new file mode 100644
index 000000000..cb0982c9a
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.mga9
@@ -0,0 +1,15 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_succeed_if.so
+auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
+auth substack system-auth
+-auth optional pam_kwallet.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos b/redhat/core/tdebase/pamd.kdm-trinity.pclos
index fcc6957f7..fcc6957f7 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2012 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2012
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2013 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2013
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2014 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2014
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2015
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2016
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2016
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2017
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2017
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2018 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2018
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2018
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el5 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el5
index 56939d5a9..56939d5a9 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el5
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el5
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc36 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el6
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc36
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el7
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el7
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el8
index a5fab9e3e..a5fab9e3e 120000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el8
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.el9 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el9
new file mode 120000
index 000000000..a5fab9e3e
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el9
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc34
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc35
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc36
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc37
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc38
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc39
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40
new file mode 120000
index 000000000..a7b20accd
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc40
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.fc39 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mdv2011.0
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga8
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga8
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos
index 31d43e302..31d43e302 120000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2012 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2012
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2012
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2013 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2013
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2013
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2014 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2014
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2014
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2015 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2015
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2015
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2016 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2016
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2016
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/core/tdebase/pamd.tde.omv5000 b/redhat/core/tdebase/pamd.tde.omv5000
new file mode 100644
index 000000000..9e0557414
--- /dev/null
+++ b/redhat/core/tdebase/pamd.tde.omv5000
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth required pam_env.so
+auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
+auth include system-auth
+account include system-auth
+password include system-auth
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+session required pam_loginuid.so
diff --git a/redhat/main/tdebase/suse-displaymanagers-tdm b/redhat/core/tdebase/suse-displaymanagers-tdm
index 5bf0eb4ef..5bf0eb4ef 100644
--- a/redhat/main/tdebase/suse-displaymanagers-tdm
+++ b/redhat/core/tdebase/suse-displaymanagers-tdm
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index 9427a628b..62c3c6b45 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdebase
%define tde_prefix /opt/trinity
@@ -28,6 +28,7 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
@@ -62,10 +63,14 @@ Source1: %{name}-rpmlintrc
# Pam configuration files for RHEL / Fedora
%if 0%{?suse_version} == 0
-Source2: pamd.kdm-trinity%{?dist}
-Source3: pamd.kdm-trinity-np%{?dist}
-Source4: pamd.kcheckpass-trinity%{?dist}
-Source5: pamd.kscreensaver-trinity%{?dist}
+%if 0%{?mdkver}
+Source2: pamd.tde.omv5000
+%else
+Source2: pamd.kdm-trinity%{?pamd_suffix}
+Source3: pamd.kdm-trinity-np%{?pamd_suffix}
+Source4: pamd.kcheckpass-trinity%{?pamd_suffix}
+Source5: pamd.kscreensaver-trinity%{?pamd_suffix}
+%endif
%endif
# openSUSE: configuration file for TDM
@@ -164,6 +169,14 @@ Requires: redhat-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
%endif
+# RHEL 9 Theme
+%if 0%{?rhel} == 9
+#Requires: redhat-backgrounds
+Requires: redhat-logos
+%define tde_bg /usr/share/backgrounds/rocky-default-9-abstract-1-day.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+%endif
+
# Mageia Theme
%if 0%{?mgaversion}
Requires: mageia-theme-Default
@@ -178,6 +191,12 @@ Requires: mandriva-theme
%define tde_starticon /usr/share/icons/mandriva.png
%endif
+# OpenMandriva
+%if 0%{?mdkver}
+Requires: distro-release-theme
+%define tde_bg /usr/share/wallpapers/default.png
+%endif
+
# PCLINUXOS
%if 0%{?pclinuxos}
Requires: desktop-common-data
@@ -193,7 +212,7 @@ Requires: hicolor-icon-theme-branding
%endif
# OpenSuse TW Theme
-%if "%{?suse_version}" == "1550"
+%if "%{?suse_version}" == "1699"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding
@@ -203,7 +222,7 @@ Requires: hicolor-icon-theme-branding
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: fdupes
@@ -212,19 +231,36 @@ BuildRequires: fdupes
BuildRequires: htdig
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# AUDIOFILE support
BuildRequires: audiofile-devel
# ALSA supportl
-BuildRequires: alsa-lib-devel
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
# RAW1394 support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}raw1394-devel
+%else
BuildRequires: libraw1394-devel
+%endif
# VORBIS support
-BuildRequires: libvorbis-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
# GLIB2 support
BuildRequires: glib2-devel
@@ -233,9 +269,13 @@ BuildRequires: glib2-devel
BuildRequires: pcre-devel
# SASL support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}sasl-devel
+%else
BuildRequires: %{_lib}sasl2-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: cyrus-sasl-devel
%endif
@@ -248,29 +288,38 @@ BuildRequires: pam-devel
BuildRequires: %{_lib}usb1.0-devel
BuildRequires: %{_lib}usb-compat0.1-devel
%else
+%if 0%{?fedora} >= 37
+BuildRequires: libusb1-devel
+BuildRequires: libusb-compat-0.1-devel
+%else
BuildRequires: libusb-devel
%endif
+%endif
# ESOUND support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_esound 1
-BuildRequires: esound-devel
-%endif
+#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+#define with_esound 1
+#BuildRequires: esound-devel
+#endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -292,13 +341,21 @@ BuildRequires: libsensors4-devel
%if 0%{?suse_version} >= 1310
BuildRequires: udev
%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
+%endif
%define with_tsak 1
%define with_tdehwlib 1
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# XRANDR support
# On RHEL5, xrandr library is too old.
@@ -323,8 +380,12 @@ BuildRequires: hal-devel >= 0.5
# Disabled on RHEL4
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_exr 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openexr-devel
+%else
BuildRequires: OpenEXR-devel
%endif
+%endif
# XSCREENSAVER support
# RHEL 4: disabled
@@ -332,6 +393,7 @@ BuildRequires: OpenEXR-devel
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
# RHEL 8: available in EPEL
+# RHEL 9: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
@@ -381,8 +443,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -413,8 +479,12 @@ BuildRequires: libart_lgpl-devel
BuildRequires: samba-common
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}smbclient-devel
+%else
BuildRequires: libsmbclient-devel
%endif
+%endif
# IMAKE
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
@@ -426,8 +496,15 @@ BuildRequires: imake
BuildRequires: xorg-x11-libxkbfile-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}xkbfile-devel
+%else
BuildRequires: libxkbfile-devel
%endif
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7
+BuildRequires: xkeyboard-config-devel
+%endif
+%endif
# XDMCP support
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -487,25 +564,34 @@ BuildRequires: x11-proto-devel
BuildRequires: xorg-x11-proto-devel
%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
+%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?fedora}
BuildRequires: xorg-x11-font-utils
%endif
%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
BuildRequires: font-util
+%endif
+
+%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 || 0%{?rhel} >= 9
BuildRequires: bdftopcf
%endif
+%if 0%{?mdkver} < 24090000
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: drakconf
%endif
+%endif
# LIBCONFIG support
# Needed for "compton" stuff
%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
%define with_libconfig 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}config-devel
+%else
BuildRequires: libconfig-devel
%endif
+%endif
# KBDLEDSYNC support
%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
@@ -535,7 +621,12 @@ BuildRequires: libnsl-devel
%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
# SELINUX support
%if 0%{?rhel} >= 6 || 0%{?fedora}
@@ -543,6 +634,16 @@ BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
%endif
+# LIBSSH support
+%if 0%{?rhel} == 6
+%define with_libssh 0
+%else
+%define with_libssh 1
+%endif
+%if 0%{?with_libssh}
+BuildRequires: libssh-devel
+%endif
+
# tdebase is a metapackage that installs all sub-packages
Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -700,6 +801,7 @@ Such as the desktop right-click-"Create New" list
%files runtime-data-common
%defattr(-,root,root,-)
+%{tde_datadir}/apps/kxkb/
%{tde_datadir}/desktop-directories/
%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
@@ -731,6 +833,7 @@ creates menu entries for them.
%{tde_datadir}/applnk/System/kappfinder.desktop
%{tde_datadir}/apps/kappfinder
%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
+%{tde_mandir}/man1/kappfinder.1*
##########
@@ -789,6 +892,7 @@ Some random features:
%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
%{tde_datadir}/servicetypes/kateplugin.desktop
%{tde_tdedocdir}/HTML/en/kate/
+%{tde_mandir}/man1/kate.1*
##########
@@ -831,7 +935,7 @@ Kwrite is an advanced text editor for TDE.
%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
%{tde_tdedocdir}/HTML/en/kwrite/
-
+%{tde_mandir}/man1/kwrite.1*
##########
@@ -1115,11 +1219,9 @@ plugdev group.
%{tde_tdedocdir}/HTML/en/tdefontview/
# tdehwtray
-%if "%{?tde_version}" == "14.1.0"
%{tde_bindir}/tdehwdevicetray
%{tde_tdeappdir}/tdehwdevicetray.desktop
%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop
-%endif
# The following features are not compiled under RHEL 5 and older
%if 0%{?with_tderandrtray}
@@ -1202,6 +1304,8 @@ TDE applications, particularly those in the TDE base module.
%{tde_bindir}/krandom.kss
%{tde_bindir}/ksystraycmd
%{tde_bindir}/kxkb
+%{tde_bindir}/tde_license_info
+%{tde_bindir}/tde_show_license_info
%dir %{tde_libdir}/tdeconf_update_bin
%{tde_libdir}/tdeconf_update_bin/khotkeys_update
%{tde_tdelibdir}/kcminit.la
@@ -1247,6 +1351,7 @@ TDE applications, particularly those in the TDE base module.
%{tde_datadir}/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd
%{tde_datadir}/apps/kdcop/
%{tde_datadir}/apps/khotkeys/
+%{tde_datadir}/autostart/tde_license_info.desktop
%{tde_datadir}/services/kxkb.desktop
%if 0%{?suse_version} == 0
%config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity
@@ -1257,6 +1362,22 @@ TDE applications, particularly those in the TDE base module.
%{tde_tdedocdir}/HTML/en/tdesu/
%{tde_tdedocdir}/HTML/en/knetattach/
%{tde_tdedocdir}/HTML/en/kxkb/
+%{tde_mandir}/man1/drkonqi.1*
+%{tde_mandir}/man1/kblankscrn.kss.1*
+%{tde_mandir}/man1/kcheckpass.1*
+%{tde_mandir}/man1/kcminit.1*
+%{tde_mandir}/man1/kdcop.1*
+%{tde_mandir}/man1/kdialog.1*
+%{tde_mandir}/man1/khotkeys.1*
+%{tde_mandir}/man1/knetattach.1*
+%{tde_mandir}/man1/krandom.kss.1*
+%{tde_mandir}/man1/kreadconfig.1*
+%{tde_mandir}/man1/kstart.1*
+%{tde_mandir}/man1/ksystraycmd.1*
+%{tde_mandir}/man1/kwriteconfig.1*
+%{tde_mandir}/man1/kxkb.1*
+%{tde_mandir}/man1/tdedebugdialog.1*
+%{tde_mandir}/man1/tdesu.1*
# SETUID binaries
# Some setuid binaries need special care
@@ -1698,8 +1819,10 @@ group.
%{tde_tdelibdir}/tdeio_remote.so
%{tde_tdelibdir}/tdeio_settings.la
%{tde_tdelibdir}/tdeio_settings.so
+%if 0%{?with_libssh}
%{tde_tdelibdir}/tdeio_sftp.la
%{tde_tdelibdir}/tdeio_sftp.so
+%endif
%{tde_tdelibdir}/tdeio_system.la
%{tde_tdelibdir}/tdeio_system.so
%{tde_tdelibdir}/tdeio_tar.la
@@ -1756,7 +1879,9 @@ group.
%{tde_datadir}/services/programs.protocol
%{tde_datadir}/services/remote.protocol
%{tde_datadir}/services/settings.protocol
+%if 0%{?with_libssh}
%{tde_datadir}/services/sftp.protocol
+%endif
%{tde_datadir}/services/system.protocol
%{tde_datadir}/services/tar.protocol
%{tde_datadir}/services/textthumbnail.desktop
@@ -1767,6 +1892,9 @@ group.
%{tde_datadir}/servicetypes/thumbcreator.desktop
%{tde_datadir}/services/tdefile_trash.desktop
%{tde_tdedocdir}/HTML/en/tdeioslave/
+%{tde_mandir}/man1/ktrash.1*
+%{tde_mandir}/man1/tdeio_media_mounthelper.1*
+%{tde_mandir}/man1/tdeio_system_documenthelper.1*
%if 0%{?with_exr}
%{tde_tdelibdir}/exrthumbnail.la
@@ -1779,11 +1907,9 @@ group.
%{tde_tdelibdir}/media_propsdlgplugin.so
%{tde_datadir}/services/media_propsdlgplugin.desktop
-%if "%{tde_version}" == "14.1.0"
%{tde_tdelibdir}/ktrashpropsdlgplugin.la
%{tde_tdelibdir}/ktrashpropsdlgplugin.so
%{tde_datadir}/services/ktrashpropsdlgplugin.desktop
-%endif
##########
@@ -1836,6 +1962,7 @@ system passwords.
%{_datadir}/faces/Star.png
%{_datadir}/faces/Teddybear.png
%{_datadir}/faces/Turtle.png
+%{tde_mandir}/man1/tdepasswd.1*
##########
@@ -1898,6 +2025,9 @@ Installation of smbclient will make you able to use smb shared printers.
%{tde_tdedocdir}/HTML/en/tdeprint/
%{tde_tdedocdir}/HTML/en/tdeprintfax/
%{tde_tdedocdir}/HTML/en/kjobviewer/
+%{tde_mandir}/man1/kjobviewer.1*
+%{tde_mandir}/man1/kprinter.1*
+%{tde_mandir}/man1/tdeprintfax.1*
##########
@@ -2030,10 +2160,13 @@ already. Most users won't need this.
%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
%endif
-
-%if "%{?tde_version}" == "14.1.0"
+%{tde_mandir}/man1/gentdmconf.1*
+%{tde_mandir}/man1/krootimage.1*
+%{tde_mandir}/man1/tdm.1*
+%{tde_mandir}/man1/tdmctl.1*
+%{tde_mandir}/man1/tdm_config.1*
+%{tde_mandir}/man1/tdm_greet.1*
%{tde_bindir}/tdecryptocardwatcher
-%endif
# XDG user faces
%dir %{_datadir}/faces
@@ -2050,10 +2183,10 @@ already. Most users won't need this.
%if 0%{?suse_version} >= 1210
/usr/lib/X11/displaymanagers/
%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} >= 7
/usr/lib/systemd/system/tdm.service
%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version}
%{_datadir}/xsessions/tde.desktop
%endif
@@ -2191,6 +2324,7 @@ workstations.
%{tde_datadir}/services/kfindpart.desktop
%{tde_datadir}/servicetypes/findpart.desktop
%{tde_tdedocdir}/HTML/en/kfind/
+%{tde_mandir}/man1/kfind.1*
##########
@@ -2340,6 +2474,10 @@ functionality.
%if 0%{?mgaversion} >= 3
%{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
%endif
+%{tde_mandir}/man1/appletproxy.1*
+%{tde_mandir}/man1/extensionproxy.1*
+%{tde_mandir}/man1/kasbar.1*
+%{tde_mandir}/man1/kicker.1*
##########
@@ -2428,6 +2566,7 @@ structure.
%{tde_datadir}/apps/kcontroledit/
%{tde_datadir}/apps/kmenuedit/
%{tde_tdedocdir}/HTML/en/kmenuedit/
+%{tde_mandir}/man1/kmenuedit.1*
##########
@@ -2544,8 +2683,10 @@ ever launching another application.
%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%if 0%{?mdkver} < 24090000
%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
+%endif
%{tde_datadir}/apps/konqueror/tiles/
%{tde_datadir}/autostart/konqy_preload.desktop
%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
@@ -2560,6 +2701,11 @@ ever launching another application.
%{tde_datadir}/servicetypes/konqaboutpage.desktop
%{tde_tdedocdir}/HTML/en/konqueror/
%{tde_tdedocdir}/HTML/en/keditbookmarks/
+%{tde_mandir}/man1/keditbookmarks.1*
+%{tde_mandir}/man1/kfmclient.1*
+%{tde_mandir}/man1/konqueror.1*
+
+%if 0%{?mdkver} < 24090000
%post -n trinity-konqueror
if [ $1 -eq 1 ]; then
@@ -2577,6 +2723,8 @@ if [ $1 -eq 0 ]; then
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
fi
+%endif
+
##########
%package -n trinity-konqueror-devel
@@ -2667,6 +2815,7 @@ Using Konsole, a user can open:
%{tde_tdedocdir}/HTML/en/konsole/
%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
%config %{_sysconfdir}/fonts/conf.d/99-konsole.conf
+%{tde_mandir}/man1/konsole.1*
##########
@@ -2687,6 +2836,7 @@ applications. It is used to switch between applications or desktops.
%{tde_datadir}/applnk/Utilities/kpager.desktop
%{tde_datadir}/icons/hicolor/*/apps/kpager.png
%{tde_tdedocdir}/HTML/en/kpager/
+%{tde_mandir}/man1/kpager.1*
##########
@@ -2708,6 +2858,7 @@ automatically started. KPersonalizer can also be called later.
%{tde_datadir}/applnk/System/kpersonalizer.desktop
%{tde_datadir}/apps/kpersonalizer/
%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
+%{tde_mandir}/man1/kpersonalizer.1*
##########
@@ -2745,12 +2896,9 @@ TDE will start, but many good defaults will not be set.
%{tde_datadir}/apps/tdeconf_update/ksmserver.upd
%{tde_datadir}/apps/tdeconf_update/move_session_config.sh
%{tde_datadir}/apps/ksmserver/
+%{tde_mandir}/man1/starttde.1*
%post -n trinity-ksmserver
-%if 0%{?mdkversion} || 0%{?mgaversion}
-fndSession
-%endif
-
# openSUSE 15.0 alternatives
%if 0%{?suse_version} >= 1500
update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || :
@@ -2758,8 +2906,10 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess
%postun -n trinity-ksmserver
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver} < 24090000
fndSession
%endif
+%endif
# openSUSE 15.0 alternatives
%if 0%{?suse_version} >= 1500
@@ -2928,6 +3078,7 @@ This package contains the default X window manager for TDE.
%{tde_tdeappdir}/twinoptions.desktop
%{tde_tdeappdir}/twinrules.desktop
%{tde_datadir}/applnk/.hidden/twinactions.desktop
+%{tde_datadir}/applnk/.hidden/twinactiveborders.desktop
%{tde_datadir}/applnk/.hidden/twinadvanced.desktop
%{tde_datadir}/applnk/.hidden/twinfocus.desktop
%{tde_datadir}/applnk/.hidden/twinmoving.desktop
@@ -3121,6 +3272,9 @@ Windows and Samba shares.
if [ -x "/usr/bin/reboot" ]; then
POWEROFF="/usr/bin/poweroff"
REBOOT="/usr/bin/reboot"
+elif [ -x "/usr/sbin/reboot" ]; then
+ POWEROFF="/usr/sbin/poweroff"
+ REBOOT="/usr/sbin/reboot"
fi
if [ -n "${REBOOT}" ]; then
%__sed -i \
@@ -3181,7 +3335,7 @@ if [ -d "/usr/include/tirpc" ]; then
RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -3191,6 +3345,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -3252,7 +3407,7 @@ fi
%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320
-DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver}
-DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \
%endif
..
@@ -3271,7 +3426,7 @@ fi
# Adds a GDM/KDM/XDM session called 'TDE'
# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mdkver} || 0%{?mgaversion} >= 6
%__install -D -m 644 \
"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
@@ -3301,24 +3456,29 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k"
%else
%if 0%{?mgaversion} >= 6
FNDSESSION_EXEC="/usr/sbin/chksession -l"
-%else
-FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
-%endif
%endif
EOF
%endif
+%endif
# PAM configuration files (except openSUSE)
%if 0%{?suse_version} == 0
+%if 0%{?mdkver}
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
+%else
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
%endif
+%endif
# TDM configuration
%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver}
-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else
-e "s/^#*MinShowUID=.*/MinShowUID=500/"
@@ -3333,11 +3493,13 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then
%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
fi
+%if 0%{?mdkver} < 24090000
# Makes 'media_safelyremove.desktop' an alternative.
# This allows the use of 'tdeio-umountwrapper' package.
%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
%__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives"
%__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop"
+%endif
# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
# You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
diff --git a/redhat/main/tdebase/tdm.el6.te b/redhat/core/tdebase/tdm.el6.te
index 60508ae0d..60508ae0d 100644
--- a/redhat/main/tdebase/tdm.el6.te
+++ b/redhat/core/tdebase/tdm.el6.te
diff --git a/redhat/main/tdebase/tdm.el7.te b/redhat/core/tdebase/tdm.el7.te
index 519ca0506..519ca0506 100644
--- a/redhat/main/tdebase/tdm.el7.te
+++ b/redhat/core/tdebase/tdm.el7.te
diff --git a/redhat/main/tdebase/tdm.el8.te b/redhat/core/tdebase/tdm.el8.te
index 519ca0506..519ca0506 100644
--- a/redhat/main/tdebase/tdm.el8.te
+++ b/redhat/core/tdebase/tdm.el8.te
diff --git a/redhat/core/tdebase/tdm.el9.te b/redhat/core/tdebase/tdm.el9.te
new file mode 120000
index 000000000..034e33247
--- /dev/null
+++ b/redhat/core/tdebase/tdm.el9.te
@@ -0,0 +1 @@
+tdm.el8.te \ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.fc34.te b/redhat/core/tdebase/tdm.fc34.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc34.te
+++ b/redhat/core/tdebase/tdm.fc34.te
diff --git a/redhat/main/tdebase/tdm.fc35.te b/redhat/core/tdebase/tdm.fc35.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc35.te
+++ b/redhat/core/tdebase/tdm.fc35.te
diff --git a/redhat/main/tdebase/tdm.fc36.te b/redhat/core/tdebase/tdm.fc36.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc36.te
+++ b/redhat/core/tdebase/tdm.fc36.te
diff --git a/redhat/core/tdebase/tdm.fc37.te b/redhat/core/tdebase/tdm.fc37.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc37.te
@@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+ type fprintd_t;
+ type init_t;
+ class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
diff --git a/redhat/core/tdebase/tdm.fc38.te b/redhat/core/tdebase/tdm.fc38.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc38.te
@@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+ type fprintd_t;
+ type init_t;
+ class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
diff --git a/redhat/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te
new file mode 100644
index 000000000..f3bcb40d4
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc39.te
@@ -0,0 +1,30 @@
+
+module tdm 1.0;
+
+require {
+ type etc_t;
+ type fprintd_t;
+ type init_t;
+ type tmp_t;
+ type unconfined_service_t;
+ type unconfined_t;
+ type var_lib_t;
+ type var_run_t;
+ type xdm_t;
+ class capability2 mac_admin;
+ class dbus send_msg;
+ class fifo_file { getattr open read setattr unlink };
+ class file { create entrypoint getattr lock map open read rename unlink write };
+ class lnk_file unlink;
+ class process transition;
+}
+
+allow fprintd_t init_t:dbus send_msg;
+allow unconfined_service_t unconfined_t:process transition;
+allow unconfined_t self:capability2 mac_admin;
+allow xdm_t etc_t:file { create rename unlink write };
+allow xdm_t tmp_t:fifo_file { getattr open read setattr unlink };
+allow xdm_t tmp_t:file { map open unlink };
+allow xdm_t tmp_t:lnk_file unlink;
+allow xdm_t var_lib_t:file { unlink };
+allow xdm_t var_run_t:file { getattr lock open read write };
diff --git a/redhat/core/tdebase/tdm.fc40.te b/redhat/core/tdebase/tdm.fc40.te
new file mode 120000
index 000000000..6d3f39b54
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc40.te
@@ -0,0 +1 @@
+tdm.fc39.te \ No newline at end of file
diff --git a/redhat/core/tdebase/tdm.service.el9 b/redhat/core/tdebase/tdm.service.el9
new file mode 120000
index 000000000..87f56ea08
--- /dev/null
+++ b/redhat/core/tdebase/tdm.service.el9
@@ -0,0 +1 @@
+tdm.service.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.service.fc34 b/redhat/core/tdebase/tdm.service.fc34
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc34
+++ b/redhat/core/tdebase/tdm.service.fc34
diff --git a/redhat/main/tdebase/tdm.service.fc35 b/redhat/core/tdebase/tdm.service.fc35
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc35
+++ b/redhat/core/tdebase/tdm.service.fc35
diff --git a/redhat/main/tdebase/tdm.service.fc36 b/redhat/core/tdebase/tdm.service.fc36
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc36
+++ b/redhat/core/tdebase/tdm.service.fc36
diff --git a/redhat/core/tdebase/tdm.service.fc37 b/redhat/core/tdebase/tdm.service.fc37
new file mode 100644
index 000000000..9ef7e07ff
--- /dev/null
+++ b/redhat/core/tdebase/tdm.service.fc37
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga8 b/redhat/core/tdebase/tdm.service.mga8
index eda2906e2..eda2906e2 100644
--- a/redhat/main/tdebase/tdm.service.mga8
+++ b/redhat/core/tdebase/tdm.service.mga8
diff --git a/redhat/main/tdebase/trinity-tdebase-rpmlintrc b/redhat/core/tdebase/trinity-tdebase-rpmlintrc
index 8d22f2fc6..8d22f2fc6 100644
--- a/redhat/main/tdebase/trinity-tdebase-rpmlintrc
+++ b/redhat/core/tdebase/trinity-tdebase-rpmlintrc
diff --git a/redhat/main/tdebase/xdm.oss114 b/redhat/core/tdebase/xdm.oss114
index aabe4afb3..aabe4afb3 100755
--- a/redhat/main/tdebase/xdm.oss114
+++ b/redhat/core/tdebase/xdm.oss114
diff --git a/redhat/main/tdebindings/filter-requires.sh b/redhat/core/tdebindings/filter-requires.sh
index da6c04566..da6c04566 100644
--- a/redhat/main/tdebindings/filter-requires.sh
+++ b/redhat/core/tdebindings/filter-requires.sh
diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index 59baee29d..8d45fbc33 100644
--- a/redhat/main/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -27,7 +27,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdebindings
%define tde_prefix /opt/trinity
@@ -107,8 +107,12 @@ Requires: evolution28-pango
BuildRequires: evolution28-atk-devel
Requires: evolution28-atk
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
BuildRequires: gtk2-devel
%endif
+%endif
# XULRUNNER support
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
@@ -119,7 +123,11 @@ BuildRequires: mozilla-xulrunner20-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# GTK1 support
%if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7)
@@ -161,29 +169,25 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
# PYTHON support
-%if 0%{?sle_version} >= 150400
-%define with_python 0
-%else
%define with_python 1
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 7
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
-%endif
## ruby
BuildRequires: ruby-devel >= 1.8
@@ -193,13 +197,13 @@ BuildRequires: rubypick
%endif
# Check for Ruby library directory
-%if "%{?ruby_libarchdir}" != ""
+%if "%{?ruby_libarchdir}" != "" && "%{?ruby_libarchdir}" != "%{_libdir}/%{name}"
%define ruby_arch %{?ruby_libarchdir}
%else
%if "%{?rb_archdir}" != ""
%define ruby_arch %{?rb_archdir}
%else
-%if "%{%ruby_archdir}" != ""
+%if "%{?ruby_archdir}" != ""
%define ruby_arch %{?ruby_archdir}
%else
%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')}
@@ -373,6 +377,7 @@ This package is part of the official TDE bindings module.
%files -n trinity-libdcop3-java-devel
%defattr(-,root,root,-)
%{tde_bindir}/dcopidl2java
+%{tde_mandir}/man1/dcopidl2java.1*
%endif
@@ -693,7 +698,14 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{python_sitearch}/pcop.la
%{python_sitearch}/pcop.so
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/pydcop.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/__pycache__/pydcop.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/pydcop.py
+%endif
%endif
@@ -806,6 +818,7 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{tde_bindir}/juic
%{tde_datadir}/juic/
+%{tde_mandir}/man1/juic.1*
%endif
##########
@@ -836,6 +849,9 @@ This package is part of the official TDE bindings module.
%{ruby_arch}/korundum.la
%{ruby_arch}/korundum.so*
%doc korundum/ChangeLog
+%{tde_mandir}/man1/krubyinit.1*
+%{tde_mandir}/man1/rbtdeapi.1*
+%{tde_mandir}/man1/rbtdesh.1*
##########
@@ -867,6 +883,10 @@ This package is part of the official TDE bindings module.
%{ruby_arch}/tqui.so*
%{ruby_arch}/tqui.la
%doc qtruby/ChangeLog
+%{tde_mandir}/man1/qtrubyinit.1*
+%{tde_mandir}/man1/rbqtapi.1*
+%{tde_mandir}/man1/rbqtsh.1*
+%{tde_mandir}/man1/rbuic.1*
##########
@@ -1068,6 +1088,10 @@ exit 2
exit 3
%endif
+%if 0%{?mdkver}
+touch config.h.in
+%endif
+
# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \
@@ -1094,7 +1118,7 @@ exit 3
%endif
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -1131,6 +1155,9 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_t
EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
%endif
+# Force python version
+export PYTHON=%{__python}
+
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \
--prefix=%{tde_prefix} \
@@ -1150,7 +1177,7 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_targe
--enable-rpath \
--disable-gcc-hidden-visibility \
\
- --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \
+ --with-extra-includes=%{_includedir}/tqt:${EXTRA_INCLUDES} \
--with-extra-libs=%{tde_libdir} \
%if 0%{with_python}
--with-pythondir=%{_usr} \
@@ -1159,6 +1186,11 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_targe
%{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \
%{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla}
+# Ensure python was detected properly
+if grep "LIBPYTHON=''" "config.log"; then
+ exit 1
+fi
+
# Build dcopperl with specific options
pushd dcopperl
CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3
diff --git a/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc b/redhat/core/tdebindings/trinity-tdebindings-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc
+++ b/redhat/core/tdebindings/trinity-tdebindings-rpmlintrc
diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec
index 06f9dd206..7cb4d8318 100644
--- a/redhat/main/tdeedu/tdeedu.spec
+++ b/redhat/core/tdeedu/tdeedu.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeedu
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ Source1: %{name}-rpmlintrc
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: desktop-file-utils
# SUSE desktop files utility
@@ -81,24 +81,37 @@ BuildRequires: fdupes
BuildRequires: doxygen
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# LIBUSB support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}usb1.0-devel
BuildRequires: %{_lib}usb-compat0.1-devel
%else
+%if 0%{?fedora} >= 37
+BuildRequires: libusb1-devel
+BuildRequires: libusb-compat-0.1-devel
+%else
BuildRequires: libusb-devel
%endif
+%endif
# PYTHON3 support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8
%global python python3
%global __python %__python3
%global python_sitearch %{python3_sitearch}
@@ -118,8 +131,12 @@ BuildRequires: %{_lib}boost_python3-devel
BuildRequires: libboost_%{python}-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?rhel} == 7
+BuildRequires: boost-python36-devel
+%else
BuildRequires: boost-%{python}-devel
%endif
+%endif
# OCAML support
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
@@ -1148,7 +1165,7 @@ sed -i "kig/pykig/pykig.py" \
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -1158,6 +1175,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc b/redhat/core/tdeedu/trinity-tdeedu-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc
+++ b/redhat/core/tdeedu/trinity-tdeedu-rpmlintrc
diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec
index 7c925dd1c..26bb8d057 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/core/tdegames/tdegames.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdegames
%define tde_prefix /opt/trinity
@@ -66,7 +66,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -91,19 +91,32 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -1183,7 +1196,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -1193,6 +1206,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdegames/trinity-tdegames-rpmlintrc b/redhat/core/tdegames/trinity-tdegames-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdegames/trinity-tdegames-rpmlintrc
+++ b/redhat/core/tdegames/trinity-tdegames-rpmlintrc
diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec
index 7d3037300..61cb07890 100644
--- a/redhat/main/tdegraphics/tdegraphics.spec
+++ b/redhat/core/tdegraphics/tdegraphics.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdegraphics
%define tde_prefix /opt/trinity
@@ -28,6 +28,7 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
@@ -59,7 +60,7 @@ Source1: %{name}-rpmlintrc
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: libtool
@@ -80,38 +81,63 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# LIBUSB support
-BuildRequires: libusb-devel
+%if 0%{?fedora} >= 37
+BuildRequires: libusb1-devel
+BuildRequires: libusb-compat-0.1-devel
+%else
+BuildRequires: libusb-devel
+%endif
# MNG support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mng-devel
+%else
BuildRequires: libmng-devel
+%endif
# TIFF support
-BuildRequires: libtiff-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}tiff-devel
+%else
+BuildRequires: libtiff-devel
+%endif
# PCRE support
BuildRequires: pcre-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# GIF support
%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
BuildRequires: giflib-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gif-devel
+%else
BuildRequires: libungif-devel
%endif
+%endif
# GPHOTO2 support
-%if 0%{?suse_version}
-BuildRequires: libgphoto2-devel
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gphoto-devel
%else
-BuildRequires: gphoto2-devel
+BuildRequires: gphoto2-devel
+%endif
+%else
+BuildRequires: libgphoto2-devel
%endif
# PAPER support
@@ -163,7 +189,7 @@ BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
@@ -175,8 +201,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -189,11 +219,19 @@ BuildRequires: xorg-x11-Mesa-libGLU
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}drm-devel
+%else
BuildRequires: libdrm-devel
%endif
+%endif
# OPENEXR support
+%if 0%{?mdkver} >= 24090000
+BuildRequires: %{_lib}openexr-devel
+%else
BuildRequires: OpenEXR-devel
+%endif
# POPPLER support
%define with_pdf 1
@@ -225,7 +263,11 @@ BuildRequires: lcms-devel
BuildRequires: fribidi-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# kamera
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
@@ -339,6 +381,8 @@ picker.
%{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
%{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
%{tde_tdedocdir}/HTML/en/kcoloredit/
+%{tde_mandir}/man1/kcolorchooser.1*
+%{tde_mandir}/man1/kcoloredit.1*
##########
@@ -435,6 +479,7 @@ This program and KPart allow the user to display *.DVI files from TeX.
%{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
%{tde_datadir}/services/kdvimultipage.desktop
%{tde_tdedocdir}/HTML/en/kdvi/
+%{tde_mandir}/man1/kdvi.1*
##########
@@ -454,6 +499,7 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
%{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
%{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
%{tde_tdedocdir}/HTML/en/kfax/
+%{tde_mandir}/man1/kfax.1*
##########
@@ -480,6 +526,7 @@ kfax application once it reproduces all of kfax's features.
%{tde_datadir}/services/kfaxmultipage.desktop
%{tde_datadir}/services/kfaxmultipage_tiff.desktop
%{tde_tdedocdir}/HTML/en/kfaxview/
+%{tde_mandir}/man1/kfaxview.1*
##########
@@ -533,6 +580,7 @@ online.
%{tde_datadir}/icons/hicolor/*/apps/kghostview.png
%{tde_datadir}/services/kghostview_part.desktop
%{tde_tdedocdir}/HTML/en/kghostview/
+%{tde_mandir}/man1/kghostview.1*
##########
@@ -553,6 +601,7 @@ TDEIconedit allows you easily to create and edit icons.
%{tde_datadir}/apps/tdeiconedit/
%{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png
%{tde_tdedocdir}/HTML/en/tdeiconedit/
+%{tde_mandir}/man1/tdeiconedit.1*
##########
@@ -620,6 +669,7 @@ Homepage: http://kolourpaint.sourceforge.net
%{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
%{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
%{tde_tdedocdir}/HTML/en/kolourpaint/
+%{tde_mandir}/man1/kolourpaint.1*
##########
@@ -650,6 +700,7 @@ Homepage: http://kooka.kde.org/
%config(noreplace) %{tde_confdir}/kookarc
%{tde_datadir}/icons/hicolor/*/apps/kooka.png
%{tde_tdedocdir}/HTML/en/kooka/
+%{tde_mandir}/man1/kooka.1*
##########
@@ -675,6 +726,7 @@ application.
%{tde_datadir}/icons/hicolor/*/apps/kpdf.png
%{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
%{tde_datadir}/services/kpdf_part.desktop
+%{tde_mandir}/man1/kpdf.1*
##########
@@ -708,6 +760,7 @@ Homepage: http://www.kpovmodeler.org
%{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
%{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
%doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
+%{tde_mandir}/man1/kpovmodeler.1*
##########
@@ -726,6 +779,7 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
%{tde_datadir}/apps/kruler/
%{tde_datadir}/icons/hicolor/*/apps/kruler.png
%{tde_tdedocdir}/HTML/en/kruler/
+%{tde_mandir}/man1/kruler.1*
##########
@@ -745,6 +799,7 @@ The images can then be saved in a variety of formats.
%{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
%{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
%{tde_tdedocdir}/HTML/en/ksnapshot/
+%{tde_mandir}/man1/ksnapshot.1*
##########
@@ -832,6 +887,7 @@ as well.
%{tde_datadir}/servicetypes/kimageviewer.desktop
%{tde_datadir}/servicetypes/kimageviewercanvas.desktop
%{tde_tdedocdir}/HTML/en/kview/
+%{tde_mandir}/man1/kview.1*
##########
@@ -868,6 +924,7 @@ DjVu images.
%{tde_datadir}/services/emptymultipage.desktop
%{tde_datadir}/services/djvumultipage.desktop
%{tde_datadir}/servicetypes/tdemultipage.desktop
+%{tde_mandir}/man1/kviewshell.1*
##########
@@ -1037,7 +1094,7 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -1048,6 +1105,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc b/redhat/core/tdegraphics/trinity-tdegraphics-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc
+++ b/redhat/core/tdegraphics/trinity-tdegraphics-rpmlintrc
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec
index 5f9eac00b..f156b1c6b 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/core/tdelibs/tdelibs.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdelibs
%define tde_prefix /opt/trinity
@@ -86,7 +86,7 @@ Requires: trinity-filesystem >= %{tde_version}
Requires: fileshareset >= 2.0
%endif
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -105,25 +105,49 @@ BuildRequires: brp-check-trinity
BuildRequires: krb5-devel
# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
# ALSA support
-BuildRequires: alsa-lib-devel
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
# IDN support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}idn-devel
+%else
BuildRequires: libidn-devel
+%endif
# CUPS support
BuildRequires: cups-devel
# TIFF support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}tiff-devel
+%else
BuildRequires: libtiff-devel
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# GLIB2 support
BuildRequires: glib2-devel
@@ -140,7 +164,7 @@ BuildRequires: aspell-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -148,8 +172,12 @@ BuildRequires: gamin-devel
# PCRE support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_pcre 1
+%if 0%{?mgaversion} >= 9
+BuildRequires: %{_lib}pcre-devel
+%else
BuildRequires: pcre-devel
%endif
+%endif
# INOTIFY support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -214,7 +242,12 @@ Requires: avahi
# OPENEXR support
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_openexr 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openexr-devel
+%else
BuildRequires: OpenEXR-devel
+%endif
+
%if 0%{?pclinuxos}
BuildRequires: libpthread-stubs
%endif
@@ -241,10 +274,12 @@ BuildRequires: xorg-x11-devel
%endif
# ICEAUTH
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
+%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220
Requires: iceauth
BuildRequires: iceauth
%endif
+
+# Xorg
%if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 )
Requires: xorg-x11-server-utils
BuildRequires: xorg-x11-server-utils
@@ -276,8 +311,8 @@ Requires: ca-certificates
%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
%endif
%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver}
+%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver}
Requires: rootcerts
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
%else
@@ -322,22 +357,26 @@ Requires: %{cacert}
%define xt_devel libXt-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-%define xt_devel libxt-devel
+%define xt_devel %{_lib}xt-devel
%endif
%{?xt_devel:BuildRequires: %{xt_devel}}
### New features in TDE R14
# LIBMAGIC support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}magic-devel
+%else
%if 0%{?rhel} != 5
BuildRequires: file-devel
%endif
+%endif
# NETWORKMANAGER support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
%define with_nm 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} != 8
+%if 0%{?mgaversion} && 0%{?mgaversion} <= 7
BuildRequires: %{_lib}nm-util-devel
%endif
%endif
@@ -356,8 +395,12 @@ BuildRequires: NetworkManager-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# HAL support
%if 0%{?rhel} == 5
@@ -377,15 +420,23 @@ Requires: udisks
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
%define with_udisks2 1
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-BuildRequires: libudisks2-devel
-%else
+%define udisks2 udisks2
+%define udisks2_devel libudisks2-devel
+%endif
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
-BuildRequires: libudisks2-0-devel
-%else
-BuildRequires: udisks2-devel
+%define udisks2 udisks2
+%define udisks2_devel libudisks2-0-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+%define udisks2 udisks2
+%define udisks2_devel udisks2-devel
%endif
+%if "%{?distribution}" == "OpenMandriva Lx"
+%define udisks2 udisks
+%define udisks2_devel %{_lib}udisks-devel
%endif
-Requires: udisks2
+Requires: %{udisks2}
+BuildRequires: %{udisks2_devel}
%endif
# DEVICEKIT POWER support
@@ -443,7 +494,12 @@ BuildRequires: libr-devel >= 0.6.0
%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
# INTLTOOL support
BuildRequires: intltool
@@ -593,7 +649,7 @@ Requires: libtqt3-mt-devel >= 3.5.0
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: %{libattr_devel}
Requires: intltool
%{?xcomposite_devel:Requires: %{xcomposite_devel}}
%{?xt_devel:Requires: %{xt_devel}}
@@ -647,7 +703,7 @@ fi
export TDEDIR="%{tde_prefix}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -657,6 +713,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/core/tdelibs/trinity-tdelibs-rpmlintrc
index cd73a0285..c65feac8b 100644
--- a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
+++ b/redhat/core/tdelibs/trinity-tdelibs-rpmlintrc
@@ -2,3 +2,4 @@ setBadness('suse-dbus-unauthorized-service', 0)
setBadness('permissions-file-setuid-bit', 0)
setBadness('non-position-independent-executable', 0)
setBadness('library-without-ldconfig-postun', 0)
+setBadness('binary-or-shlib-defines-rpath', 0)
diff --git a/redhat/main/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
index 0370625f9..ffcf06f3a 100644
--- a/redhat/main/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdemultimedia
%define tde_prefix /opt/trinity
@@ -31,6 +31,7 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
@@ -72,7 +73,7 @@ BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: fdupes
BuildRequires: desktop-file-utils
@@ -110,21 +111,48 @@ BuildRequires: zlib-devel
#BuildRequires: libmusicbrainz-devel libtunepimp-devel
# Audio libraries
-BuildRequires: libvorbis-devel
BuildRequires: audiofile-devel
-BuildRequires: libtheora-devel
-BuildRequires: alsa-lib-devel
BuildRequires: cdparanoia
#BuildRequires: libmpg123-devel
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
+# THEORA
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}theora-devel
+%else
+BuildRequires: libtheora-devel
+%endif
+
+# ALSA support
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
+
# CDDA support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}cdda-devel
+%else
BuildRequires: libcdda-devel
%endif
+%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: cdparanoia-devel
%endif
+# CDIO support
+BuildRequires: libcdio-devel
+BuildRequires: libcdio-paranoia-devel
+
# FLAC support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
@@ -139,9 +167,14 @@ BuildRequires: flac-devel
# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gstreamer-devel
+BuildRequires: %{_lib}gst-plugins-base1.0-devel
+%else
BuildRequires: %{_lib}gstreamer1.0-devel
BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel
%endif
+%endif
%if 0%{?rhel} == 4
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel
@@ -177,8 +210,12 @@ BuildRequires: libXxf86vm-devel
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
@@ -211,13 +248,26 @@ BuildRequires: libmp3lame-devel
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# ATTR support
-BuildRequires: libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: lame-devel
@@ -459,6 +509,7 @@ Some of JuK's features include:
%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
%{tde_datadir}/icons/hicolor/*/apps/juk.png
%{tde_tdedocdir}/HTML/en/juk/
+%{tde_mandir}/man1/juk.1*
##########
@@ -485,6 +536,7 @@ for TDE. It uses the aRts framework for playing media files.
%{tde_datadir}/services/kaboodle_component.desktop
%{tde_datadir}/services/kaboodleengine.desktop
%{tde_tdedocdir}/HTML/en/kaboodle/
+%{tde_mandir}/man1/kaboodle.1*
##########
@@ -515,6 +567,7 @@ searches CDDB to retrieve the information of the disk.
%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
%{tde_tdedocdir}/HTML/en/kaudiocreator/
+%{tde_mandir}/man1/kaudiocreator.1*
##########
@@ -672,6 +725,8 @@ This package includes TDE's dockable sound mixer applet.
%{tde_datadir}/icons/hicolor/*/apps/kmix.png
%{tde_datadir}/services/kmixctrl_restore.desktop
%{tde_tdedocdir}/HTML/en/kmix/
+%{tde_mandir}/man1/kmix.1*
+%{tde_mandir}/man1/kmixctrl.1*
##########
@@ -710,6 +765,7 @@ This is a sound recording utility for Trinity.
%{tde_datadir}/services/krec_exportwave.desktop
%{tde_datadir}/servicetypes/krec_exportitem.desktop
%{tde_tdedocdir}/HTML/en/krec/
+%{tde_mandir}/man1/krec.1*
##########
@@ -780,6 +836,7 @@ This package contains audiofile plugins for aRts.
##########
%if 0%{?with_mpeg}
+
%package -n trinity-libarts-mpeglib
Summary: Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
Group: Productivity/Multimedia/Other
@@ -793,7 +850,7 @@ This is the arts (TDE Sound daemon) plugin.
%files -n trinity-libarts-mpeglib
%defattr(-,root,root,-)
%{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so*
+%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
%{tde_libdir}/libarts_mpeglib.la
%{tde_libdir}/libarts_splay.so.*
%{tde_libdir}/libarts_splay.la
@@ -968,6 +1025,7 @@ formats supported by your installation of aRts (including aRts plugins).
%{tde_datadir}/icons/hicolor/*/apps/noatun.png
%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
%{tde_tdedocdir}/HTML/en/noatun/
+%{tde_mandir}/man1/noatun.1*
##########
@@ -996,6 +1054,7 @@ noatun plugins.
%{tde_libdir}/libarts_audiofile.so
%if 0%{?with_mpeg}
%{tde_libdir}/libarts_mpeglib.so
+%{tde_libdir}/libarts_mpeglib-0.3.0.so
%{tde_libdir}/libarts_splay.so
%endif
%if 0%{?with_xine}
@@ -1059,7 +1118,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -1069,6 +1128,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc b/redhat/core/tdemultimedia/trinity-tdemultimedia-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc
+++ b/redhat/core/tdemultimedia/trinity-tdemultimedia-rpmlintrc
diff --git a/redhat/main/tdenetwork/kppp.pamd b/redhat/core/tdenetwork/kppp.pamd
index c7d67e332..c7d67e332 100644
--- a/redhat/main/tdenetwork/kppp.pamd
+++ b/redhat/core/tdenetwork/kppp.pamd
diff --git a/redhat/main/tdenetwork/ktalk b/redhat/core/tdenetwork/ktalk
index 4458a0964..4458a0964 100644
--- a/redhat/main/tdenetwork/ktalk
+++ b/redhat/core/tdenetwork/ktalk
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec
index c7681f983..0a6e431ca 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/core/tdenetwork/tdenetwork.spec
@@ -26,7 +26,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdenetwork
%define tde_prefix /opt/trinity
@@ -77,7 +77,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: libtqca-devel >= %{tde_epoch}:1.0
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gettext
BuildRequires: coreutils
BuildRequires: gcc-c++
@@ -114,7 +114,11 @@ Requires: avahi
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# TLS support
BuildRequires: gnutls-devel
@@ -129,15 +133,19 @@ BuildRequires: sqlite-devel
# GADU support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_gadu 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}gadu-devel
+%else
BuildRequires: libgadu-devel
%endif
+%endif
# PCRE support
BuildRequires: pcre-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -158,7 +166,7 @@ BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
@@ -177,18 +185,24 @@ BuildRequires: libXxf86vm-devel
#define _with_xmms --with-xmms
# Wifi support
-%define with_wifi 1
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
+%define wifi_devel wireless-tools-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires: %{_lib}iw29-devel
+%define wifi_devel %{_lib}iw29-devel
%endif
%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
+%define wifi_devel wireless-tools
%endif
%if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires: libiw-devel
+%define wifi_devel libiw-devel
+%endif
+%if 0%{?mdkver}
+%define wifi_devel %nil
+%endif
+%if "%{wifi_devel}" != ""
+%define with_wifi 1
+BuildRequires: %{wifi_devel}
%endif
# OpenSLP support
@@ -217,7 +231,13 @@ BuildRequires: kernel-headers
# XML support
BuildRequires: libxml2-devel
+
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
#jabber
BuildRequires: libidn-devel
@@ -234,7 +254,11 @@ BuildRequires: speex-devel
#Requires: jasper
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# MEANWHILE support
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version}
@@ -252,6 +276,14 @@ BuildRequires: speex-devel
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_consolehelper 1
+# XINETD support
+%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
+# No xinetd
+%else
+%define with_xinetd 1
+Requires: xinetd
+%endif
+
# Avoids relinking, which breaks consolehelper
%define dont_relink 1
%endif
@@ -433,6 +465,7 @@ basic as well as advanced queries.
%{tde_datadir}/apps/kicker/applets/kdictapplet.desktop
%{tde_datadir}/icons/hicolor/*/apps/kdict.*
%{tde_tdedocdir}/HTML/en/kdict
+%{tde_mandir}/man1/kdict.1*
##########
@@ -492,6 +525,7 @@ applications and Netscape.
%{tde_datadir}/sounds/KGet_Finished_All.ogg
%{tde_datadir}/sounds/KGet_Started.ogg
%{tde_tdedocdir}/HTML/en/kget
+%{tde_mandir}/man1/kget.1*
##########
@@ -705,7 +739,7 @@ Support for more IM protocols can be added through a plugin system.
%endif
# smpp plugin for kopete
%{tde_datadir}/config.kcfg/smpppdcs.kcfg
-# aim support is deprecated in TDE 14.1.0
+# aim support is deprecated in TDE 14.1.x
%if 0%{?with_aim}
%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
@@ -721,6 +755,7 @@ Support for more IM protocols can be added through a plugin system.
%{tde_libdir}/libkopete_msn_shared.so.0
%{tde_libdir}/libkopete_msn_shared.so.0.0.0
%endif
+%{tde_mandir}/man1/kopete.1*
##########
@@ -918,7 +953,7 @@ Summary: Talk daemon for Trinity
Group: Applications/Internet
Requires: trinity-kcontrol >= %{tde_version}
Requires: trinity-tdebase-data >= %{tde_version}
-%if 0%{?fedora} == 0 || 0%{?fedora} <= 33
+%if 0%{?with_xinetd}
Requires: xinetd
%endif
@@ -938,10 +973,10 @@ and shouldn't be run on a multi-user machine.
%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
%{tde_datadir}/sounds/ktalkd.wav
-%if 0%{?fedora} == 0 || 0%{?fedora} <= 30
+%if 0%{?with_xinetd}
%dir %{_sysconfdir}/xinetd.d
-%endif
%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
+%endif
%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
%{tde_tdedocdir}/HTML/en/ktalkd
@@ -974,6 +1009,7 @@ wavelan card that uses the wireless extensions interface.
%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
%{tde_tdedocdir}/HTML/en/kwifimanager/
%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/
+%{tde_mandir}/man1/kwifimanager.1*
%endif
@@ -1024,6 +1060,8 @@ but relying only on the TCP/IP protocol.
%{tde_datadir}/services/rlan.protocol
%{tde_bindir}/lisa
%{tde_bindir}/reslisa
+%{tde_mandir}/man8/lisa.8*
+%{tde_mandir}/man8/reslisa.8*
##########
@@ -1048,6 +1086,7 @@ A tdeioslave and tded module that provide Zeroconf support. Try
%{tde_datadir}/apps/zeroconf/_nfs._tcp
%{tde_datadir}/apps/zeroconf/_ssh._tcp
%{tde_datadir}/apps/zeroconf/_rfb._tcp
+%{tde_datadir}/apps/zeroconf/_sftp-ssh._tcp
%{tde_tdelibdir}/tdeio_zeroconf.so
%{tde_tdelibdir}/tdeio_zeroconf.la
%{tde_tdelibdir}/kded_dnssdwatcher.so
@@ -1085,7 +1124,7 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -1095,6 +1134,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -1167,8 +1207,10 @@ if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then
chmod 0755 "%{?buildroot}%{tde_bindir}/kppp"
fi
+%if 0%{?with_xinetd}
# ktalk
%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
+%endif
# Avoids conflict with trinity-kvirc
%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
diff --git a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc b/redhat/core/tdenetwork/trinity-tdenetwork-rpmlintrc
index 8d22f2fc6..8d22f2fc6 100644
--- a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc
+++ b/redhat/core/tdenetwork/trinity-tdenetwork-rpmlintrc
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec
index 244229e11..de1c98944 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/core/tdepim/tdepim.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdepim
%define tde_prefix /opt/trinity
@@ -68,22 +68,45 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: libcaldav-devel >= %{tde_epoch}:0.6.5
BuildRequires: libcarddav-devel >= %{tde_epoch}:0.6.2
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: fdupes
BuildRequires: desktop-file-utils
BuildRequires: make
BuildRequires: gpgme-devel
-BuildRequires: libgpg-error-devel
BuildRequires: flex
-BuildRequires: libical-devel
BuildRequires: boost-devel
BuildRequires: pcre-devel
BuildRequires: libidn-devel
+# ICAL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}ical-devel
+%else
+BuildRequires: libical-devel
+%endif
+
+# GPG-ERROR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gpg-error-devel
+%else
+BuildRequires: libgpg-error-devel
+%endif
+
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
+
+# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
+BuildRequires: libacl-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -97,7 +120,7 @@ BuildRequires: brp-check-trinity
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -126,8 +149,12 @@ BuildRequires: curl-devel
BuildRequires: glib2-devel
# SASL support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}sasl-devel
+%else
BuildRequires: %{_lib}sasl2-devel
+%endif
%else
BuildRequires: cyrus-sasl-devel
%endif
@@ -149,6 +176,7 @@ BuildRequires: libXcomposite-devel
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
# RHEL 8: available in EPEL
+# RHEL 9: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
@@ -186,9 +214,6 @@ BuildRequires: xscreensaver-gl
%endif
%endif
-# ACL support
-BuildRequires: libacl-devel
-
Requires: trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -834,8 +859,12 @@ Requires: gnupg2
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
Requires: pinentry
+%if 0%{?mdkver}
+Requires: gnupg
+%else
Requires: dirmngr
%endif
+%endif
%description -n trinity-kleopatra
Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
@@ -1844,7 +1873,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -1855,6 +1884,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdepim/trinity-tdepim-rpmlintrc b/redhat/core/tdepim/trinity-tdepim-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdepim/trinity-tdepim-rpmlintrc
+++ b/redhat/core/tdepim/trinity-tdepim-rpmlintrc
diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec
index 0718a6fa8..8d1ac42b6 100644
--- a/redhat/main/tdesdk/tdesdk.spec
+++ b/redhat/core/tdesdk/tdesdk.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdesdk
%define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-perl-dcop >= %{tde_version}
BuildRequires: trinity-tdepim-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: fdupes
@@ -80,14 +80,18 @@ BuildRequires: brp-check-trinity
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -117,12 +121,21 @@ BuildRequires: libdb-4_8-devel
# kbabel, F-7+: flex >= 2.5.33-9
BuildRequires: flex
+%if 0%{?mdkver}
+BuildRequires: flex-devel
+%endif
# umbrello
-BuildRequires: libxslt-devel
BuildRequires: libxml2-devel
BuildRequires: subversion-devel
BuildRequires: neon-devel
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
+BuildRequires: libxslt-devel
+%endif
+
# PERL support
BuildRequires: perl
%if 0%{?fedora} >= 19
@@ -130,7 +143,11 @@ BuildRequires: perl-podlators
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
@@ -253,6 +270,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%defattr(-,root,root,-)
%{tde_bindir}/kapptemplate
%{tde_datadir}/apps/kapptemplate/
+%{tde_mandir}/man1/kapptemplate.1*
%pre -n trinity-kapptemplate
if [ -d "%{tde_bindir}/kapptemplate" ]; then
@@ -378,6 +396,9 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/servicetypes/kbabel_validator.desktop
%{tde_datadir}/servicetypes/kbabeldict_module.desktop
%{tde_datadir}/servicetypes/kbabelfilter.desktop
+%{tde_mandir}/man1/catalogmanager.1*
+%{tde_mandir}/man1/kbabel.1*
+%{tde_mandir}/man1/kbabeldict.1*
##########
@@ -434,6 +455,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/icons/locolor/*/apps/kbugbuster.png
%{tde_datadir}/services/tderesources/kcal/bugzilla.desktop
%{tde_tdedocdir}/HTML/en/kbugbuster/
+%{tde_mandir}/man1/kbugbuster.1*
##########
@@ -461,6 +483,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/icons/hicolor/*/apps/tdecachegrind.png
%{tde_datadir}/mimelnk/application/x-tdecachegrind.desktop
%{tde_tdedocdir}/HTML/en/tdecachegrind/
+%{tde_mandir}/man1/tdecachegrind.1*
##########
@@ -492,6 +515,11 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_bindir}/memprof2calltree
%{tde_bindir}/op2calltree
%{tde_bindir}/pprof2calltree
+%{tde_mandir}/man1/dprof2calltree.1*
+%{tde_mandir}/man1/hotshot2calltree.1*
+%{tde_mandir}/man1/memprof2calltree.1*
+%{tde_mandir}/man1/op2calltree.1*
+%{tde_mandir}/man1/pprof2calltree.1*
##########
@@ -626,13 +654,46 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_bindir}/svnchangesince
%{tde_bindir}/svn-clean
%{tde_datadir}/apps/katepart/syntax/tdesvn-buildrc.xml
-%{tde_mandir}/man1/cvsblame.1
-%{tde_mandir}/man1/cvscheck.1
-%{tde_mandir}/man1/cvsversion.1
-%{tde_mandir}/man1/kde-build.1
-%{tde_mandir}/man1/includemocs.1
-%{tde_mandir}/man1/noncvslist.1
-%{tde_mandir}/man1/tdesvn-build.1
+%{tde_mandir}/man1/adddebug.1*
+%{tde_mandir}/man1/build-progress.sh.1*
+%{tde_mandir}/man1/cheatmake.1*
+%{tde_mandir}/man1/create_cvsignore.1*
+%{tde_mandir}/man1/create_makefile.1*
+%{tde_mandir}/man1/create_makefiles.1*
+%{tde_mandir}/man1/cvsblame.1*
+%{tde_mandir}/man1/cvscheck.1*
+%{tde_mandir}/man1/cvs-clean.1*
+%{tde_mandir}/man1/cvs2dist.1*
+%{tde_mandir}/man1/cvsaskpass.1*
+%{tde_mandir}/man1/cvsbackport.1*
+%{tde_mandir}/man1/cvsforwardport.1*
+%{tde_mandir}/man1/cvslastchange.1*
+%{tde_mandir}/man1/cvslastlog.1*
+%{tde_mandir}/man1/cvsrevertlast.1*
+%{tde_mandir}/man1/cvsservice.1*
+%{tde_mandir}/man1/cvsversion.1*
+%{tde_mandir}/man1/cxxmetric.1*
+%{tde_mandir}/man1/extend_dmalloc.1*
+%{tde_mandir}/man1/extractattr.1*
+%{tde_mandir}/man1/extractrc.1*
+%{tde_mandir}/man1/findmissingcrystal.1*
+%{tde_mandir}/man1/fixkdeincludes.1*
+%{tde_mandir}/man1/fixuifiles.1*
+%{tde_mandir}/man1/includemocs.1*
+%{tde_mandir}/man1/kde-build.1*
+%{tde_mandir}/man1/kdedoc.1*
+%{tde_mandir}/man1/kdelnk2desktop.py.1*
+%{tde_mandir}/man1/kdemangen.pl.1*
+%{tde_mandir}/man1/licensecheck.1*
+%{tde_mandir}/man1/noncvslist.1*
+%{tde_mandir}/man1/makeobj.1*
+%{tde_mandir}/man1/package_crystalsvg.1*
+%{tde_mandir}/man1/png2mng.pl.1
+%{tde_mandir}/man1/pruneemptydirs.1
+%{tde_mandir}/man1/qtdoc.1*
+%{tde_mandir}/man1/tdekillall.1*
+%{tde_mandir}/man1/tdesvn-build.1*
+%{tde_mandir}/man1/zonetab2pot.py.1*
%{tde_tdedocdir}/HTML/en/tdesvn-build/
#scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
#scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
@@ -673,6 +734,10 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_libdir}/kmtrace/libktrace.la
%{tde_libdir}/kmtrace/libktrace.so
%{tde_datadir}/apps/kmtrace/
+%{tde_mandir}/man1/demangle.1*
+%{tde_mandir}/man1/kminspector.1*
+%{tde_mandir}/man1/kmmatch.1*
+%{tde_mandir}/man1/kmtrace.1*
##########
@@ -705,6 +770,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/icons/hicolor/*/apps/kompare.png
%{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz
%{tde_tdedocdir}/HTML/en/kompare/
+%{tde_mandir}/man1/kompare.1*
##########
@@ -729,6 +795,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%defattr(-,root,root,-)
%{tde_libdir}/libkspy.la
%{tde_libdir}/libkspy.so.*
+%{tde_mandir}/man1/testkspy.1*
##########
@@ -760,6 +827,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/services/designerthumbnail.desktop
%{tde_datadir}/services/kuiviewer_part.desktop
%{tde_tdedocdir}/HTML/en/kuiviewer/
+%{tde_mandir}/man1/kuiviewer.1*
##########
@@ -842,6 +910,11 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_bindir}/swappo
%{tde_bindir}/transxx
%{tde_bindir}/xml2pot
+%{tde_mandir}/man1/po2xml.1*
+%{tde_mandir}/man1/split2po.1*
+%{tde_mandir}/man1/swappo.1*
+%{tde_mandir}/man1/transxx.1*
+%{tde_mandir}/man1/xml2pot.1*
##########
@@ -875,6 +948,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/icons/hicolor/*/mimetypes/umbrellofile.png
%{tde_datadir}/mimelnk/application/x-umbrello.desktop
%{tde_tdedocdir}/HTML/en/umbrello/
+%{tde_mandir}/man1/umbrello.1*
##########
@@ -1035,7 +1109,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -1050,6 +1124,7 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L%{tde_libdir}"
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc b/redhat/core/tdesdk/trinity-tdesdk-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc
+++ b/redhat/core/tdesdk/trinity-tdesdk-rpmlintrc
diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec
index 98b95239a..48cf7218a 100644
--- a/redhat/main/tdetoys/tdetoys.spec
+++ b/redhat/core/tdetoys/tdetoys.spec
@@ -21,7 +21,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdetoys
%define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires: trinity-kdesktop >= %{tde_version}
BuildRequires: trinity-kicker >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -87,19 +87,27 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# PCRE support
BuildRequires: pcre-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
Obsoletes: trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -325,10 +333,12 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_bindir}/kweatherreport
%{tde_libdir}/libtdeinit_kweatherreport.so
%{tde_libdir}/libtdeinit_kweatherreport.la
-%{tde_tdelibdir}/kcm_weather.so
-%{tde_tdelibdir}/kcm_weather.la
+%{tde_tdelibdir}/kcm_weatherapplet.so
+%{tde_tdelibdir}/kcm_weatherapplet.la
%{tde_tdelibdir}/kcm_weatherservice.so
%{tde_tdelibdir}/kcm_weatherservice.la
+%{tde_tdelibdir}/kcm_weatherstations.so
+%{tde_tdelibdir}/kcm_weatherstations.la
%{tde_tdelibdir}/kweatherreport.so
%{tde_tdelibdir}/kweatherreport.la
%{tde_tdelibdir}/weather_panelapplet.la
@@ -341,8 +351,9 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_datadir}/apps/kweatherservice/
%{tde_datadir}/icons/hicolor/*/apps/kweather.png
%{tde_datadir}/services/kweatherservice.desktop
-%{tde_datadir}/services/kcmweather.desktop
+%{tde_datadir}/services/kcmweatherapplet.desktop
%{tde_datadir}/services/kcmweatherservice.desktop
+%{tde_datadir}/services/kcmweatherstations.desktop
%{tde_tdedocdir}/HTML/en/kweather/
%{tde_mandir}/man*/kweatherreport.*
%{tde_mandir}/man*/kweatherservice.*
@@ -396,7 +407,7 @@ This package is part of Trinity, and a component of the TDE toys module.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -406,6 +417,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/main/tdeutils/kcmlaptoprc b/redhat/core/tdeutils/kcmlaptoprc
index 66d400f5d..66d400f5d 100644
--- a/redhat/main/tdeutils/kcmlaptoprc
+++ b/redhat/core/tdeutils/kcmlaptoprc
diff --git a/redhat/main/tdeutils/klaptop_acpi_helper.console b/redhat/core/tdeutils/klaptop_acpi_helper.console
index 6a738ec88..6a738ec88 100644
--- a/redhat/main/tdeutils/klaptop_acpi_helper.console
+++ b/redhat/core/tdeutils/klaptop_acpi_helper.console
diff --git a/redhat/main/tdeutils/klaptop_acpi_helper.pam b/redhat/core/tdeutils/klaptop_acpi_helper.pam
index 321c2eefb..321c2eefb 100644
--- a/redhat/main/tdeutils/klaptop_acpi_helper.pam
+++ b/redhat/core/tdeutils/klaptop_acpi_helper.pam
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec
index a482ce2cb..cd0c99dd7 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/core/tdeutils/tdeutils.spec
@@ -21,7 +21,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdeutils
%define tde_prefix /opt/trinity
@@ -31,6 +31,7 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
%define tde_sbindir %{tde_prefix}/sbin
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
@@ -74,7 +75,7 @@ BuildRequires: trinity-filesystem >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -84,18 +85,11 @@ BuildRequires: net-snmp-devel
BuildRequires: gmp-devel
# PYTHON support
-%if 0%{?sle_version} >= 150400
-%define python python3
-%define __python %__python3
-%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
-%define python python2
-%define __python %__python2
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%else
-%define python python
-%endif
+%if "%{python}" == ""
+%global python python3
%endif
+%global __python %__python3
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
@@ -127,7 +121,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -147,10 +141,15 @@ BuildRequires: pcre-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# XSCREENSAVER support
# RHEL 8: available in EPEL
+# RHEL 9: available in EPEL
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
@@ -166,7 +165,11 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# CONSOLEHELPER (usermode) support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@@ -176,9 +179,8 @@ BuildRequires: openssl-devel
%define dont_relink 1
%endif
-%if "%{?tde_version}" == "14.1.0"
+%define build_superkaramba 1
%define build_tdefilereplace 1
-%endif
Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -198,7 +200,9 @@ Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?build_superkaramba}
Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
%if 0%{?build_tdefilereplace}
Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
@@ -270,6 +274,7 @@ package.
%{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz
%{tde_datadir}/services/ark_part.desktop
%{tde_tdedocdir}/HTML/en/ark/
+%{tde_mandir}/man1/ark.1*
##########
@@ -299,6 +304,7 @@ It provides:
%{tde_datadir}/icons/hicolor/*/apps/kcalc.png
%{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
%{tde_tdedocdir}/HTML/en/kcalc/
+%{tde_mandir}/man1/kcalc.1*
##########
@@ -321,6 +327,7 @@ This package contains kcharselect, a character set selector for TDE.
%{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop
%{tde_datadir}/icons/hicolor/*/apps/kcharselect.png
%{tde_tdedocdir}/HTML/en/kcharselect/
+%{tde_mandir}/man1/kcharselect.1*
##########
@@ -411,6 +418,8 @@ in a file manager.
%{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png
%{tde_tdedocdir}/HTML/en/kdf/
%{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/
+%{tde_mandir}/man1/kdf.1*
+%{tde_mandir}/man1/kwikdisk.1*
##########
@@ -437,6 +446,7 @@ reasonably fast start.
%{tde_datadir}/config.kcfg/kedit.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kedit.png
%{tde_tdedocdir}/HTML/en/kedit/
+%{tde_mandir}/man1/kedit.1*
##########
@@ -456,6 +466,7 @@ to format 3.5" and 5.25" floppy disks.
%{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop
%{tde_datadir}/icons/hicolor/*/apps/kfloppy.png
%{tde_tdedocdir}/HTML/en/kfloppy/
+%{tde_mandir}/man1/kfloppy.1*
##########
@@ -491,6 +502,7 @@ Features:
%{tde_datadir}/config.kcfg/kgpg.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kgpg.png
%{tde_tdedocdir}/HTML/en/kgpg/
+%{tde_mandir}/man1/kgpg.1*
##########
@@ -518,6 +530,7 @@ support and other powerful features.
%{tde_datadir}/services/kbyteseditwidget.desktop
%{tde_datadir}/services/khexedit2part.desktop
%{tde_tdedocdir}/HTML/en/khexedit/
+%{tde_mandir}/man1/khexedit.1*
##########
@@ -754,6 +767,8 @@ keeps a master password to all wallets.
##########
+%if 0%{?build_superkaramba}
+
%package -n trinity-superkaramba
Summary: A program based on karamba improving the eyecandy of TDE
Group: Applications/Utilities
@@ -781,6 +796,9 @@ Here are just some examples of the things that can be done:
%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
%{tde_datadir}/mimelnk/application/x-superkaramba.desktop
%{tde_tdedocdir}/HTML/en/superkaramba/
+%{tde_mandir}/man1/superkaramba.1*
+
+%endif
##########
@@ -814,6 +832,7 @@ This package is part of Trinity, as a component of the TDE utilities module.
%{tde_tdedocdir}/HTML/en/tdefilereplace/
%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
%{tde_datadir}/services/tdefilereplacepart.desktop
+%{tde_mandir}/man1/tdefilereplace.1*
%endif
@@ -866,7 +885,7 @@ This package contains the development files for tdeutils.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 && 0%{?build_superkaramba}
# Reverts some older Python stuff
%__sed -i "superkaramba/src/"*".cpp" \
-e "s|PyBytes_CheckExact|PyString_CheckExact|g" \
@@ -886,7 +905,7 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -896,6 +915,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
@@ -909,6 +929,11 @@ fi
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
\
+%if 0%{?fedora} == 39
+ -DPYTHON_LIBRARY="%{_libdir}/libpython3.11.so.1.0" \
+ -DPYTHON_INCLUDE_DIR="%{_includedir}/python3.11" \
+%endif
+ \
-DWITH_DPMS=ON \
%{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-DWITH_ASUS=ON \
@@ -923,6 +948,8 @@ fi
-DWITH_TDENEWSTUFF=ON \
-DBUILD_ALL=ON \
%{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
+ %{?!build_superkaramba:-DBUILD_SUPERKARAMBA=OFF} \
+ %{?!build_tdefilereplace:-DBUILD_TDEFILEREPLACE=OFF} \
..
%__make %{?_smp_mflags} || %__make
@@ -966,14 +993,18 @@ export PATH="%{tde_bindir}:${PATH}"
# Fix desktop shortcut location
if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%if 0%{?build_superkaramba}
%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+%endif
%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file KEdit Utility TextEditor
+%if 0%{?build_superkaramba}
%suse_update_desktop_file superkaramba Utility DesktopUtility
+%endif
%suse_update_desktop_file KCharSelect Utility Accessibility
%suse_update_desktop_file khexedit Utility Editor
%suse_update_desktop_file Kjots Utility TimeUtility
diff --git a/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc b/redhat/core/tdeutils/trinity-tdeutils-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc
+++ b/redhat/core/tdeutils/trinity-tdeutils-rpmlintrc
diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec
index 8755c4bd0..3f718693b 100644
--- a/redhat/main/tdevelop/tdevelop.spec
+++ b/redhat/core/tdevelop/tdevelop.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdevelop
%define tde_prefix /opt/trinity
@@ -81,7 +81,7 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: fdupes
BuildRequires: desktop-file-utils
@@ -100,7 +100,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -137,8 +137,12 @@ BuildRequires: neon-devel
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -148,19 +152,24 @@ BuildRequires: openldap24-libs-devel
# LIBACL support
%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
%endif
+%endif
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python python2
-%else
-%global __python python2
-%endif
+%global python python3
+%global __python %__python3
%description
@@ -321,8 +330,6 @@ individual needs.
%{tde_tdelibdir}/libkdevphpsupport.so
%{tde_tdelibdir}/libkdevpythonsupport.la
%{tde_tdelibdir}/libkdevpythonsupport.so
-%{tde_tdelibdir}/libkdevqt4importer.la
-%{tde_tdelibdir}/libkdevqt4importer.so
%{tde_tdelibdir}/libkdevqtimporter.la
%{tde_tdelibdir}/libkdevqtimporter.so
%{tde_tdelibdir}/libkdevquickopen.la
@@ -441,7 +448,6 @@ individual needs.
%{tde_datadir}/services/kdevpghpfoptions.desktop
%{tde_datadir}/services/kdevphpsupport.desktop
%{tde_datadir}/services/kdevpythonsupport.desktop
-%{tde_datadir}/services/kdevqt4importer.desktop
%{tde_datadir}/services/kdevqtimporter.desktop
%{tde_datadir}/services/kdevquickopen.desktop
%{tde_datadir}/services/kdevrbdebugger.desktop
@@ -524,7 +530,6 @@ individual needs.
%{tde_libdir}/libkinterfacedesigner.so.0.0.0
%{tde_tdelibdir}/libkdevvisualboyadvance.la
%{tde_tdelibdir}/libkdevvisualboyadvance.so
-%{tde_datadir}/apps/kdevdesignerpart/pics/
%{tde_datadir}/apps/kdevvisualboyadvance/
%{tde_tdedocdir}/HTML/en/tde_app_devel/
%{tde_datadir}/mimelnk/text/x-fortran.desktop
@@ -629,7 +634,7 @@ if [ -d "/usr/include/openldap24" ]; then
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -640,6 +645,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
diff --git a/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc b/redhat/core/tdevelop/trinity-tdevelop-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc
+++ b/redhat/core/tdevelop/trinity-tdevelop-rpmlintrc
diff --git a/redhat/main/tdewebdev/css.tar.bz2 b/redhat/core/tdewebdev/css.tar.bz2
index c66fc5ba4..c66fc5ba4 100644
--- a/redhat/main/tdewebdev/css.tar.bz2
+++ b/redhat/core/tdewebdev/css.tar.bz2
Binary files differ
diff --git a/redhat/main/tdewebdev/html.tar.bz2 b/redhat/core/tdewebdev/html.tar.bz2
index 7aa4db193..7aa4db193 100644
--- a/redhat/main/tdewebdev/html.tar.bz2
+++ b/redhat/core/tdewebdev/html.tar.bz2
Binary files differ
diff --git a/redhat/main/tdewebdev/javascript.tar.bz2 b/redhat/core/tdewebdev/javascript.tar.bz2
index aa044ec2d..aa044ec2d 100644
--- a/redhat/main/tdewebdev/javascript.tar.bz2
+++ b/redhat/core/tdewebdev/javascript.tar.bz2
Binary files differ
diff --git a/redhat/main/tdewebdev/php_manual_en_20030401.tar.bz2 b/redhat/core/tdewebdev/php_manual_en_20030401.tar.bz2
index 0b39d8cd0..0b39d8cd0 100644
--- a/redhat/main/tdewebdev/php_manual_en_20030401.tar.bz2
+++ b/redhat/core/tdewebdev/php_manual_en_20030401.tar.bz2
Binary files differ
diff --git a/redhat/main/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec
index 7892fe02b..d0ce64cce 100644
--- a/redhat/main/tdewebdev/tdewebdev.spec
+++ b/redhat/core/tdewebdev/tdewebdev.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tdewebdev
%define tde_prefix /opt/trinity
@@ -82,7 +82,12 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
%if 0%{?rhel} == 4
# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
@@ -99,14 +104,16 @@ BuildRequires: libxml2-devel
#endif
# ICU support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}icu-devel
+%else
BuildRequires: libicu-devel
+%endif
# Readline support
BuildRequires: readline-devel
-%if "%{?tde_version}" != "14.1.0"
-%define build_tdefilereplace 1
-%endif
+%define build_tdefilereplace 0
Obsoletes: trinity-kdewebdev-libs < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-kdewebdev-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -460,7 +467,7 @@ Requires: trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release}
unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -471,6 +478,7 @@ fi
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc b/redhat/core/tdewebdev/trinity-tdewebdev-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc
+++ b/redhat/core/tdewebdev/trinity-tdewebdev-rpmlintrc
diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec
index 6176c2d49..ed402a7dc 100644
--- a/redhat/dependencies/akode/akode.spec
+++ b/redhat/dependencies/akode/akode.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -62,7 +62,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: libtool
@@ -73,7 +73,7 @@ BuildRequires: trinity-filesystem >= %{tde_version}
# FLAC support
%define _with_flac --with-flac
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libflac-devel
+BuildRequires: %{_lib}flac-devel
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: flac-devel
@@ -83,7 +83,7 @@ BuildRequires: flac-devel
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _with_jack --with-jack
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libjack-devel
+BuildRequires: %{_lib}jack-devel
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: jack-audio-connection-kit-devel
@@ -93,14 +93,18 @@ BuildRequires: jack-audio-connection-kit-devel
# SAMPLERATE support
%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _with_libsamplerate --with-libsamplerate
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}samplerate-devel
+%else
BuildRequires: libsamplerate-devel
%endif
+%endif
# PULSEAUDIO support
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _with_pulseaudio --with-pulseaudio
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libpulseaudio-devel
+BuildRequires: %{_lib}pulseaudio-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: pulseaudio-libs-devel
@@ -114,18 +118,33 @@ BuildRequires: pulseaudio-devel
%ifarch %{ix86} x86_64
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%define _with_libmad --with-libmad
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mad-devel
+%else
BuildRequires: libmad-devel
%endif
%endif
+%endif
# ALSA support
%if 0%{?suse_version}
BuildRequires: alsa-devel
%else
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}asound-devel
+%else
BuildRequires: alsa-lib-devel
%endif
+%endif
+
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
-BuildRequires: libvorbis-devel
BuildRequires: speex-devel
@@ -314,7 +333,7 @@ This package contains the mad decoder for Akode.
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 8480ddc7e..b8ece2519 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg arts
%define tde_prefix /opt/trinity
@@ -32,6 +32,7 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
%define tde_sbindir %{tde_prefix}/sbin
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
@@ -66,18 +67,32 @@ BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
BuildRequires: trinity-filesystem >= %{tde_version}
Requires: trinity-filesystem >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: audiofile-devel
-BuildRequires: alsa-lib-devel
BuildRequires: glib2-devel
BuildRequires: gsl-devel
-BuildRequires: libvorbis-devel
+
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
+# ALSA support
+%if "%{?distribution}" == "OpenMandriva Lx"
+%define alsa_devel %{_lib}asound-devel
+%else
+%define alsa_devel alsa-lib-devel
+%endif
+BuildRequires: %{alsa_devel}
# ESOUND support
-%define with_esound 1
+#define with_esound 1
%if 0%{?with_esound}
BuildRequires: esound-devel
%endif
@@ -116,6 +131,9 @@ BuildRequires: libtool
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?mdkversion} || 0%{?mgaversion}
%define mad_devel libmad-devel
%endif
+%if 0%{?mdkver}
+%define mad_devel %{_lib}mad-devel
+%endif
BuildRequires: %{mad_devel}
%endif
%endif
@@ -162,6 +180,9 @@ playing a wave file with some effects.
%{tde_bindir}/artswrapper
# The '.la' files are needed for runtime, not devel !
%{tde_libdir}/lib*.la
+%{tde_mandir}/man1/artsc-config-trinity.1*
+%{tde_mandir}/man1/artscat-trinity.1*
+%{tde_mandir}/man1/artsdsp-trinity.1*
##########
@@ -173,10 +194,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: arts-devel < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
-Requires: alsa-lib-devel
+Requires: %{alsa_devel}
Requires: audiofile-devel
-Requires: libvorbis-devel
-%{?with_esound:Requires: esound-devel}
+%{?libvorbis_devel:Requires: %{libvorbis_devel}}
+%{?with_esound:Requires: esound-devel}
%{?with_libmad:Requires: %{mad_devel}}
%{?with_jack:Requires: %{jack_devel}}
@@ -240,7 +261,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -250,6 +271,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -257,16 +279,17 @@ fi
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
- -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \
+ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
+ -DMAN_INSTALL_DIR="%{tde_mandir}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
\
-DWITH_ALSA=ON \
-DWITH_AUDIOFILE=ON \
-DWITH_VORBIS=ON \
%{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \
- %{?with_esound:-DWITH_ESOUND=ON} \
- %{?with_jack:-DWITH_JACK=ON} \
+ %{?with_esound:-DWITH_ESOUND=ON} %{!?with_esound:-DWITH_ESOUND=OFF} \
+ %{?with_jack:-DWITH_JACK=ON} %{!?with_jack:-DWITH_JACK=OFF} \
..
%__make %{?_smp_mflags} || %__make
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
index df1e72379..94e0955f1 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -52,7 +52,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -68,7 +68,7 @@ BuildRequires: gettext-devel
BuildRequires: xorg-x11-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libxi-devel
+BuildRequires: %{_lib}xi-devel
%endif
%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: libXi-devel
@@ -86,11 +86,15 @@ BuildRequires: dbus-devel
%endif
# PCAP support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}cap-devel
+%else
BuildRequires: libcap-devel
+%endif
# AVAHI support
%if 0%{?mgaversion} || 0%{?mdkversion}
-%define avahi_devel libavahi-client-devel
+%define avahi_devel %{_lib}avahi-client-devel
%endif
%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
%define avahi_devel avahi-devel
@@ -101,9 +105,12 @@ BuildRequires: libcap-devel
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: expat-devel
%endif
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?suse_version}
BuildRequires: libexpat-devel
%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}expat-devel
+%endif
# NAS support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@@ -210,7 +217,7 @@ into a TQt main loop application.
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -222,6 +229,8 @@ fi
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DLIB_INSTALL_DIR="%{_libdir}" \
..
%__make %{?_smp_mflags} || %__make
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
index 2915ce93e..0d9c7b389 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -53,7 +53,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt3-mt-devel >= 3.5.0
BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -158,7 +158,7 @@ See the dbus description for more information about D-BUS in general.
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -173,7 +173,6 @@ fi
\
-DBIN_INSTALL_DIR=%{_bindir} \
-DINCLUDE_INSTALL_DIR=%{_includedir} \
- -DLIB_INSTALL_DIR=%{_libdir} \
..
%__make %{?_smp_mflags} || %__make
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
index f9bddec2e..758b7cf8c 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -52,7 +52,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -159,7 +159,7 @@ See the dbus description for more information about D-BUS in general.
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
index 95d16308f..63c6772d4 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
@@ -19,7 +19,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -51,7 +51,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -184,7 +184,7 @@ especially suitable for embedded applications.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -194,10 +194,12 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+ -DLIB_INSTALL_DIR="%{_libdir}" \
-DSHARE_INSTALL_PREFIX="%{_datadir}" \
\
-DWITH_ALL_OPTIONS=ON \
@@ -221,5 +223,4 @@ fi
%__rm -rf $RPM_BUILD_ROOT
-
%changelog
diff --git a/redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc b/redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc
new file mode 100644
index 000000000..5d46238fc
--- /dev/null
+++ b/redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc
@@ -0,0 +1 @@
+setBadness('lto-no-text-in-archive', 0)
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index d0287ec28..0fe560871 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg libcaldav
%define tde_prefix /opt/trinity
@@ -54,22 +54,30 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: make
BuildRequires: libtool
BuildRequires: fdupes
# GTK2 support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
%if 0%{?rhel} == 4
BuildRequires: evolution28-gtk2-devel
%else
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
%endif
+%endif
# CURL support
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libcurl_devel %{_lib}curl-devel >= 7.15.5
+%else
%define libcurl_devel libcurl-devel >= 7.15.5
+%endif
%else
%define libcurl_devel curl-devel >= 7.15.5
%endif
@@ -156,7 +164,7 @@ This package includes the development files.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -166,10 +174,12 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+ -DLIB_INSTALL_DIR="%{_libdir}" \
-DSHARE_INSTALL_PREFIX="%{_datadir}" \
\
-DWITH_ALL_OPTIONS=ON \
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 09970f7a0..cf992da1e 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg libcarddav
%define tde_prefix /opt/trinity
@@ -54,14 +54,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: libtool
# CURL support
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libcurl_devel %{_lib}curl-devel >= 7.15.5
+%else
%define libcurl_devel libcurl-devel >= 7.15.5
+%endif
%else
# Specific CURL version for TDE on RHEL 5 (and older)
%define libcurl_devel curl-devel >= 7.15.5
@@ -69,12 +73,16 @@ BuildRequires: libtool
%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
# GTK2 support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gtk+2.0-devel
+%else
%if 0%{?rhel} == 4
BuildRequires: evolution28-gtk2-devel
%else
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
%endif
+%endif
%description
Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite.
@@ -158,7 +166,7 @@ This package contains the development files.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -168,10 +176,12 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+ -DLIB_INSTALL_DIR="%{_libdir}" \
-DSHARE_INSTALL_PREFIX="%{_datadir}" \
\
-DWITH_ALL_OPTIONS=ON \
diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
index 403ddbf5a..cb3214d20 100644
--- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec
+++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
@@ -17,7 +17,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.0.11
+%define tde_version 14.1.2
%endif
%define tde_pkg polkit-tqt
@@ -50,15 +50,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: %{name}-rpmlintrc
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: trinity-dbus-1-tqt-devel
-BuildRequires: trinity-filesystem >= %{tde_version}
+BuildRequires: libtqt4-devel
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: gettext
+%if 0%{?mdkver}
+BuildRequires: %{_lib}polkit1-devel
+%else
BuildRequires: polkit-devel
+%endif
%description
PolicyKit is an application-level toolkit for defining and handling the policy
@@ -194,7 +198,7 @@ This package contains example files and applications.
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/pytqt/pytqt.spec
index be24592b2..9aa0eecf0 100644
--- a/redhat/dependencies/python-tqt/python-tqt.spec
+++ b/redhat/dependencies/pytqt/pytqt.spec
@@ -1,5 +1,5 @@
#
-# spec file for package python-tqt (version R14)
+# spec file for package pytqt (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -22,9 +22,9 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
-%define tde_pkg python-tqt
+%define tde_pkg pytqt
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -61,6 +61,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Obsoletes: trinity-PyQt < %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-python-qt3 < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-python-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
BuildRequires: tqt3-apps-devel >= 3.5.0
BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
@@ -71,19 +73,12 @@ BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1
BuildRequires: gcc-c++
# PYTHON support
-%if 0%{?sle_version} >= 150400
-%define python python3
-%define __python %__python3
-%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if "%{python}" == ""
+%global python python3
%endif
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
@@ -93,8 +88,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -108,7 +107,7 @@ BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
@@ -118,81 +117,94 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
Python binding module that allows use of TQt X Window toolkit v3.
You can use it to create portable graphics-capable scripts.
-At this moment python-tqt offers a vast subset of TQt API. There are
+At this moment pytqt offers a vast subset of TQt API. There are
some minor issues related to the differences between C++ and Python
(types, etc), but usually you'll be able to write code pretty much the
same way in both languages (with syntax differences, of course)
##########
-%package -n python-tqt
+%package -n pytqt
Summary: TQt bindings for Python
Group: Development/Libraries/Python
Requires: trinity-filesystem >= %{tde_version}
Requires: sip4-tqt >= %{?epoch:%{epoch}:}4.10.5
Requires: libtqt4 >= %{?epoch:%{epoch}:}4.2.0
+Obsoletes: python-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n python-tqt
+%description -n pytqt
Python binding module that allows use of TQt X Window toolkit v3.
You can use it to create portable graphics-capable scripts.
-At this moment python-tqt offers a vast subset of TQt API. There are
+At this moment pytqt offers a vast subset of TQt API. There are
some minor issues related to the differences between C++ and Python
(types, etc), but usually you'll be able to write code pretty much the
same way in both languages (with syntax differences, of course)
-%files -n python-tqt
+%files -n pytqt
%defattr(-,root,root,-)
%doc NEWS README
-%dir %{python_sitearch}/python_tqt
-%{python_sitearch}/python_tqt/__init__.py*
-%{python_sitearch}/python_tqt/qt.so
-%{python_sitearch}/python_tqt/qtcanvas.so
-%{python_sitearch}/python_tqt/qtnetwork.so
-%{python_sitearch}/python_tqt/qtsql.so
-%{python_sitearch}/python_tqt/qttable.so
-%{python_sitearch}/python_tqt/qtui.so
-%{python_sitearch}/python_tqt/qtxml.so
+%dir %{python_sitearch}/PyTQt
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitearch}/PyTQt/__init__.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/PyTQt/__init__.py
+%endif
+%{python_sitearch}/PyTQt/tqt.so
+%{python_sitearch}/PyTQt/tqtcanvas.so
+%{python_sitearch}/PyTQt/tqtnetwork.so
+%{python_sitearch}/PyTQt/tqtsql.so
+%{python_sitearch}/PyTQt/tqttable.so
+%{python_sitearch}/PyTQt/tqtui.so
+%{python_sitearch}/PyTQt/tqtxml.so
##########
-%package -n python-tqt-gl
+%package -n pytqt-gl
Summary: TQt OpenGL bindings for Python
Group: Development/Libraries/Python
-Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: python-tqt-gl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: python-tqt-gl = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n python-tqt-gl
+%description -n pytqt-gl
Python binding module that allows use of the OpenGL facilities
offered by the TQt X Window toolkit v3. You can use it to create
portable graphics-capable scripts.
-%files -n python-tqt-gl
+%files -n pytqt-gl
%defattr(-,root,root,-)
-%{python_sitearch}/python_tqt/qtgl.so
+%{python_sitearch}/PyTQt/tqtgl.so
##########
-%package -n python-tqt-tqtext
-Summary: TQtext extensions for python-tqt
+%package -n pytqt-tqtext
+Summary: TQtext extensions for pytqt
Group: Development/Libraries/Python
-Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: python-tqt-tqtext < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: python-tqt-tqtext = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n python-tqt-tqtext
-python-tqt Extensions. Contains:
+%description -n pytqt-tqtext
+pytqt Extensions. Contains:
* TQScintilla: a featureful TQt source code editing component based
on Scintilla.
-%files -n python-tqt-tqtext
+%files -n pytqt-tqtext
%defattr(-,root,root,-)
-%{python_sitearch}/python_tqt/qtext.so
+%{python_sitearch}/PyTQt/tqtext.so
##########
%package -n trinity-pytqt-tools
Summary: Pyuic and pylupdate for TQt
Group: Development/Libraries/Python
-Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n trinity-pytqt-tools
pyuic is the PyQt counterpart for TQt's uic. It takes an XML
@@ -203,26 +215,35 @@ Linguist translation files from Python code.
%files -n trinity-pytqt-tools
%defattr(-,root,root,-)
-%{tde_bindir}/pylupdate
-%{tde_bindir}/pyuic
+%{tde_bindir}/pytqlupdate
+%{tde_bindir}/pytquic
##########
-%package -n python-tqt-devel
+%package -n pytqt-devel
Summary: TQt bindings for Python - Development files
Group: Development/Libraries/Python
-Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-pytqt-tools = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
+Obsoletes: python-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: python-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n python-tqt-devel
+%description -n pytqt-devel
Development .sip files with definitions of PyQt classes. They
are needed to build PyQt, but also as building blocks of other
packages based on them, like PyTDE.
-%files -n python-tqt-devel
+%files -n pytqt-devel
%defattr(-,root,root,-)
-%{python_sitearch}/python_tqt/pyqtconfig.py*
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitearch}/PyTQt/pytqtconfig.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/PyTQt/pytqtconfig.py
+%endif
%dir %{_datadir}/sip
%{_datadir}/sip/tqt/
@@ -245,16 +266,13 @@ export PATH="%{tde_bindir}:${PATH}"
mkdir build
cd build
-# WTF ? CentOS 6 !
-cp -rf ../pyuic3 ../pylupdate3
-
echo yes | %__python ../configure.py \
- -c -n %{_includedir}/tqscintilla \
+ -c -n %{_includedir}/tqt3 \
-g %{_includedir}/tqt3 \
-q %{_datadir}/tqt3 \
-y tqt-mt \
-o %{_libdir} -u -j 10 \
- -d %{python_sitearch}/python_tqt \
+ -d %{python_sitearch}/PyTQt \
-v %{_datadir}/sip/tqt \
-b %{tde_bindir} \
-w \
@@ -272,7 +290,6 @@ echo yes | %__python ../configure.py \
%clean
-%__rm -rf %{?buildroot}%{python_sitearch}/python_tqt/__init__.py
%changelog
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index a2bf18df4..82548d12c 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -28,7 +28,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg sip4-tqt
%define tde_prefix /opt/trinity
@@ -77,19 +77,12 @@ BuildRequires: bison
BuildRequires: flex
# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%if 0%{?sle_version} >= 150400
+%if "%{python}" == ""
%global python python3
-%global __python %__python3
-%else
-%global python python
-%endif
%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
@@ -119,7 +112,18 @@ specificity towards C++ and Python.
%files -n sip4-tqt
%defattr(-,root,root,-)
-%{python_sitearch}/sip4_tqt/
+%{python_sitearch}/sip_tqt.so
+%if "%{?distribution}" == "OpenMandriva Lx" || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitearch}/sip_tqt_config.py*
+%{python_sitearch}/sip_tqt_distutils.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/__pycache__/sip_tqt_config.*.pyc
+%{python_sitearch}/__pycache__/sip_tqt_distutils.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/sip_tqt_config.py
+%pycached %{python_sitearch}/sip_tqt_distutils.py
+%endif
##########
@@ -153,8 +157,8 @@ needed to develop Python bindings with sip.
%files -n sip4-tqt-devel
%defattr(-,root,root,-)
-%{tde_bindir}/sip
-%{tde_includedir}/sip.h
+%{tde_bindir}/sip-tqt
+%{tde_includedir}/sip-tqt.h
##########
@@ -176,7 +180,7 @@ mkdir build
cd build
%__python ../configure.py \
-b %{tde_bindir} \
- -d %{python_sitearch}/sip4_tqt \
+ -d %{python_sitearch} \
-e %{tde_includedir} \
-u STRIP="" \
CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen -DYYERROR_VERBOSE" \
diff --git a/redhat/common/cmake/cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec
index cd6825db3..4901e544e 100644
--- a/redhat/common/cmake/cmake.spec
+++ b/redhat/dependencies/tde-cmake/tde-cmake.spec
@@ -17,9 +17,9 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
-%define tde_pkg cmake
+%define tde_pkg tde-cmake
%if 0%{?rhel} == 6 || 0%{?rhel} == 7
%define cmake_datadir %{_datadir}/cmake3
@@ -55,6 +55,8 @@ BuildRequires: desktop-file-utils
Requires: cmake
+Obsoletes: trinity-cmake < %{version}-%{release}
+Provides: trinity-cmake = %{version}-%{release}
%description
TDE uses its own set of modules and macros to simplify CMake rules.
@@ -71,7 +73,7 @@ intltool-merge used to merge translations into desktop files.
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -105,6 +107,7 @@ fi
%{cmake_datadir}/Modules/TDEL10n.cmake
%{cmake_datadir}/Modules/TDEMacros.cmake
%{cmake_datadir}/Modules/TDESetupPaths.cmake
+%{cmake_datadir}/Modules/TDEVersion.cmake
%{cmake_datadir}/Modules/tde_automoc.cmake
%{cmake_datadir}/Modules/tde_l10n_merge.pl
%{cmake_datadir}/Modules/tde_uic.cmake
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
index ca5b7c49a..bc76e9208 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tqca-tls
%define tde_prefix /opt/trinity
@@ -57,9 +57,15 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
BuildRequires: libtqca-devel >= %{tde_epoch}:1.0
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
-BuildRequires: openssl-devel >= 0.9.8
+
+# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
+BuildRequires: openssl-devel
+%endif
%description
@@ -101,7 +107,7 @@ contains the TLS plugin.
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec
index ff7f51a8a..367e18958 100644
--- a/redhat/dependencies/tqca/tqca.spec
+++ b/redhat/dependencies/tqca/tqca.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tqca
%define tde_prefix /opt/trinity
@@ -65,9 +65,14 @@ Obsoletes: %{libtqt3}-mt-tqca-tls < %{version}-%{release}
Provides: %{libtqt3}-mt-tqca-tls = %{version}-%{release}
BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
+
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel >= 0.9.8
+%endif
%description
Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -160,7 +165,7 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec
index 7e152751d..155b56e18 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tqscintilla
@@ -55,7 +55,7 @@ Source1: trinity-tqscintilla-rpmlintrc
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-filesystem >= %{tde_version}
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: gettext
@@ -91,8 +91,8 @@ TQScintilla is a port or Scintilla to the TQt GUI toolkit.
%files -n %{libtqscintilla}7
%defattr(-,root,root,-)
%doc ChangeLog LICENSE NEWS README
-%{_libdir}/libqscintilla.so.7
-%{_libdir}/libqscintilla.so.7.0.1
+%{_libdir}/libtqscintilla.so.7
+%{_libdir}/libtqscintilla.so.7.0.1
%{_libdir}/tqt3/plugins/designer/*.so
%dir %{_datadir}/tqt3/translations/
%{_datadir}/tqt3/translations/*.qm
@@ -117,10 +117,39 @@ This package contains the development files for tqscintilla.
%files -n %{libtqscintilla}-devel
%defattr(-,root,root,-)
-%{_includedir}/tqscintilla/
-%{_libdir}/libqscintilla.so
-%{_libdir}/pkgconfig/qscintilla.pc
-%exclude %{_libdir}/libqscintilla.la
+#%{_includedir}/tqscintilla/
+%{_includedir}/tqt3/tqextscintilla.h
+%{_includedir}/tqt3/tqextscintillaapis.h
+%{_includedir}/tqt3/tqextscintillabase.h
+%{_includedir}/tqt3/tqextscintillacommand.h
+%{_includedir}/tqt3/tqextscintillacommandset.h
+%{_includedir}/tqt3/tqextscintilladocument.h
+%{_includedir}/tqt3/tqextscintillaglobal.h
+%{_includedir}/tqt3/tqextscintillalexer.h
+%{_includedir}/tqt3/tqextscintillalexerbash.h
+%{_includedir}/tqt3/tqextscintillalexerbatch.h
+%{_includedir}/tqt3/tqextscintillalexercpp.h
+%{_includedir}/tqt3/tqextscintillalexercsharp.h
+%{_includedir}/tqt3/tqextscintillalexercss.h
+%{_includedir}/tqt3/tqextscintillalexerdiff.h
+%{_includedir}/tqt3/tqextscintillalexerhtml.h
+%{_includedir}/tqt3/tqextscintillalexeridl.h
+%{_includedir}/tqt3/tqextscintillalexerjava.h
+%{_includedir}/tqt3/tqextscintillalexerjavascript.h
+%{_includedir}/tqt3/tqextscintillalexerlua.h
+%{_includedir}/tqt3/tqextscintillalexermakefile.h
+%{_includedir}/tqt3/tqextscintillalexerperl.h
+%{_includedir}/tqt3/tqextscintillalexerpov.h
+%{_includedir}/tqt3/tqextscintillalexerproperties.h
+%{_includedir}/tqt3/tqextscintillalexerpython.h
+%{_includedir}/tqt3/tqextscintillalexerruby.h
+%{_includedir}/tqt3/tqextscintillalexersql.h
+%{_includedir}/tqt3/tqextscintillalexertex.h
+%{_includedir}/tqt3/tqextscintillamacro.h
+%{_includedir}/tqt3/tqextscintillaprinter.h
+%{_libdir}/libtqscintilla.so
+%{_libdir}/pkgconfig/tqscintilla.pc
+%exclude %{_libdir}/libtqscintilla.la
%exclude %{_libdir}/tqt3/plugins/designer/*.la
##########
@@ -137,12 +166,7 @@ This package contains the documentation for tqscintilla.
%files -n %{libtqscintilla}-doc
%defattr(-,root,root,-)
-%{_docdir}/libtqscintilla7/
-%exclude %{_docdir}/libtqscintilla7/ChangeLog
-%exclude %{_docdir}/libtqscintilla7/LICENSE
-%exclude %{_docdir}/libtqscintilla7/NEWS
-%exclude %{_docdir}/libtqscintilla7/README
-/usr/share/doc/libtqscintilla/
+%{_docdir}/libtqscintilla/
##########
@@ -160,7 +184,7 @@ This package contains the documentation for tqscintilla.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -173,6 +197,8 @@ fi
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \
\
+ -DLIB_INSTALL_DIR="%{_libdir}" \
+ \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" \
..
@@ -184,8 +210,10 @@ fi
%__rm -rf %{?buildroot}
%__make install -C build DESTDIR=%{?buildroot}
-# Fix headers location
-%__mv "%{?buildroot}%{_includedir}/tqt3" "%{?buildroot}%{_includedir}/tqscintilla"
+%if "%{?_docdir}" != "%{_datadir}/doc"
+%__mkdir_p "%{?buildroot}%{_docdir}"
+%__mv "%{?buildroot}%{_datadir}/doc/libtqscintilla/" "%{?buildroot}%{_docdir}/libtqscintilla/"
+%endif
%clean
diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt3/build-examples.sh
index 4d654fcc9..f62d83b85 120000..100644
--- a/redhat/dependencies/tqt3/build-examples.sh
+++ b/redhat/dependencies/tqt3/build-examples.sh
@@ -1 +1,36 @@
-../../../debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh \ No newline at end of file
+#!/bin/sh
+
+BUILDDIR=$PWD
+export QTDIR=/usr/share/tqt3
+
+# first copy over the libtqt-mt.so build configuration of .qmake.cache
+cp /usr/share/tqt3/.qmake.cache ./.qmake.cache
+
+# Now compile the examples. The themes example
+# won't work since ntqconfig.h is not really correct with the
+# ifdef's for the TQT_NO_xyz_STYLE, so we use make -k to continue
+cd examples; qmake -o Makefile examples.pro; make -k
+
+# Now compile the tutorial.
+cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make
+
+# Then the designer examples.
+cd $BUILDDIR/tools/designer/examples
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+ cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# There is a bigger sql example in book/ with more subdirectories:
+cd book
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+ cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# Finally, build the linguist tutorials:
+cd $BUILDDIR/tools/linguist/tutorial
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+ cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# Return to the build directory
+cd $BUILDDIR
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index 5441fc8f4..433832ae6 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -17,7 +17,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -48,9 +48,12 @@ BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: build-examples.sh
+Source2: trinity-tqt3-rpmlintrc
BuildRequires: glibc-devel
+%if "%{?c_compiler}" != "clang"
BuildRequires: gcc-c++
+%endif
BuildRequires: make
BuildRequires: desktop-file-utils
@@ -63,13 +66,28 @@ BuildRequires: tar
BuildRequires: zlib-devel
# JPEG support
-BuildRequires: libjpeg-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+%{?libjpeg:BuildRequires: %{libjpeg}-devel}
# MNG support
-BuildRequires: libmng-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libmng %{_lib}mng
+%else
+%define libmng libmng
+%endif
+%{?libmng:BuildRequires: %{libmng}-devel}
# PNG support
-BuildRequires: libpng-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libpng %{_lib}png
+%else
+%define libpng libpng
+%endif
+%{?libpng:BuildRequires: %{libpng}-devel}
# GIF support
BuildRequires: giflib-devel
@@ -96,9 +114,12 @@ BuildRequires: cups-devel
%{?glib2_devel:BuildRequires: %{glib2_devel}}
# UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
%define uuid_devel libuuid-devel
%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define uuid_devel %{_lib}uuid-devel
+%endif
%if 0%{?rhel} == 5
%define uuid_devel e2fsprogs-devel
%endif
@@ -107,8 +128,12 @@ BuildRequires: cups-devel
# LIBAUDIO support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_nas 1
+%if "%{?distribution}" == "OpenMandriva Lx"
+%define libaudio_devel %{_lib}audio-devel nas-devel
+%else
%define libaudio_devel nas-devel
%endif
+%endif
%{?libaudio_devel:BuildRequires: %{libaudio_devel}}
# Xrender support
@@ -116,7 +141,7 @@ BuildRequires: cups-devel
%define xrender_devel libXrender-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
-%define xrender_devel libxrender-devel
+%define xrender_devel %{_lib}xrender-devel
%endif
%{?xrender_devel:BuildRequires: %{xrender_devel}}
@@ -125,11 +150,10 @@ BuildRequires: cups-devel
%define xrandr_devel libXrandr-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%define xrandr_devel %{_lib}xrandr-devel
+%endif
%if 0%{?pclinuxos}
%define xrandr_devel %{_lib}xrandr2-devel
-%else
-%define xrandr_devel libxrandr-devel
-%endif
%endif
%{?xrandr_devel:BuildRequires: %{xrandr_devel}}
@@ -138,7 +162,7 @@ BuildRequires: cups-devel
%define xcursor_devel libXcursor-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
-%define xcursor_devel libxcursor-devel
+%define xcursor_devel %{_lib}xcursor-devel
%endif
%{?xcursor_devel:BuildRequires: %{xcursor_devel}}
@@ -147,7 +171,7 @@ BuildRequires: cups-devel
%define xinerama_devel libXinerama-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
-%define xinerama_devel libxinerama-devel
+%define xinerama_devel %{_lib}xinerama-devel
%endif
%{?xinerama_devel:BuildRequires: %{xinerama_devel}}
@@ -156,7 +180,7 @@ BuildRequires: cups-devel
%define xft_devel libXft-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
-%define xft_devel libxft-devel
+%define xft_devel %{_lib}xft-devel
%endif
%{?xft_devel:BuildRequires: %{xft_devel}}
@@ -165,7 +189,7 @@ BuildRequires: cups-devel
%define xext_devel libXext-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
-%define xext_devel libxext-devel
+%define xext_devel %{_lib}xext-devel
%endif
%{?xext_devel:BuildRequires: %{xext_devel}}
@@ -174,7 +198,7 @@ BuildRequires: cups-devel
%define x11_devel libX11-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
-%define x11_devel libx11-devel
+%define x11_devel %{_lib}x11-devel
%endif
%{?x11_devel:BuildRequires: %{x11_devel}}
@@ -183,7 +207,7 @@ BuildRequires: cups-devel
%define sm_devel libSM-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
-%define sm_devel libsm-devel
+%define sm_devel %{_lib}sm-devel
%endif
%{?sm_devel:BuildRequires: %{sm_devel}}
@@ -192,7 +216,7 @@ BuildRequires: cups-devel
%define ice_devel libICE-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
-%define ice_devel libice-devel
+%define ice_devel %{_lib}ice-devel
%endif
%{?ice_devel:BuildRequires: %{ice_devel}}
@@ -209,7 +233,7 @@ BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
@@ -220,7 +244,7 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
%define xi_devel xorg-x11-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-%define xi_devel libxi-devel
+%define xi_devel %{_lib}xi-devel
%endif
%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
%define xi_devel libXi-devel
@@ -244,9 +268,13 @@ BuildRequires: mesa-libGLU-devel
%if 0%{?pclinuxos}
BuildRequires: MesaGLU-devel
%else
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -258,26 +286,20 @@ BuildRequires: mysql-devel
# unixODBC support
BuildRequires: unixODBC-devel
-# SQLITE support
-BuildRequires: sqlite-devel
-
# SQLITE3 support
%if 0%{?mgaversion}
BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
%endif
# POSTGRESQL support
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
-BuildRequires: postgresql10
-BuildRequires: postgresql10-devel
-%else
-BuildRequires: postgresql
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
BuildRequires: postgresql-server-devel
%else
BuildRequires: postgresql-devel
%endif
-%endif
# Firebird support
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -286,7 +308,7 @@ BuildRequires: firebird-devel
%endif
# FBCLIENT support
-%if 0%{?mgaversion} >= 6
+%if 0%{?mdkver} || 0%{?mgaversion} >= 6
BuildRequires: %{_lib}fbclient-devel
%endif
@@ -302,6 +324,10 @@ BuildRequires: libtirpc-devel
BuildRequires: libnsl-devel
BuildRequires: libtirpc-devel
%endif
+%if 0%{?mdkver} || 0%{?mgaversion}
+BuildRequires: %{_lib}nsl-devel
+BuildRequires: %{_lib}tirpc-devel
+%endif
# x86_64 specific stuff
%if "%{_lib}" != "lib"
@@ -329,7 +355,6 @@ Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires: coreutils
Requires: fontconfig >= 2.0
-Requires: /etc/ld.so.conf.d
%description -n %{libtqt3}-mt
This is the Trolltech TQt library, version 3. It's necessary for
@@ -380,8 +405,8 @@ Requires: %{libtqt3}-mt = %{version}-%{release}
Requires: glibc-devel
Requires: fontconfig-devel
Requires: freetype-devel
-Requires: libjpeg-devel
-Requires: libpng-devel
+Requires: %{libjpeg}-devel
+Requires: %{libpng}-devel
Requires: zlib-devel
%{?glib2_devel:Requires: %{glib2_devel}}
@@ -405,13 +430,6 @@ for building threaded TQt applications as well as the libtqui.so symlink
and the necessary header files for libtqui.so. (See README.Debian and
the TQt Documentation for instructions on libtqui.so)
-WARNING: If you plan to build some older TQt3 applications, you will
-most probably have to install the tqt3-compat-headers package. It
-contains all the headers which are not part of the official TQt3 API
-anymore but which are still used by some programs. So if you encounter
-problems with missing header files, please install this package first
-before you send a bugreport.
-
%post -n %{libtqt3}-mt-devel
/sbin/ldconfig || :
@@ -429,7 +447,6 @@ before you send a bugreport.
%dir %{_includedir}/tqt3
%{_includedir}/tqt3/ntqgl.h
%{_includedir}/tqt3/ntqglcolormap.h
-%{_includedir}/tqt3/ntqwidgetfactory.h
%{_includedir}/tqt3/actioninterface.h
%{_includedir}/tqt3/arghintwidget.h
%{_includedir}/tqt3/browser.h
@@ -461,7 +478,6 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqbutton.h
%{_includedir}/tqt3/ntqbuttongroup.h
%{_includedir}/tqt3/ntqcache.h
-%{_includedir}/tqt3/ntqcanvas.h
%{_includedir}/tqt3/ntqcdestyle.h
%{_includedir}/tqt3/ntqcheckbox.h
%{_includedir}/tqt3/ntqcleanuphandler.h
@@ -475,10 +491,7 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqconnection.h
%{_includedir}/tqt3/ntqcstring.h
%{_includedir}/tqt3/ntqcursor.h
-%{_includedir}/tqt3/ntqdatabrowser.h
%{_includedir}/tqt3/ntqdatastream.h
-%{_includedir}/tqt3/ntqdatatable.h
-%{_includedir}/tqt3/ntqdataview.h
%{_includedir}/tqt3/ntqdatetime.h
%{_includedir}/tqt3/ntqdatetimeedit.h
%{_includedir}/tqt3/ntqdeepcopy.h
@@ -490,11 +503,9 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqdns.h
%{_includedir}/tqt3/ntqdockarea.h
%{_includedir}/tqt3/ntqdockwindow.h
-%{_includedir}/tqt3/ntqdom.h
%{_includedir}/tqt3/ntqdragobject.h
%{_includedir}/tqt3/ntqdrawutil.h
%{_includedir}/tqt3/ntqdropsite.h
-%{_includedir}/tqt3/ntqeditorfactory.h
%{_includedir}/tqt3/ntqerrormessage.h
%{_includedir}/tqt3/ntqeucjpcodec.h
%{_includedir}/tqt3/ntqeuckrcodec.h
@@ -533,10 +544,6 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqhgroupbox.h
%{_includedir}/tqt3/ntqhostaddress.h
%{_includedir}/tqt3/ntqhttp.h
-%{_includedir}/tqt3/ntqiconset.h
-%{_includedir}/tqt3/ntqiconview.h
-%{_includedir}/tqt3/ntqimage.h
-%{_includedir}/tqt3/ntqimageformatplugin.h
%{_includedir}/tqt3/ntqinputcontext.h
%{_includedir}/tqt3/ntqinputcontextfactory.h
%{_includedir}/tqt3/ntqinputcontextplugin.h
@@ -560,7 +567,6 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqlocale.h
%{_includedir}/tqt3/ntqlocalfs.h
%{_includedir}/tqt3/ntqmainwindow.h
-%{_includedir}/tqt3/ntqmap.h
%{_includedir}/tqt3/ntqmemarray.h
%{_includedir}/tqt3/ntqmenubar.h
%{_includedir}/tqt3/ntqmenudata.h
@@ -578,15 +584,9 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqnetwork.h
%{_includedir}/tqt3/ntqnetworkprotocol.h
%{_includedir}/tqt3/ntqnp.h
-%{_includedir}/tqt3/ntqobject.h
-%{_includedir}/tqt3/ntqobjectcleanuphandler.h
-%{_includedir}/tqt3/ntqobjectdefs.h
-%{_includedir}/tqt3/ntqobjectdict.h
-%{_includedir}/tqt3/ntqobjectlist.h
%{_includedir}/tqt3/ntqpaintdevice.h
%{_includedir}/tqt3/ntqpaintdevicemetrics.h
%{_includedir}/tqt3/ntqpainter.h
-%{_includedir}/tqt3/ntqpair.h
%{_includedir}/tqt3/ntqpalette.h
%{_includedir}/tqt3/ntqpen.h
%{_includedir}/tqt3/ntqpicture.h
@@ -603,12 +603,6 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqprocess.h
%{_includedir}/tqt3/ntqprogressbar.h
%{_includedir}/tqt3/ntqprogressdialog.h
-%{_includedir}/tqt3/ntqptrcollection.h
-%{_includedir}/tqt3/ntqptrdict.h
-%{_includedir}/tqt3/ntqptrlist.h
-%{_includedir}/tqt3/ntqptrqueue.h
-%{_includedir}/tqt3/ntqptrstack.h
-%{_includedir}/tqt3/ntqptrvector.h
%{_includedir}/tqt3/ntqpushbutton.h
%{_includedir}/tqt3/ntqradiobutton.h
%{_includedir}/tqt3/ntqrangecontrol.h
@@ -619,7 +613,6 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqscrollbar.h
%{_includedir}/tqt3/ntqscrollview.h
%{_includedir}/tqt3/ntqsemaphore.h
-%{_includedir}/tqt3/ntqsemimodal.h
%{_includedir}/tqt3/ntqserversocket.h
%{_includedir}/tqt3/ntqsession.h
%{_includedir}/tqt3/ntqsessionmanager.h
@@ -638,48 +631,17 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqsocket.h
%{_includedir}/tqt3/ntqsocketdevice.h
%{_includedir}/tqt3/ntqsocketnotifier.h
-%{_includedir}/tqt3/ntqsortedlist.h
%{_includedir}/tqt3/ntqsound.h
%{_includedir}/tqt3/ntqspinbox.h
%{_includedir}/tqt3/ntqsplashscreen.h
%{_includedir}/tqt3/ntqsplitter.h
-%{_includedir}/tqt3/ntqsql.h
-%{_includedir}/tqt3/ntqsqlcursor.h
-%{_includedir}/tqt3/ntqsqldatabase.h
-%{_includedir}/tqt3/ntqsqldriver.h
-%{_includedir}/tqt3/ntqsqldriverplugin.h
-%{_includedir}/tqt3/ntqsqleditorfactory.h
-%{_includedir}/tqt3/ntqsqlerror.h
-%{_includedir}/tqt3/ntqsqlfield.h
-%{_includedir}/tqt3/ntqsqlform.h
-%{_includedir}/tqt3/ntqsqlindex.h
-%{_includedir}/tqt3/ntqsqlpropertymap.h
-%{_includedir}/tqt3/ntqsqlquery.h
-%{_includedir}/tqt3/ntqsqlrecord.h
-%{_includedir}/tqt3/ntqsqlresult.h
-%{_includedir}/tqt3/ntqsqlselectcursor.h
%{_includedir}/tqt3/ntqstatusbar.h
-%{_includedir}/tqt3/ntqstring.h
-%{_includedir}/tqt3/ntqstringlist.h
-%{_includedir}/tqt3/ntqstrlist.h
-%{_includedir}/tqt3/ntqstrvec.h
-%{_includedir}/tqt3/ntqstyle.h
-%{_includedir}/tqt3/ntqstylefactory.h
-%{_includedir}/tqt3/ntqstyleplugin.h
-%{_includedir}/tqt3/ntqstylesheet.h
%{_includedir}/tqt3/ntqsyntaxhighlighter.h
%{_includedir}/tqt3/ntqt.h
%{_includedir}/tqt3/ntqtabbar.h
%{_includedir}/tqt3/ntqtabdialog.h
%{_includedir}/tqt3/ntqtable.h
%{_includedir}/tqt3/ntqtabwidget.h
-%{_includedir}/tqt3/ntqtextbrowser.h
-%{_includedir}/tqt3/ntqtextcodec.h
-%{_includedir}/tqt3/ntqtextcodecfactory.h
-%{_includedir}/tqt3/ntqtextcodecplugin.h
-%{_includedir}/tqt3/ntqtextedit.h
-%{_includedir}/tqt3/ntqtextstream.h
-%{_includedir}/tqt3/ntqtextview.h
%{_includedir}/tqt3/ntqthread.h
%{_includedir}/tqt3/ntqthreadstorage.h
%{_includedir}/tqt3/ntqtimer.h
@@ -696,9 +658,6 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqutfcodec.h
%{_includedir}/tqt3/ntquuid.h
%{_includedir}/tqt3/ntqvalidator.h
-%{_includedir}/tqt3/ntqvaluelist.h
-%{_includedir}/tqt3/ntqvaluestack.h
-%{_includedir}/tqt3/ntqvaluevector.h
%{_includedir}/tqt3/ntqvariant.h
%{_includedir}/tqt3/ntqvbox.h
%{_includedir}/tqt3/ntqvbuttongroup.h
@@ -706,18 +665,12 @@ before you send a bugreport.
%{_includedir}/tqt3/ntqvgroupbox.h
%{_includedir}/tqt3/ntqwaitcondition.h
%{_includedir}/tqt3/ntqwhatsthis.h
-%{_includedir}/tqt3/ntqwidget.h
-%{_includedir}/tqt3/ntqwidgetintdict.h
-%{_includedir}/tqt3/ntqwidgetlist.h
-%{_includedir}/tqt3/ntqwidgetplugin.h
-%{_includedir}/tqt3/ntqwidgetstack.h
%{_includedir}/tqt3/ntqwindowdefs.h
%{_includedir}/tqt3/ntqwindowsstyle.h
%{_includedir}/tqt3/ntqwinexport.h
%{_includedir}/tqt3/ntqwizard.h
%{_includedir}/tqt3/ntqwmatrix.h
%{_includedir}/tqt3/ntqworkspace.h
-%{_includedir}/tqt3/ntqxml.h
%{_includedir}/tqt3/paragdata.h
%{_includedir}/tqt3/parenmatcher.h
%{_includedir}/tqt3/preferenceinterface.h
@@ -729,18 +682,80 @@ before you send a bugreport.
%{_includedir}/tqt3/qconfig-medium.h
%{_includedir}/tqt3/qconfig-minimal.h
%{_includedir}/tqt3/qconfig-small.h
-%{_includedir}/tqt3/qsql_ibase.h
-%{_includedir}/tqt3/qsql_mysql.h
-%{_includedir}/tqt3/qsql_odbc.h
-%{_includedir}/tqt3/qsql_psql.h
-%{_includedir}/tqt3/qsql_sqlite.h
-%{_includedir}/tqt3/qsql_sqlite3.h
-%{_includedir}/tqt3/qsqlcachedresult.h
%{_includedir}/tqt3/qt_pch.h
-%{_includedir}/tqt3/qtmultilineedit.h
-%{_includedir}/tqt3/qttableview.h
%{_includedir}/tqt3/qwindow.h
%{_includedir}/tqt3/sourcetemplateiface.h
+%{_includedir}/tqt3/tqcanvas.h
+%{_includedir}/tqt3/tqdatabrowser.h
+%{_includedir}/tqt3/tqdatatable.h
+%{_includedir}/tqt3/tqdataview.h
+%{_includedir}/tqt3/tqdom.h
+%{_includedir}/tqt3/tqeditorfactory.h
+%{_includedir}/tqt3/tqiconset.h
+%{_includedir}/tqt3/tqiconview.h
+%{_includedir}/tqt3/tqimage.h
+%{_includedir}/tqt3/tqimageformatplugin.h
+%{_includedir}/tqt3/tqmap.h
+%{_includedir}/tqt3/tqobject.h
+%{_includedir}/tqt3/tqobjectcleanuphandler.h
+%{_includedir}/tqt3/tqobjectdefs.h
+%{_includedir}/tqt3/tqobjectdict.h
+%{_includedir}/tqt3/tqobjectlist.h
+%{_includedir}/tqt3/tqpair.h
+%{_includedir}/tqt3/tqptrcollection.h
+%{_includedir}/tqt3/tqptrdict.h
+%{_includedir}/tqt3/tqptrlist.h
+%{_includedir}/tqt3/tqptrqueue.h
+%{_includedir}/tqt3/tqptrstack.h
+%{_includedir}/tqt3/tqptrvector.h
+%{_includedir}/tqt3/tqsql.h
+%{_includedir}/tqt3/tqsql_ibase.h
+%{_includedir}/tqt3/tqsql_mysql.h
+%{_includedir}/tqt3/tqsql_odbc.h
+%{_includedir}/tqt3/tqsql_psql.h
+%{_includedir}/tqt3/tqsql_sqlite.h
+%{_includedir}/tqt3/tqsql_sqlite3.h
+%{_includedir}/tqt3/tqsqlcachedresult.h
+%{_includedir}/tqt3/tqsqlcursor.h
+%{_includedir}/tqt3/tqsqldatabase.h
+%{_includedir}/tqt3/tqsqldriver.h
+%{_includedir}/tqt3/tqsqldriverplugin.h
+%{_includedir}/tqt3/tqsqleditorfactory.h
+%{_includedir}/tqt3/tqsqlerror.h
+%{_includedir}/tqt3/tqsqlfield.h
+%{_includedir}/tqt3/tqsqlform.h
+%{_includedir}/tqt3/tqsqlindex.h
+%{_includedir}/tqt3/tqsqlpropertymap.h
+%{_includedir}/tqt3/tqsqlquery.h
+%{_includedir}/tqt3/tqsqlrecord.h
+%{_includedir}/tqt3/tqsqlresult.h
+%{_includedir}/tqt3/tqsqlselectcursor.h
+%{_includedir}/tqt3/tqstring.h
+%{_includedir}/tqt3/tqstringlist.h
+%{_includedir}/tqt3/tqstrlist.h
+%{_includedir}/tqt3/tqstrvec.h
+%{_includedir}/tqt3/tqstyle.h
+%{_includedir}/tqt3/tqstylefactory.h
+%{_includedir}/tqt3/tqstyleplugin.h
+%{_includedir}/tqt3/tqstylesheet.h
+%{_includedir}/tqt3/tqt.h
+%{_includedir}/tqt3/tqtextbrowser.h
+%{_includedir}/tqt3/tqtextcodec.h
+%{_includedir}/tqt3/tqtextcodecfactory.h
+%{_includedir}/tqt3/tqtextcodecplugin.h
+%{_includedir}/tqt3/tqtextedit.h
+%{_includedir}/tqt3/tqtextstream.h
+%{_includedir}/tqt3/tqtextview.h
+%{_includedir}/tqt3/tqvaluelist.h
+%{_includedir}/tqt3/tqvaluestack.h
+%{_includedir}/tqt3/tqvaluevector.h
+%{_includedir}/tqt3/tqwidget.h
+%{_includedir}/tqt3/tqwidgetfactory.h
+%{_includedir}/tqt3/tqwidgetintdict.h
+%{_includedir}/tqt3/tqwidgetlist.h
+%{_includedir}/tqt3/tqwidgetplugin.h
+%{_includedir}/tqt3/tqwidgetstack.h
+%{_includedir}/tqt3/tqxml.h
%{_includedir}/tqt3/templatewizardiface.h
%{_includedir}/tqt3/viewmanager.h
%{_includedir}/tqt3/widgetinterface.h
@@ -852,75 +867,6 @@ SQLite3 DB.
###########
-%package -n tqt3-compat-headers
-Summary: TQt 1.x and 2.x compatibility includes
-Group: Development/Libraries/X11
-Requires: %{libtqt3}-mt = %{version}-%{release}
-
-%description -n tqt3-compat-headers
-This package contains header files that are intended for build
-compatibility for applications that build with TQt3 but still use
-deprecated includes. It is meant as an intermediate solution and
-these header files are not part of the official TQt3 API.
-All sourcecode that is still using the headers of this package is
-subject to be changed to use the new header files which are in
-libtqt3-headers.
-
-%files -n tqt3-compat-headers
-%defattr(-,root,root,-)
-%{_includedir}/tqt3/ntqapp.h
-%{_includedir}/tqt3/ntqarray.h
-%{_includedir}/tqt3/ntqbitarry.h
-%{_includedir}/tqt3/ntqbttngrp.h
-%{_includedir}/tqt3/ntqchkbox.h
-%{_includedir}/tqt3/ntqclipbrd.h
-%{_includedir}/tqt3/ntqcollect.h
-%{_includedir}/tqt3/ntqcollection.h
-%{_includedir}/tqt3/ntqcombo.h
-%{_includedir}/tqt3/ntqconnect.h
-%{_includedir}/tqt3/ntqdatetm.h
-%{_includedir}/tqt3/ntqdrawutl.h
-%{_includedir}/tqt3/ntqdstream.h
-%{_includedir}/tqt3/ntqfiledef.h
-%{_includedir}/tqt3/ntqfiledlg.h
-%{_includedir}/tqt3/ntqfileinf.h
-%{_includedir}/tqt3/ntqfontinf.h
-%{_includedir}/tqt3/ntqfontmet.h
-%{_includedir}/tqt3/ntqgrpbox.h
-%{_includedir}/tqt3/ntqintcach.h
-%{_includedir}/tqt3/ntqiodev.h
-%{_includedir}/tqt3/ntqlcdnum.h
-%{_includedir}/tqt3/ntqlined.h
-%{_includedir}/tqt3/ntqmenudta.h
-%{_includedir}/tqt3/ntqmetaobj.h
-%{_includedir}/tqt3/ntqmlined.h
-%{_includedir}/tqt3/ntqmsgbox.h
-%{_includedir}/tqt3/ntqmultilinedit.h
-%{_includedir}/tqt3/ntqobjcoll.h
-%{_includedir}/tqt3/ntqobjdefs.h
-%{_includedir}/tqt3/ntqpdevmet.h
-%{_includedir}/tqt3/ntqpmcache.h
-%{_includedir}/tqt3/ntqpntarry.h
-%{_includedir}/tqt3/ntqpopmenu.h
-%{_includedir}/tqt3/ntqprndlg.h
-%{_includedir}/tqt3/ntqprogbar.h
-%{_includedir}/tqt3/ntqprogdlg.h
-%{_includedir}/tqt3/ntqpsprn.h
-%{_includedir}/tqt3/ntqpushbt.h
-%{_includedir}/tqt3/ntqqueue.h
-%{_includedir}/tqt3/ntqradiobt.h
-%{_includedir}/tqt3/ntqrangect.h
-%{_includedir}/tqt3/ntqscrbar.h
-%{_includedir}/tqt3/ntqsocknot.h
-%{_includedir}/tqt3/ntqtabdlg.h
-%{_includedir}/tqt3/ntqtstream.h
-%{_includedir}/tqt3/ntqwidcoll.h
-%{_includedir}/tqt3/ntqwindefs.h
-%dir %{_docdir}/tqt3-compat-headers
-%{_docdir}/tqt3-compat-headers/attic.tar.gz
-
-###########
-
%package -n tqt3-dev-tools
Summary: TQt3 development tools
Group: Development/Libraries/X11
@@ -1009,6 +955,7 @@ or automake.
Summary: TQt3 Developer applications development files
Group: Development/Libraries/X11
Requires: %{libtqt3}-mt-devel = %{version}-%{release}
+Requires: tqt3-apps-libs = %{version}-%{release}
%description -n tqt3-apps-devel
This package is intended for developers who want to develop applications
@@ -1029,20 +976,45 @@ developer includes with his application.
%defattr(-,root,root,-)
%{_libdir}/libtqtdesignercore.prl
%{_libdir}/libtqtdesignercore.so
+%{_libdir}/libtqteditor.prl
+%{_libdir}/libtqteditor.so
+%{_libdir}/libtqassistantclient.prl
+%{_libdir}/libtqassistantclient.so
+%{_includedir}/tqt3/ntqassistantclient.h
+
+###########
+
+%package -n tqt3-apps-libs
+Summary: TQt3 Developer applications libraries
+Group: Development/Libraries/X11
+Requires: %{libtqt3}-mt = %{version}-%{release}
+
+%description -n tqt3-apps-libs
+This package is intended for developers who want to develop applications
+using the additional static libraries that ship with the applications
+included with TQt; the TQt Designer and the TQt Assistant.
+It allows integrating additional enhancements into the TQt Designer
+respectively faciliate the TQt Assistant from within your TQt application
+to interactively call the Assistant for displaying online help that the
+developer includes with his application.
+
+%post -n tqt3-apps-libs
+/sbin/ldconfig || :
+
+%postun -n tqt3-apps-libs
+/sbin/ldconfig || :
+
+%files -n tqt3-apps-libs
+%defattr(-,root,root,-)
%{_libdir}/libtqtdesignercore.so.1
%{_libdir}/libtqtdesignercore.so.1.0
%{_libdir}/libtqtdesignercore.so.1.0.0
-%{_libdir}/libtqteditor.prl
-%{_libdir}/libtqteditor.so
%{_libdir}/libtqteditor.so.1
%{_libdir}/libtqteditor.so.1.0
%{_libdir}/libtqteditor.so.1.0.0
-%{_libdir}/libtqassistantclient.prl
-%{_libdir}/libtqassistantclient.so
%{_libdir}/libtqassistantclient.so.1
%{_libdir}/libtqassistantclient.so.1.0
%{_libdir}/libtqassistantclient.so.1.0.0
-%{_includedir}/tqt3/ntqassistantclient.h
##########
@@ -1153,7 +1125,7 @@ Group: System/GUI/Other
Requires: %{libtqt3}-mt-devel = %{version}-%{release}
%description -n tqt3-dev-tools-compat
-This package contains some older TQt tools (namely tqtrename140,
+This package contains some older TQt tools (namely
tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by
application developers who need to migrate any TQt application written
for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to
@@ -1163,7 +1135,6 @@ translation system to the TQt 3 system.
%files -n tqt3-dev-tools-compat
%defattr(-,root,root,-)
-%{_bindir}/tqtrename140
%{_bindir}/tqm2ts
%{_bindir}/tqtmergetr
%{_bindir}/tqtfindtr
@@ -1204,6 +1175,7 @@ for full internationalization support of the application towards the end user.
%{_datadir}/tqt3/translations/qt_pt-br.qm
%{_datadir}/tqt3/translations/qt_ru.qm
%{_datadir}/tqt3/translations/qt_sk.qm
+%{_datadir}/tqt3/translations/qt_tr.qm
%{_datadir}/tqt3/translations/qt_zh-cn.qm
%{_datadir}/tqt3/translations/qt_zh-tw.qm
@@ -1274,7 +1246,7 @@ echo "sle_version = %{?sle_version}"
-e "s|^QMAKE_INCDIR_TQT.*|QMAKE_INCDIR_TQT = %{_includedir}/tqt3|" \
-e "s|\$(QTDIR)|/usr|g" \
-e "s|-lqt|-ltqt|g" \
- -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = %{?optflags} -pipe -fvisibility=hidden -fvisibility-inlines-hidden|" \
+ -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = ${distrib_cflags} -pipe -fvisibility=hidden -fvisibility-inlines-hidden|" \
-e "s|^QMAKE_INCDIR =.*|QMAKE_INCDIR = %{_includedir}|" \
-e "s|^QMAKE_LIBDIR =.*|QMAKE_LIBDIR = %{_libdir}|" \
-e "s|^QMAKE_RPATH = .*|QMAKE_RPATH =|" \
@@ -1343,11 +1315,15 @@ echo yes | ./configure \
-shared \
-fast \
-no-exceptions \
+%if "%{?c_compiler}" == "clang"
+ -platform linux-clang \
+%else
%if "%{_lib}" == "lib64"
-platform linux-g++-64 \
%else
-platform linux-g++ \
%endif
+%endif
\
%{?with_nis:-nis} %{?!with_nis:-no-nis} \
-no-pch \
@@ -1421,7 +1397,6 @@ export LD_LIBRARY_PATH=${QTDIR}/lib
%__make INSTALL_ROOT=%{?buildroot} install
%__make INSTALL_ROOT=%{?buildroot} plugins-install
-%__install -m755 "bin/tqtrename140" "%{?buildroot}%{_bindir}"
%__install -m755 "bin/tqtfindtr" "%{?buildroot}%{_bindir}"
# install tqtconv2ui
@@ -1466,12 +1441,6 @@ done
#__install -m644 -D "tools/linguist/linguist/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png"
#__install -m644 -D "tools/qtconfig/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png"
-# build attic package and copy it to tqt3-compat-headers
-pushd src
-tar cvvfz "attic.tar.gz" attic/
-install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/attic.tar.gz"
-popd
-
# install the man pages
%__install -d "%{?buildroot}%{_mandir}/man1"
%__install -m644 "doc/man/man1/"*"embed.1" "%{?buildroot}%{_mandir}/man1/"
diff --git a/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc b/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc
new file mode 100644
index 000000000..d131ff5e9
--- /dev/null
+++ b/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc
@@ -0,0 +1 @@
+setBadness('shlib-policy-name-error', 0)
diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec
index 4d9b6b348..7c2bac258 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tqtinterface
@@ -56,24 +56,26 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt3-mt-devel >= 3.5.0
BuildRequires: tqt3-dev-tools >= 3.5.0
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
%define uuid_devel libuuid-devel
%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define uuid_devel %{_lib}uuid-devel
+%endif
%if 0%{?rhel} == 5
%define uuid_devel e2fsprogs-devel
%endif
%{?uuid_devel:BuildRequires: %{uuid_devel}}
-
# PTHREAD support
%if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mgaversion} >= 7
+%if 0%{?mgaversion} >= 7 || 0%{?mdkver}
BuildRequires: %{_lib}npth-devel
%else
BuildRequires: pth-devel
@@ -95,8 +97,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -107,7 +113,7 @@ BuildRequires: Mesa-libGLU-devel
BuildRequires: xorg-x11-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libxi-devel
+BuildRequires: %{_lib}xi-devel
%endif
%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: libXi-devel
@@ -162,7 +168,7 @@ Provides: libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libtqt3-mt-devel >= 3.5.0
Requires: tqt3-dev-tools >= 3.5.0
-Requires: trinity-cmake >= %{version}-%{release}
+Requires: trinity-tde-cmake >= %{version}-%{release}
Obsoletes: trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -181,18 +187,7 @@ although some code has been added for useful functions that are no longer part o
%files -n %{libtqt4}-devel
%defattr(-,root,root,-)
-%{_bindir}/convert_qt_tqt1
-%{_bindir}/convert_qt_tqt2
-%{_bindir}/convert_qt_tqt3
-%{_bindir}/dcopidl-tqt
-%{_bindir}/dcopidl2cpp-tqt
-%{_bindir}/dcopidlng-tqt
-%{_bindir}/mcopidl-tqt
-%{_bindir}/moc-tqt
%{_bindir}/tmoc
-%{_bindir}/tqt-replace
-%{_bindir}/tqt-replace-stream
-%{_bindir}/uic-tqt
%{_includedir}/tqt/
%{_libdir}/libtqt.la
%{_libdir}/libtqt.so
@@ -214,7 +209,7 @@ although some code has been added for useful functions that are no longer part o
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh
index d4c1229c7..a53ffd06a 100755
--- a/redhat/docker/build.sh
+++ b/redhat/docker/build.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
TDE_VERSION="$2"
ARCH="$3"
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2"
[ -z "${ARCH}" ] && ARCH="x86_64"
[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
@@ -26,5 +26,5 @@ fi
# Strip 'localhost/' prefix from image tag
if ! docker images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then
docker image tag "localhost/${IMAGE}" "${IMAGE}"
- docker image remove "localhost/${IMAGE}"
+ #docker image remove "localhost/${IMAGE}"
fi
diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686
index a16417a58..135526498 100644
--- a/redhat/docker/el5/Dockerfile.i686
+++ b/redhat/docker/el5/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM centos32:5
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
# Add local repositories
diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64
index a6033ebea..1f123925e 100644
--- a/redhat/docker/el5/Dockerfile.x86_64
+++ b/redhat/docker/el5/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM centos:5
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add local repositories
@@ -20,8 +20,8 @@ RUN setarch ${ARCH} yum -y remove gnome-screensaver \
# Updated build tools (not provided in centos5)
# Distro-specific patches
-RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \
- && rpm -Uvh http://repo/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \
+RUN rpm -Uvh http://xh61v/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \
+ && rpm -Uvh http://xh61v/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \
&& chmod a+r /usr/libexec/utempter/utempter \
&& sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|"
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index 2ed6aa216..6858c0d9b 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM centos32:6
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
# Enable proxy
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index e59ee8957..7be807e46 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM centos:6
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Enable proxy
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index 9c05dc013..78e50226a 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -118,6 +118,7 @@ libraw1394-devel
libsamplerate-devel
libsmbclient-devel
libsndfile-devel
+libssh-devel
libssh2-devel
libtheora-devel
libtiff-devel
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index cae7bab86..1366cfb18 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM centos:7
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Enable proxy
@@ -22,9 +22,11 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE
# Fix utempter detection
# Distro-specific patches
+# Fix python3.6 detection (tdebindings; kvirc)
RUN chmod a+r /usr/libexec/utempter/utempter \
&& sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" \
- && ln -sf libmp4v2.so /usr/lib64/libmp4.so
+ && ln -sfv libmp4v2.so /usr/lib64/libmp4.so \
+ && ln -sfv python3.6m /usr/include/python3.6
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity \
@@ -38,11 +40,11 @@ COPY rpmmacros /home/trinity/.rpmmacros
RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm
-RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/y/yaz-5.31.1-4.fc36.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm
-RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/r/rdesktop-1.9.0-7.fc36.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
-RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 46c7034d9..a39c59cdd 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -9,7 +9,9 @@ binutils-devel
bison
bluez-libs-devel
boost-devel
+boost-python36-devel
bzip2-devel
+byacc
ccache
cdparanoia
cdparanoia-devel
@@ -19,6 +21,7 @@ clamav
clamav-devel
clucene-core-devel
cmake
+cmake3
cpp
cppunit-devel
createrepo
@@ -64,6 +67,7 @@ gtk2-devel
gtk+-devel
gtk-doc
guile-devel
+heimdal-devel
hiredis-devel
hspell-devel
html2ps
@@ -118,6 +122,7 @@ libsamplerate-devel
libsecret-devel
libsmbclient-devel
libsndfile-devel
+libssh-devel
libssh2-devel
libtheora-devel
libtiff-devel
@@ -174,11 +179,13 @@ pigz
pilot-link-devel
pkcs11-helper-devel
pkgconfig(pygtk-2.0)
+polkit-devel
poppler-devel
postgresql-devel
ppp
pth-devel
pulseaudio-libs-devel
+python3-devel
qt-devel
readline-devel
recode
@@ -211,6 +218,7 @@ usbutils
valgrind
wireless-tools-devel
xine-lib-devel
+xkeyboard-config-devel
xmlto
xorg-x11-font-utils
xscreensaver
diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros
index b76d30014..f47c6c067 100644
--- a/redhat/docker/el7/rpmmacros
+++ b/redhat/docker/el7/rpmmacros
@@ -1,3 +1,6 @@
%dist .el7
%_smp_mflags -j8
%jobs 8
+%cmake %cmake3
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index 090d63f9d..4cd5365ad 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -1,6 +1,6 @@
-FROM centos:8
+FROM rockylinux:8
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Enable custom repository
@@ -14,7 +14,8 @@ COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo
# Enable supplementary repositories
# Install Trinity build dependencies
COPY packages /packages
-RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+RUN set -x \
+ && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
&& curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
&& dnf -y update \
&& dnf -y install epel-release \
@@ -29,7 +30,10 @@ COPY rpmbuild.repo rpmbuild.repo
RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
# Fix utempter detection
-RUN chmod a+r /usr/libexec/utempter/utempter
+# Fix python3.6 detection (tdebindings; kvirc)
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && ln -sfv python3.6m /usr/include/python3.6 \
+ && ln -sfv python3 /usr/bin/python
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity \
@@ -40,19 +44,19 @@ COPY rpmmacros /home/trinity/.rpmmacros
# Build supplementary development tools
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/g/gnuchess-6.2.5-10.fc32.src.rpm \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index deb431bbe..cea7e8a72 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -26,6 +26,8 @@ createrepo_c
cryptsetup-devel
cups-devel
dbus-glib-devel
+djvulibre
+djvulibre-devel
docbook2X
doxygen
emacs
@@ -45,6 +47,7 @@ gamin-devel
gcc
gcc-c++
gcc-gfortran
+geoip-devel
gettext-devel
giflib-devel
glibmm24-devel
@@ -61,7 +64,9 @@ gtk3-devel
gtk-doc
guile-devel
heimdal-devel
+help2man
hspell-devel
+html2ps
icu
ImageMagick-devel
imake
@@ -93,6 +98,7 @@ libgsf-devel
libgssglue-devel
libical-devel
libidn-devel
+libjpeg-turbo-utils
libksba-devel
libmad-devel
libmemcached-devel
@@ -114,6 +120,7 @@ libsamplerate-devel
libsecret-devel
libsmbclient-devel
libsndfile-devel
+libssh-devel
libtheora-devel
libtiff-devel
libtirpc-devel
@@ -182,8 +189,6 @@ ppp
psutils
pulseaudio-libs-devel
pylibacl
-python2
-python2-devel
python3
python3-devel
python3-pyxattr
@@ -210,6 +215,7 @@ systemd-devel
taglib-devel
tcl
texinfo
+texlive-dvips
torsocks
transfig
unixODBC-devel
@@ -218,6 +224,7 @@ valgrind
wget
wireless-tools-devel
xine-lib-devel
+xkeyboard-config-devel
xmlto
xorg-x11-font-utils
xscreensaver
diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros
index dc2cb7e68..d2d495cbe 100644
--- a/redhat/docker/el8/rpmmacros
+++ b/redhat/docker/el8/rpmmacros
@@ -3,3 +3,5 @@
%jobs 8
%_debugsource_packages %nil
%_debugsource_template %nil
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64
new file mode 100644
index 000000000..5fb5a4c01
--- /dev/null
+++ b/redhat/docker/el9/Dockerfile.x86_64
@@ -0,0 +1,101 @@
+FROM rockylinux:9
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+# Enable proxy
+# Install OVL plugin for DNF
+# Update distribution packages
+# Add EPEL repository
+# Add RPMFUSION repository
+# Enable supplementary repositories
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && curl -o /usr/lib/python3.9/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
+ && dnf -y update \
+ && dnf -y install epel-release \
+ && dnf -y install https://download1.rpmfusion.org/free/el/updates/9/x86_64/r/rpmfusion-free-release-9-1.noarch.rpm \
+ && dnf -y install dnf-plugins-core \
+ && dnf config-manager --enable devel \
+ && dnf config-manager --enable plus \
+ && dnf -y --enableplugin=ovl install $(</packages)
+
+# Add YUM repository for locally built packages
+WORKDIR /etc/yum.repos.d
+COPY rpmbuild.repo rpmbuild.repo
+RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Build supplementary development tools
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
+
+RUN wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \
+ http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \
+ http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib{icu69,yaz}-*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/b/bdftopcf-1.1-4.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/bdftopcf-1*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/paper-2.3-4.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/psutils-2.07-2.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/h/html2ps-1.0-0.42.b7.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libxml++-2.42.1-3.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libofx-0.10.3-2.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP{,-devel}-1*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages
new file mode 100644
index 000000000..3d3239b3a
--- /dev/null
+++ b/redhat/docker/el9/packages
@@ -0,0 +1,229 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+bluez-libs-devel
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+cdparanoia
+cdparanoia-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+docbook2X
+doxygen
+emacs
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-devel
+fontforge
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+gcc-gfortran
+gettext-devel
+giflib-devel
+glibmm24-devel
+gmp-devel
+gnulib-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+heimdal-devel
+help2man
+hiredis
+hspell-devel
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+kernel
+lame-devel
+libacl-devel
+libao-devel
+libarchive-devel
+libassuan-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-devel
+libdb-cxx-devel
+libdvdread-devel
+libfontenc-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libjpeg-turbo-utils
+libjxl
+libksba-devel
+libmad-devel
+libmemcached-devel
+libmng-devel
+libmpcdec-devel
+libmtp-devel
+libnsl2-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpcap-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2-tools
+librsync-devel
+libsamplerate-devel
+libsecret-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libudisks2-devel
+libusb-devel
+lirc-devel
+lm_sensors-devel
+mesa-libGL-devel
+meson
+mplayer
+mysql-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+OpenEXR-devel
+openldap-devel
+opensc
+opensp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl
+perl-devel
+perl-generators
+perl(ExtUtils::MakeMaker)
+perl(inc::Module::Install)
+perl(IPC::Run3)
+perl(PAR::Dist)
+perl(Module::Signature)
+perl(Test::Pod)
+perl(Test::Pod::Coverage)
+perl(XML::Parser)
+pigz
+pkcs11-helper-devel
+polkit-devel
+poppler-devel
+postgresql
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python3
+python3-devel
+python3-pyxattr
+rdesktop
+rdiff-backup
+readline-devel
+recode
+redhat-rpm-config
+redis
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+systemd-devel
+taglib-devel
+tcl
+texinfo
+texlive-collection-basic
+torsocks
+transfig
+unixODBC-devel
+usbutils
+valgrind
+wget
+xine-lib-devel
+xkeyboard-config-devel
+xmlto
+xorg-x11-server-utils
+xorg-x11-util-macros
+xscreensaver
+xscreensaver-base
+xscreensaver-extras
+xscreensaver-gl-base
+xscreensaver-gl-extras
+xz-devel
diff --git a/redhat/docker/el9/rpmbuild.repo b/redhat/docker/el9/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/el9/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/el9/rpmmacros b/redhat/docker/el9/rpmmacros
new file mode 100644
index 000000000..67367b01a
--- /dev/null
+++ b/redhat/docker/el9/rpmmacros
@@ -0,0 +1,8 @@
+%dist .el9
+%_smp_mflags -j8
+%jobs 8
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64
index 2336d4548..a08b86185 100644
--- a/redhat/docker/f25/Dockerfile.x86_64
+++ b/redhat/docker/f25/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:25
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686
index 7ed2344f1..86cae885c 100644
--- a/redhat/docker/f26/Dockerfile.i686
+++ b/redhat/docker/f26/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM fedora32:26
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
# Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64
index adf0c84b3..bc24ab119 100644
--- a/redhat/docker/f26/Dockerfile.x86_64
+++ b/redhat/docker/f26/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:26
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686
index d9ed83adb..a81c034e9 100644
--- a/redhat/docker/f27/Dockerfile.i686
+++ b/redhat/docker/f27/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM fedora32:27
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
# Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64
index 85e843edd..ed4953b28 100644
--- a/redhat/docker/f27/Dockerfile.x86_64
+++ b/redhat/docker/f27/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:27
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add RPMFUSION repository
diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686
index d904832ad..96adf7fac 100644
--- a/redhat/docker/f28/Dockerfile.i686
+++ b/redhat/docker/f28/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM fedora32:28
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64
index bc1403a5e..913b73a18 100644
--- a/redhat/docker/f28/Dockerfile.x86_64
+++ b/redhat/docker/f28/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:28
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.i686 b/redhat/docker/f29/Dockerfile.i686
index eb47cda8c..8a59d571e 100644
--- a/redhat/docker/f29/Dockerfile.i686
+++ b/redhat/docker/f29/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM fedora32:29
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.x86_64 b/redhat/docker/f29/Dockerfile.x86_64
index a096b2321..f4a295247 100644
--- a/redhat/docker/f29/Dockerfile.x86_64
+++ b/redhat/docker/f29/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:29
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686
index 991b5a194..fd70b9f98 100644
--- a/redhat/docker/f30/Dockerfile.i686
+++ b/redhat/docker/f30/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM fedora32:30
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64
index 3caf1c05e..a8610575f 100644
--- a/redhat/docker/f30/Dockerfile.x86_64
+++ b/redhat/docker/f30/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:30
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64
index 9f93a9b72..894f8794f 100644
--- a/redhat/docker/f31/Dockerfile.x86_64
+++ b/redhat/docker/f31/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:31
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64
index ec0e049b8..d48a0be88 100644
--- a/redhat/docker/f32/Dockerfile.x86_64
+++ b/redhat/docker/f32/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:32
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64
index 4bd74cf4a..67ea30ecb 100644
--- a/redhat/docker/f33/Dockerfile.x86_64
+++ b/redhat/docker/f33/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:33
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Fix DNF database corruption
diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64
index 3b1aee7d6..776f750eb 100644
--- a/redhat/docker/f34/Dockerfile.x86_64
+++ b/redhat/docker/f34/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:34
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Fix DNF database corruption
diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64
index b4a34b522..947dcee69 100644
--- a/redhat/docker/f35/Dockerfile.x86_64
+++ b/redhat/docker/f35/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:35
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Fix DNF database corruption
diff --git a/redhat/docker/f35/rpmmacros b/redhat/docker/f35/rpmmacros
index f8169a30e..4ce88c1fd 100644
--- a/redhat/docker/f35/rpmmacros
+++ b/redhat/docker/f35/rpmmacros
@@ -2,5 +2,6 @@
%_smp_mflags -j8
%jobs 8
%__cmake_builddir %nil
+%__cmake_in_source_build 1
%_debugsource_packages %nil
%_debugsource_template %nil
diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64
index 80c5d583c..ceda97e9e 100644
--- a/redhat/docker/f36/Dockerfile.x86_64
+++ b/redhat/docker/f36/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM fedora:36
-ARG TDE_VERSION=14.0.12
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Fix DNF database corruption
@@ -35,6 +35,6 @@ RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
-RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
diff --git a/redhat/docker/f36/packages b/redhat/docker/f36/packages
index 71b1f0d27..e9fa47a55 100644
--- a/redhat/docker/f36/packages
+++ b/redhat/docker/f36/packages
@@ -69,6 +69,7 @@ gtk+-devel
gtk-doc
guile-devel
harfbuzz-devel
+heimdal-devel
hspell-devel
htdig
html2ps
@@ -192,7 +193,6 @@ pkgconfig(pygtk-2.0)
polkit-devel
poppler-devel
postgresql
-postgresql-devel
postgresql-private-devel
postgresql-server-devel
ppp
diff --git a/redhat/docker/f36/rpmmacros b/redhat/docker/f36/rpmmacros
index 22a794cc1..fd63b7997 100644
--- a/redhat/docker/f36/rpmmacros
+++ b/redhat/docker/f36/rpmmacros
@@ -1,6 +1,8 @@
%dist .fc36
%_smp_mflags -j8
%jobs 8
+%__brp_remove_la_files %nil
%__cmake_builddir %nil
+%__cmake_in_source_build 1
%_debugsource_packages %nil
%_debugsource_template %nil
diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64
new file mode 100644
index 000000000..fc288134d
--- /dev/null
+++ b/redhat/docker/f37/Dockerfile.x86_64
@@ -0,0 +1,41 @@
+FROM fedora:37
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \
+ && sed -i /etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|37|g" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-37.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
+
+RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2*
diff --git a/redhat/docker/f37/packages b/redhat/docker/f37/packages
new file mode 100644
index 000000000..6fd5a4f15
--- /dev/null
+++ b/redhat/docker/f37/packages
@@ -0,0 +1,240 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+heimdal-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libusb-compat-0.1-devel
+libusb1-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f37/rpmbuild.repo b/redhat/docker/f37/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f37/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f37/rpmmacros b/redhat/docker/f37/rpmmacros
new file mode 100644
index 000000000..3865a262b
--- /dev/null
+++ b/redhat/docker/f37/rpmmacros
@@ -0,0 +1,9 @@
+%dist .fc37
+%_smp_mflags -j8
+%jobs 8
+%__brp_remove_la_files %nil
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%source_date_epoch_from_changelog 0
diff --git a/redhat/docker/f38/Dockerfile.x86_64 b/redhat/docker/f38/Dockerfile.x86_64
new file mode 100644
index 000000000..b01609519
--- /dev/null
+++ b/redhat/docker/f38/Dockerfile.x86_64
@@ -0,0 +1,41 @@
+FROM fedora:38
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \
+ && sed -i /etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|38|g" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-38.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
+
+RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2*
diff --git a/redhat/docker/f38/packages b/redhat/docker/f38/packages
new file mode 100644
index 000000000..828222df7
--- /dev/null
+++ b/redhat/docker/f38/packages
@@ -0,0 +1,241 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+heimdal-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+less
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libusb-compat-0.1-devel
+libusb1-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f38/rpmbuild.repo b/redhat/docker/f38/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f38/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f38/rpmmacros b/redhat/docker/f38/rpmmacros
new file mode 100644
index 000000000..4d5b149f6
--- /dev/null
+++ b/redhat/docker/f38/rpmmacros
@@ -0,0 +1,10 @@
+%dist .fc38
+%_smp_mflags -j8
+%jobs 8
+%__brp_remove_la_files %nil
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%_fortify_level 2
+%source_date_epoch_from_changelog 0
diff --git a/redhat/docker/f39/Dockerfile.x86_64 b/redhat/docker/f39/Dockerfile.x86_64
new file mode 100644
index 000000000..51776f01f
--- /dev/null
+++ b/redhat/docker/f39/Dockerfile.x86_64
@@ -0,0 +1,41 @@
+FROM fedora:39
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \
+ && sed -i /etc/yum.repos.d/fedora{,-updates}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|39|g" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-39.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
+
+RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2*
diff --git a/redhat/docker/f39/packages b/redhat/docker/f39/packages
new file mode 100644
index 000000000..4a76d8eeb
--- /dev/null
+++ b/redhat/docker/f39/packages
@@ -0,0 +1,242 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+heimdal-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+less
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libusb-compat-0.1-devel
+libusb1-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python3.11
+python3.11-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+xbase-devel
+xine-lib-devel
+xkeyboard-config-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f39/rpmbuild.repo b/redhat/docker/f39/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f39/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f39/rpmmacros b/redhat/docker/f39/rpmmacros
new file mode 100644
index 000000000..e199a1097
--- /dev/null
+++ b/redhat/docker/f39/rpmmacros
@@ -0,0 +1,11 @@
+%dist .fc39
+%_smp_mflags -j8
+%jobs 8
+%__brp_remove_la_files %nil
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%source_date_epoch_from_changelog 0
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/f40/Dockerfile.x86_64 b/redhat/docker/f40/Dockerfile.x86_64
new file mode 100644
index 000000000..775a503cd
--- /dev/null
+++ b/redhat/docker/f40/Dockerfile.x86_64
@@ -0,0 +1,41 @@
+FROM fedora:40
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \
+ && sed -i /etc/yum.repos.d/fedora{,-updates}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|40|g" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
+
+RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2*
diff --git a/redhat/docker/f40/packages b/redhat/docker/f40/packages
new file mode 100644
index 000000000..7f1d9cc47
--- /dev/null
+++ b/redhat/docker/f40/packages
@@ -0,0 +1,242 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+heimdal-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+less
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libusb-compat-0.1-devel
+libusb1-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python3
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+xbase-devel
+xine-lib-devel
+xkeyboard-config-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f40/rpmbuild.repo b/redhat/docker/f40/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f40/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f40/rpmmacros b/redhat/docker/f40/rpmmacros
new file mode 100644
index 000000000..32f75b192
--- /dev/null
+++ b/redhat/docker/f40/rpmmacros
@@ -0,0 +1,10 @@
+%dist .fc40
+%_smp_mflags -j8
+%jobs 8
+%__brp_remove_la_files %nil
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%source_date_epoch_from_changelog 0
+%python python3
diff --git a/redhat/docker/mageia.sh b/redhat/docker/mageia.sh
new file mode 100755
index 000000000..e0a84588a
--- /dev/null
+++ b/redhat/docker/mageia.sh
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+
+NAME="mageia"
+VERSION="${1:-9}" # E.g: '9'
+IMAGE="${NAME}:${VERSION}"
+INSTALLROOT="/dev/shm/${IMAGE}"
+ARCH="x86_64"
+
+sudo rm -rf "${INSTALLROOT}"
+sudo mkdir -p "${INSTALLROOT}"
+sudo dnf -y \
+ --disablerepo="*" \
+ --enablerepo="mageia-${ARCH},updates-${ARCH}" \
+ --installroot="${INSTALLROOT}" \
+ --releasever="${VERSION}" \
+ install \
+ \
+ bash \
+ mageia-release-common \
+ urpmi \
+ vim
+
+sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb
+
+FILE="${IMAGE//\//_}.tar"
+sudo tar -C "${INSTALLROOT}" -c . >"${FILE}"
+sudo rm -rf "${INSTALLROOT}"
+
+docker rmi -f "${IMAGE}"
+docker import "${FILE}" "${IMAGE}"
+
+pigz "${FILE}"
+mkdir -p "${HOME}/tde/docker"
+mv -fv "${FILE}.gz" "${HOME}/tde/docker"
diff --git a/redhat/docker/mageia32.sh b/redhat/docker/mageia32.sh
index 29afb4b59..01aa1f672 100755
--- a/redhat/docker/mageia32.sh
+++ b/redhat/docker/mageia32.sh
@@ -3,6 +3,7 @@
NAME="mageia32"
VERSION="$1" # E.g: '26'
IMAGE="${NAME}:${VERSION}"
+TAR="${NAME}-${VERSION}.tar"
INSTALLROOT="/dev/shm/${IMAGE}"
sudo rm -rf "${INSTALLROOT}"
@@ -12,8 +13,8 @@ setarch i686 sudo urpmi \
--auto \
bash vim urpmi mageia-release-common
-sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
+sudo tar -C "${INSTALLROOT}" -c . >"${TAR}"
sudo rm -rf "${INSTALLROOT}"
docker rmi -f "${IMAGE}"
-docker import "${IMAGE}.tar" "${IMAGE}"
+docker import "${TAR}" "${IMAGE}"
diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64
index 16f58288b..13b664401 100644
--- a/redhat/docker/mga5/Dockerfile.x86_64
+++ b/redhat/docker/mga5/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM mageia:5.1
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686
index d41472423..3df92c2bc 100644
--- a/redhat/docker/mga6/Dockerfile.i686
+++ b/redhat/docker/mga6/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM mageia32:6
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
# Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64
index 36887a9dd..22a54729b 100644
--- a/redhat/docker/mga6/Dockerfile.x86_64
+++ b/redhat/docker/mga6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM mageia:6
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Reset URPMI repositories to default
diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686
index 0d7d949d4..0c75795b7 100644
--- a/redhat/docker/mga7/Dockerfile.i686
+++ b/redhat/docker/mga7/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM mageia32:7
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
# Reset URPMI repositories to default
diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64
index 1fcf07ccb..71b5dc862 100644
--- a/redhat/docker/mga7/Dockerfile.x86_64
+++ b/redhat/docker/mga7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM mageia:7
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Reset URPMI repositories to default
diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686
index e39ba47d2..bcb1d59e4 100644
--- a/redhat/docker/mga8/Dockerfile.i686
+++ b/redhat/docker/mga8/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM mageia32:8
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
# Reset URPMI repositories to default
diff --git a/redhat/docker/mga8/Dockerfile.x86_64 b/redhat/docker/mga8/Dockerfile.x86_64
index f2385a34f..864b12c2b 100644
--- a/redhat/docker/mga8/Dockerfile.x86_64
+++ b/redhat/docker/mga8/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM mageia:8
-ARG TDE_VERSION=14.0.9
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Reset URPMI repositories to default
diff --git a/redhat/docker/mga8/packages.i686 b/redhat/docker/mga8/packages.i686
index af6c6feb7..c44677fa0 100644
--- a/redhat/docker/mga8/packages.i686
+++ b/redhat/docker/mga8/packages.i686
@@ -55,6 +55,7 @@ gtk2-devel
gtk+3.0-devel
gtk-doc
hspell-devel
+html2ps
hunspell-en
iceauth
ImageMagick-devel
@@ -213,11 +214,11 @@ pinentry-gtk2
pkgconfig(audiofile)
pkgconfig(libpng16)
polkit-agent-none
+polkit-devel
postgresql13
postgresql13-devel
ppp
-python-devel
-python-sip
+python3-devel
qt4-devel
readline-devel
recode
diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64
index ad8802b2c..22bc88e76 100644
--- a/redhat/docker/mga8/packages.x86_64
+++ b/redhat/docker/mga8/packages.x86_64
@@ -55,6 +55,7 @@ gtk2-devel
gtk+3.0-devel
gtk-doc
hspell-devel
+html2ps
hunspell-en
iceauth
ImageMagick-devel
@@ -216,11 +217,11 @@ pinentry-gtk2
pkgconfig(audiofile)
pkgconfig(libpng16)
polkit-agent-none
+polkit-devel
postgresql13
postgresql13-devel
ppp
-python-devel
-python-sip
+python3-devel
qt4-devel
readline-devel
recode
diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686
new file mode 100644
index 000000000..1811d8f52
--- /dev/null
+++ b/redhat/docker/mga9/Dockerfile.i686
@@ -0,0 +1,45 @@
+FROM mageia32:9
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=i686
+
+# Reset URPMI repositories to default
+# Enable more URPMI repositories
+# Enable english locales
+# Update distribution
+# Install Trinity build dependencies
+COPY packages.${ARCH} /packages
+RUN set -x \
+ && urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/i586/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" \
+ && urpmi.update -a \
+ && urpmi --replacepkgs glibc \
+ && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : \
+ && urpmi --auto-select --auto \
+ && urpmi --auto $(</packages)
+
+# Enable ccache
+# Fix utempter detection
+# Fix poppler support
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \
+ && chmod a+r /usr/libexec/utempter/utempter \
+ && sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
+
+# Add non-root user to build packages
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64
new file mode 100644
index 000000000..450334eec
--- /dev/null
+++ b/redhat/docker/mga9/Dockerfile.x86_64
@@ -0,0 +1,45 @@
+FROM mageia:9
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+# Reset URPMI repositories to default
+# Enable more URPMI repositories
+# Enable english locales
+# Update distribution
+# Install Trinity build dependencies
+COPY packages.${ARCH} /packages
+RUN set -x \
+ && urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/x86_64/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" \
+ && urpmi.update -a \
+ && urpmi --replacepkgs glibc \
+ && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : \
+ && urpmi --auto-select --auto \
+ && urpmi --auto $(</packages)
+
+# Enable ccache
+# Fix utempter detection
+# Fix poppler support
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \
+ && chmod a+r /usr/libexec/utempter/utempter \
+ && sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
+
+# Add non-root user to build packages
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686
new file mode 100644
index 000000000..01f51270c
--- /dev/null
+++ b/redhat/docker/mga9/packages.i686
@@ -0,0 +1,254 @@
+advancecomp
+alsa-lib-devel
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+fontconfig-devel
+freetype2-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gtk2-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+hunspell-en
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+karma-sharp
+kde-dev-scripts
+libapr-devel
+libapr-util-devel
+libart_lgpl-devel
+libattr-devel
+libbinutils-devel
+libblkid-devel
+libcdda-devel
+libcln-devel
+libclucene-devel
+libclucene-devel
+libcommoncpp-devel
+libcommoncpp-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libcurl-devel
+libdvdread-devel
+libdvdread-devel
+libecpg13_6
+libexiv2-devel
+libext2fs-devel
+libfbclient-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libflac-devel
+libfontenc-devel
+libgadu-devel
+libgeoip-devel
+libgmime2.6-devel
+libgpod-devel
+libgsf-devel
+libgstreamer1.0-devel
+libgstreamer-plugins-base1.0-devel
+libhd-devel
+libical-devel
+libice-devel
+libidn-devel
+libifp-devel
+libinotifytools-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjasper-devel
+libjpeg-devel
+libkarma-devel
+liblo-devel
+liblrdf-devel
+liblua-devel
+libmad-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmusicbrainz5-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libnjb-devel
+libnpth-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpaper-devel
+libpcre-devel
+libpkcs11-helper-devel
+libpoppler-devel
+libpulseaudio-devel
+libpx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg
+libsane1-devel
+libsmbclient-devel
+libsm-devel
+libsndfile-devel
+libt1lib-devel
+libt1lib-devel
+libtheora-devel
+libtiff-devel
+libtwolame-devel
+libudev-devel
+libungif-devel
+libusb1.0-devel
+libutempter
+libutempter0
+libutempter-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxaw-devel
+libxcursor-devel
+libxdg-basedir-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxi-devel
+libxine1.2-devel
+libxinerama-devel
+libxkbfile-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxscrnsaver-devel
+libxslt-devel
+libxtst-devel
+libxv-devel
+libxxf86dga-devel
+libxxf86dga-devel
+libyaz-devel
+libyaz-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+notification-daemon
+ocaml
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+openldap-servers-devel
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl(PAR::Packer)
+perl-pcsc-perl
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+polkit-agent-none
+polkit-devel
+postgresql13
+postgresql13-devel
+ppp
+python3-devel
+qt4-devel
+readline-devel
+recode
+rpcgen
+rpm-build
+rpm-devel
+ruby-devel
+scons
+SDL-devel
+speex-devel
+sqlite3-devel
+sshfs-fuse
+subversion-devel
+sudo
+swig
+sword-devel
+taglib-devel
+torsocks
+transfig
+udisks2-devel
+unixODBC-devel
+usbutils
+valgrind
+wv2-devel
+x11-font-util
+xbase-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+yaz
+zlib-devel
diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64
new file mode 100644
index 000000000..21c9a7d60
--- /dev/null
+++ b/redhat/docker/mga9/packages.x86_64
@@ -0,0 +1,258 @@
+advancecomp
+alsa-lib-devel
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+fontconfig-devel
+freetype2-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gtk2-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+hunspell-en
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+karma-sharp
+kde-dev-scripts
+lib64apr-devel
+lib64apr-util-devel
+lib64binutils-devel
+lib64boost_python3-devel
+lib64cln-devel
+lib64clucene-devel
+lib64commoncpp-devel
+lib64cryptsetup-devel
+lib64curl-devel
+lib64dvdread-devel
+lib64ecpg13_6
+lib64exiv2-devel
+lib64ext2fs-devel
+lib64fbclient-devel
+lib64ffmpeg-devel
+lib64flac++-devel
+lib64flac-devel
+lib64fontenc-devel
+lib64geoip-devel
+lib64gmime2.6-devel
+lib64gstreamer1.0-devel
+lib64gstreamer-plugins-base1.0-devel
+lib64inotifytools-devel
+lib64jasper-devel
+lib64jpeg-devel
+lib64lua-devel
+lib64mad-devel
+lib64mp3lame-devel
+lib64musicbrainz5-devel
+lib64npth-devel
+lib64paper-devel
+lib64pcre-devel
+lib64pkcs11-helper-devel
+lib64poppler-devel
+lib64pulseaudio-devel
+lib64sane1-devel
+lib64t1lib-devel
+lib64tiff-devel
+lib64twolame-devel
+lib64udev-devel
+lib64usb1.0-devel
+lib64utempter0
+lib64utempter-devel
+lib64v4l-devel
+lib64xaw-devel
+lib64xdg-basedir-devel
+lib64xi-devel
+lib64xine1.2-devel
+lib64xscrnsaver-devel
+lib64xtst-devel
+lib64xxf86dga-devel
+lib64yaz-devel
+libart_lgpl-devel
+libattr-devel
+libblkid-devel
+libcdda-devel
+libclucene-devel
+libcommoncpp-devel
+libconfig-devel
+libcurl-devel
+libdvdread-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libhd-devel
+libical-devel
+libice-devel
+libidn-devel
+libifp-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libkarma-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libnjb-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg
+libsmbclient-devel
+libsm-devel
+libsndfile-devel
+libt1lib-devel
+libtheora-devel
+libungif-devel
+libutempter
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxcursor-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxinerama-devel
+libxkbfile-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxslt-devel
+libxv-devel
+libxxf86dga-devel
+libyaz-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+net-tools
+notification-daemon
+ocaml
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+openldap-servers-devel
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl(PAR::Packer)
+perl-pcsc-perl
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+polkit-agent-none
+polkit-devel
+postgresql13
+postgresql13-devel
+ppp
+python3-devel
+qt4-devel
+readline-devel
+recode
+rpcgen
+rpm-build
+rpm-devel
+ruby-devel
+scons
+SDL-devel
+speex-devel
+sqlite3-devel
+sshfs-fuse
+subversion-devel
+sudo
+swig
+sword-devel
+taglib-devel
+torsocks
+transfig
+udisks2-devel
+unixODBC-devel
+usbutils
+valgrind
+wv2-devel
+x11-font-util
+xbase-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+yaz
+zlib-devel
diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros
new file mode 100644
index 000000000..e0f078bca
--- /dev/null
+++ b/redhat/docker/mga9/rpmmacros
@@ -0,0 +1,10 @@
+%dist .mga9
+%_smp_mflags -j8
+%jobs 8
+%__brp_remove_la_files %nil
+%_program_prefix ""
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%_vpath_builddir .
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/omv5000/Dockerfile.x86_64 b/redhat/docker/omv5000/Dockerfile.x86_64
new file mode 100644
index 000000000..37b186710
--- /dev/null
+++ b/redhat/docker/omv5000/Dockerfile.x86_64
@@ -0,0 +1,65 @@
+FROM openmandriva:5.0
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+COPY packages /packages
+RUN set -x \
+ && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && dnf -y update \
+ && dnf -y install --skip-broken $(</packages)
+
+# Fix utempter detection
+RUN set -x \
+ && chmod a+r /usr/libexec/utempter/utempter
+
+# Add non-root user to build packages
+RUN set -x \
+ && rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc \
+ && chown -R trinity /home/trinity
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN set -x \
+ && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm
+
+RUN set -x \
+ && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm
+
+RUN set -x \
+ && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
diff --git a/redhat/docker/omv5000/packages b/redhat/docker/omv5000/packages
new file mode 100644
index 000000000..47a126218
--- /dev/null
+++ b/redhat/docker/omv5000/packages
@@ -0,0 +1,256 @@
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+createrepo_c
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+flex-devel
+fontconfig-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+ghostscript
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gsl-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+iceauth
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+kde-dev-scripts
+less
+lib64acl-devel
+lib64alsa-oss-devel
+lib64apr-devel
+lib64apr-util-devel
+lib64asound-devel
+lib64attr-devel
+lib64audio-devel
+lib64binutils-devel
+lib64cap-devel
+lib64cdda-devel
+lib64cdio-devel
+lib64cdio_paranoia-devel
+lib64cln-devel
+lib64clucene-devel
+lib64config-devel
+lib64cryptsetup-devel
+lib64curl-devel
+lib64drm-devel
+lib64dvdread-devel
+lib64exif-devel
+lib64exiv2-devel
+lib64expat-devel
+lib64ext2fs-devel
+lib64fbclient-devel
+lib64ffmpeg-devel
+lib64flac++-devel
+lib64flac-devel
+lib64fluidsynth-devel
+lib64fontenc-devel
+lib64gadu-devel
+lib64geoip-devel
+lib64gif-devel
+lib64glu-devel
+lib64gmime2.6-devel
+lib64gmp-devel
+lib64gnutls-devel
+lib64gpg-error-devel
+lib64gphoto-devel
+lib64gpod-devel
+lib64graphicsmagick-devel
+lib64gstreamer-devel
+lib64gst-plugins-base1.0-devel
+lib64gtk+2.0-devel
+lib64hiredis-devel
+lib64ical-devel
+lib64icu-devel
+lib64idn-devel
+lib64ifp-devel
+lib64jack-devel
+lib64magick-devel
+lib64inotifytools-devel
+lib64jasper-devel
+lib64jpeg-devel
+lib64lame-devel
+lib64lcms-devel
+lib64ldap-devel
+lib64lirc_client-devel
+lib64lo-devel
+lib64lrdf-devel
+lib64ltdl-devel
+lib64lua-devel
+lib64mad-devel
+lib64magic-devel
+lib64memcached-devel
+lib64mng-devel
+lib64mpcdec-devel
+lib64mtp-devel
+lib64musicbrainz5-devel
+lib64nettle-devel
+lib64njb-devel
+lib64nm-devel
+lib64npth-devel
+lib64nsl-devel
+lib64nspr-devel
+lib64ofx-devel
+lib64openexr-devel
+lib64otr-devel
+lib64paper-devel
+lib64pcre-devel
+lib64pcsclite-devel
+lib64pkcs11-helper-devel
+lib64polkit1-devel
+lib64poppler-devel
+lib64pqxx-devel
+lib64pth-devel
+lib64pulseaudio-devel
+lib64qalculate-devel
+lib64raptor-devel
+lib64raw1394-devel
+lib64rsvg2-devel
+lib64rsync-devel
+lib64samplerate-devel
+lib64sane1-devel
+lib64sasl-devel
+lib64SDL-devel
+lib64smbclient-devel
+lib64sndfile-devel
+lib64t1lib-devel
+lib64tasn1-devel
+lib64theora-devel
+lib64tiff-devel
+lib64tirpc-devel
+lib64twolame-devel
+lib64udev-devel
+lib64udisks-devel
+lib64usb-compat0.1-devel
+lib64usb1.0-devel
+lib64utempter0
+lib64utempter-devel
+lib64v4l-devel
+lib64visual-devel
+lib64vorbis-devel
+lib64wmf-devel
+lib64wpd-devel
+lib64xaw-devel
+lib64xdg-basedir-devel
+lib64xi-devel
+lib64xine-devel
+lib64xkbfile-devel
+lib64xscrnsaver-devel
+lib64xslt-devel
+lib64xtst-devel
+lib64xxf86dga-devel
+lib64xxf86vm-devel
+lib64wrap-devel
+librsvg
+lm_sensors-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+net-tools
+notification-daemon
+ocaml
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl(Archive::Zip)
+perl(ExtUtils::CBuilder)
+perl(ExtUtils::Embed)
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl(Module::ScanDeps)
+perl(PAR::Dist)
+perl-pcsc-perl
+perl(Test::More)
+perl(Tk)
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+postgresql
+postgresql-devel
+ppp
+python3-devel
+python-pylibacl
+python-pyyaml
+python-setuptools_scm
+pyxattr
+readline-devel
+recode
+rpm-build
+rpm-devel
+ruby-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+taglib-devel
+tcp_wrappers
+torsocks
+transfig
+unixODBC-devel
+usbutils
+valgrind
+x11-font-util
+xbase-devel
+xkeyboard-config-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+zlib-devel
diff --git a/redhat/docker/omv5000/rpmmacros b/redhat/docker/omv5000/rpmmacros
new file mode 100644
index 000000000..0a954f906
--- /dev/null
+++ b/redhat/docker/omv5000/rpmmacros
@@ -0,0 +1,11 @@
+%dist %nil
+%_smp_mflags -j8
+%jobs 8
+%dont_remove_libtool_files 1
+%_disable_rebuild_configure 1
+%_program_prefix ""
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%_vpath_builddir .
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64
new file mode 100644
index 000000000..55f8a0abf
--- /dev/null
+++ b/redhat/docker/omvcooker/Dockerfile.x86_64
@@ -0,0 +1,65 @@
+FROM openmandriva/cooker:latest
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+COPY packages /packages
+RUN set -x \
+ && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && dnf -y update \
+ && dnf -y install --skip-broken $(</packages)
+
+# Fix utempter detection
+RUN set -x \
+ && chmod a+r /usr/libexec/utempter/utempter
+
+# Add non-root user to build packages
+RUN set -x \
+ && rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc \
+ && chown -R trinity /home/trinity
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN set -x \
+ && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm
+
+#RUN set -x \
+# && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --define "mkrel %nil" --nodeps \
+# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec --define "mkrel %nil" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm
+
+RUN set -x \
+ && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm --define "mkrel %nil" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec --define "mkrel %nil" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec --define "mkrel %nil" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "mkrel %nil" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages
new file mode 100644
index 000000000..47a126218
--- /dev/null
+++ b/redhat/docker/omvcooker/packages
@@ -0,0 +1,256 @@
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+createrepo_c
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+flex-devel
+fontconfig-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+ghostscript
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gsl-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+iceauth
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+kde-dev-scripts
+less
+lib64acl-devel
+lib64alsa-oss-devel
+lib64apr-devel
+lib64apr-util-devel
+lib64asound-devel
+lib64attr-devel
+lib64audio-devel
+lib64binutils-devel
+lib64cap-devel
+lib64cdda-devel
+lib64cdio-devel
+lib64cdio_paranoia-devel
+lib64cln-devel
+lib64clucene-devel
+lib64config-devel
+lib64cryptsetup-devel
+lib64curl-devel
+lib64drm-devel
+lib64dvdread-devel
+lib64exif-devel
+lib64exiv2-devel
+lib64expat-devel
+lib64ext2fs-devel
+lib64fbclient-devel
+lib64ffmpeg-devel
+lib64flac++-devel
+lib64flac-devel
+lib64fluidsynth-devel
+lib64fontenc-devel
+lib64gadu-devel
+lib64geoip-devel
+lib64gif-devel
+lib64glu-devel
+lib64gmime2.6-devel
+lib64gmp-devel
+lib64gnutls-devel
+lib64gpg-error-devel
+lib64gphoto-devel
+lib64gpod-devel
+lib64graphicsmagick-devel
+lib64gstreamer-devel
+lib64gst-plugins-base1.0-devel
+lib64gtk+2.0-devel
+lib64hiredis-devel
+lib64ical-devel
+lib64icu-devel
+lib64idn-devel
+lib64ifp-devel
+lib64jack-devel
+lib64magick-devel
+lib64inotifytools-devel
+lib64jasper-devel
+lib64jpeg-devel
+lib64lame-devel
+lib64lcms-devel
+lib64ldap-devel
+lib64lirc_client-devel
+lib64lo-devel
+lib64lrdf-devel
+lib64ltdl-devel
+lib64lua-devel
+lib64mad-devel
+lib64magic-devel
+lib64memcached-devel
+lib64mng-devel
+lib64mpcdec-devel
+lib64mtp-devel
+lib64musicbrainz5-devel
+lib64nettle-devel
+lib64njb-devel
+lib64nm-devel
+lib64npth-devel
+lib64nsl-devel
+lib64nspr-devel
+lib64ofx-devel
+lib64openexr-devel
+lib64otr-devel
+lib64paper-devel
+lib64pcre-devel
+lib64pcsclite-devel
+lib64pkcs11-helper-devel
+lib64polkit1-devel
+lib64poppler-devel
+lib64pqxx-devel
+lib64pth-devel
+lib64pulseaudio-devel
+lib64qalculate-devel
+lib64raptor-devel
+lib64raw1394-devel
+lib64rsvg2-devel
+lib64rsync-devel
+lib64samplerate-devel
+lib64sane1-devel
+lib64sasl-devel
+lib64SDL-devel
+lib64smbclient-devel
+lib64sndfile-devel
+lib64t1lib-devel
+lib64tasn1-devel
+lib64theora-devel
+lib64tiff-devel
+lib64tirpc-devel
+lib64twolame-devel
+lib64udev-devel
+lib64udisks-devel
+lib64usb-compat0.1-devel
+lib64usb1.0-devel
+lib64utempter0
+lib64utempter-devel
+lib64v4l-devel
+lib64visual-devel
+lib64vorbis-devel
+lib64wmf-devel
+lib64wpd-devel
+lib64xaw-devel
+lib64xdg-basedir-devel
+lib64xi-devel
+lib64xine-devel
+lib64xkbfile-devel
+lib64xscrnsaver-devel
+lib64xslt-devel
+lib64xtst-devel
+lib64xxf86dga-devel
+lib64xxf86vm-devel
+lib64wrap-devel
+librsvg
+lm_sensors-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+net-tools
+notification-daemon
+ocaml
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl(Archive::Zip)
+perl(ExtUtils::CBuilder)
+perl(ExtUtils::Embed)
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl(Module::ScanDeps)
+perl(PAR::Dist)
+perl-pcsc-perl
+perl(Test::More)
+perl(Tk)
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+postgresql
+postgresql-devel
+ppp
+python3-devel
+python-pylibacl
+python-pyyaml
+python-setuptools_scm
+pyxattr
+readline-devel
+recode
+rpm-build
+rpm-devel
+ruby-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+taglib-devel
+tcp_wrappers
+torsocks
+transfig
+unixODBC-devel
+usbutils
+valgrind
+x11-font-util
+xbase-devel
+xkeyboard-config-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+zlib-devel
diff --git a/redhat/docker/omvcooker/rpmmacros b/redhat/docker/omvcooker/rpmmacros
new file mode 100644
index 000000000..0a954f906
--- /dev/null
+++ b/redhat/docker/omvcooker/rpmmacros
@@ -0,0 +1,11 @@
+%dist %nil
+%_smp_mflags -j8
+%jobs 8
+%dont_remove_libtool_files 1
+%_disable_rebuild_configure 1
+%_program_prefix ""
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%_vpath_builddir .
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/openmandriva.sh b/redhat/docker/openmandriva.sh
new file mode 100755
index 000000000..ff121c54e
--- /dev/null
+++ b/redhat/docker/openmandriva.sh
@@ -0,0 +1,27 @@
+#!/bin/bash -ex
+
+NAME="openmandriva"
+VERSION="${1:-5.0}" # E.g: '26'
+IMAGE="${NAME}:${VERSION}"
+TAR="${NAME}-${VERSION}.tar"
+INSTALLROOT="/dev/shm/${IMAGE}"
+
+sudo rm -rf "${INSTALLROOT}"
+sudo dnf install \
+ --assumeyes \
+ --disablerepo="*" \
+ --enablerepo="omv*" \
+ --installroot="${INSTALLROOT}" \
+ --nodocs \
+ --nogpgcheck \
+ --refresh \
+ --releasever="${VERSION}" \
+ --repofrompath 'omv-release,http://mirror.openmandriva.org/$releasever/repository/x86_64/main/release/' \
+ --repofrompath 'omv-updates,http://mirror.openmandriva.org/$releasever/repository/x86_64/main/updates/' \
+ bash curl dnf vim
+
+sudo tar -C "${INSTALLROOT}" -c . >"${TAR}"
+sudo rm -rf "${INSTALLROOT}"
+
+docker rmi -f "${IMAGE}"
+docker import "${TAR}" "${IMAGE}"
diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh
index 1a78e6340..5d4dce450 100755
--- a/redhat/docker/opensuse32.sh
+++ b/redhat/docker/opensuse32.sh
@@ -1,9 +1,13 @@
#!/bin/bash -e
+if [ "$(whoami)" != "root" ]; then
+ sudo exec $0 $@
+fi
+
VERSION="$1" # E.g: '42.3'
if [ "${VERSION}" = "tumbleweed" ]; then
- URL="http://download.opensuse.org/tumbleweed"
+ URL="https://download.opensuse.org/ports/i586/tumbleweed"
NAME="opensuse32/tumbleweed"
else
URL="http://download.opensuse.org/distribution/leap/${VERSION}"
@@ -13,25 +17,38 @@ fi
IMAGE="${NAME}:latest"
INSTALLROOT="/dev/shm/${IMAGE}"
-sudo rm -rf "${INSTALLROOT}"
-sudo mkdir -p "${INSTALLROOT}"
+for dir in dev proc sys; do
+ if [ -d "${INSTALLROOT}/${dir}" ]; then
+ umount "${INSTALLROOT}/${dir}"
+ fi
+done
+
+rm -rf "${INSTALLROOT}"
+mkdir -p "${INSTALLROOT}"
-sudo zypper --root "${INSTALLROOT}" \
+for dir in dev proc sys; do
+ mkdir -p "${INSTALLROOT}/${dir}"
+ mount --bind "/${dir}" "${INSTALLROOT}/${dir}"
+done
+
+zypper --root "${INSTALLROOT}" \
ar "${URL}/repo/oss/" "oss"
-sudo zypper --root "${INSTALLROOT}" \
+zypper --root "${INSTALLROOT}" \
ar "${URL}/repo/non-oss/" "non-oss"
if [ "${VERSION}" != "tumbleweed" ]; then
- sudo zypper --root "${INSTALLROOT}" \
+ zypper --root "${INSTALLROOT}" \
ar "http://download.opensuse.org/update/leap/${VERSION}/oss/" "update-oss"
- sudo zypper --root "${INSTALLROOT}" \
+ zypper --root "${INSTALLROOT}" \
ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss"
fi
-sudo zypper --root "${INSTALLROOT}" \
+zypper --root "${INSTALLROOT}" \
--gpg-auto-import-keys ref
-sudo setarch i686 zypper --root "${INSTALLROOT}" \
+setarch i686 zypper --root "${INSTALLROOT}" \
install --download-only -y \
bash \
+ ca-certificates \
+ curl \
docbook-utils \
filesystem \
gawk \
@@ -47,16 +64,23 @@ sudo setarch i686 zypper --root "${INSTALLROOT}" \
xz \
zlib \
zypper
-sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm"
+rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm"
+
+chroot "${INSTALLROOT}" rpmdb --rebuilddb
+
+for dir in dev proc sys; do
+ umount "${INSTALLROOT}/${dir}"
+done
-sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb
+rm -rfv "${INSTALLROOT}/var/cache/zypp/packages/"*
FILE="${IMAGE//\//_}.tar"
-sudo tar -C "${INSTALLROOT}" -c . >"${FILE}"
-sudo rm -rf "${INSTALLROOT}"
+tar -C "${INSTALLROOT}" -c . >"${FILE}"
+rm -rf "${INSTALLROOT}"
docker rmi -f "${IMAGE}"
docker import "${FILE}" "${IMAGE}"
pigz "${FILE}"
-mv -fv "${FILE}.gz" "${HOME}/tde/docker"
+mkdir -p "/home/${SUDO_USER}/tde/docker"
+mv -fv "${FILE}.gz" "/home/${SUDO_USER}/tde/docker"
diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64
index 69f9fdbe2..5ebc69ac7 100644
--- a/redhat/docker/oss131/Dockerfile.x86_64
+++ b/redhat/docker/oss131/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM opensuse:13.1
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64
index 292e7303a..f80f0aaa0 100644
--- a/redhat/docker/oss132/Dockerfile.x86_64
+++ b/redhat/docker/oss132/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM opensuse:13.2
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64
index a1d56c0b6..8bbccfb44 100644
--- a/redhat/docker/oss150/Dockerfile.x86_64
+++ b/redhat/docker/oss150/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM opensuse/leap:15.0
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64
index c3a341c78..be2e75b61 100644
--- a/redhat/docker/oss151/Dockerfile.x86_64
+++ b/redhat/docker/oss151/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM opensuse/leap:15.1
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64
index 57da91765..fd2294119 100644
--- a/redhat/docker/oss152/Dockerfile.x86_64
+++ b/redhat/docker/oss152/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM opensuse/leap:15.2
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages
index 0fd341899..ec21f7f6b 100644
--- a/redhat/docker/oss152/packages
+++ b/redhat/docker/oss152/packages
@@ -163,8 +163,8 @@ perl-PAR-Packer
perl-pcsc
pkcs11-helper-devel
pkgconfig(pygtk-2.0)
-postgresql10
-postgresql10-devel
+postgresql
+postgresql-devel
python-devel
python3-devel
python-sip-devel
diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64
index cf1d2e93d..d2e770b22 100644
--- a/redhat/docker/oss153/Dockerfile.x86_64
+++ b/redhat/docker/oss153/Dockerfile.x86_64
@@ -1,16 +1,17 @@
FROM opensuse/leap:15.3
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
# Install Trinity build dependencies
COPY packages /packages
-RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
&& echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
&& zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.3/ packman \
&& zypper refresh \
- && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64.rpm https://ftp.lysator.liu.se/pub/opensuse/distribution/leap/15.3/repo/oss/x86_64/libudisks2-0-devel-2.8.1-1.39.x86_64.rpm \
+ && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64 \
&& zypper -n update \
&& zypper -n install -l $(</packages)
@@ -26,3 +27,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
&& mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Install heimdal development files
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/libheimdal-7.7.0-bp153.1.19.src.rpm \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz" \
+ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \
+ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
+ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install
diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages
index 78c263029..1b18b1d8b 100644
--- a/redhat/docker/oss153/packages
+++ b/redhat/docker/oss153/packages
@@ -21,13 +21,14 @@ clucene-core-devel
cmake
createrepo
cups-devel
+curl
cyrus-sasl-devel
dbus-1-devel
dbus-1-glib-devel
djvulibre
+docbook2x
docbook-utils
docbook-xsl-stylesheets
-docbook2x
doxygen GraphicsMagick
dssi-devel
fdupes
@@ -36,6 +37,7 @@ fftw3-devel
file-devel
flac-devel
flex
+font-util
freetype-devel
fribidi-devel
gamin-devel
@@ -43,15 +45,15 @@ gcc-c++
giflib-devel
git
glu-devel
-gmime-devel
gmime2_6-devel
+gmime-devel
gmp-devel
gperf xmlto
GraphicsMagick-devel
gsl-devel
gstreamer-devel
-gstreamer-plugins-base-devel
gstreamer-devel
+gstreamer-plugins-base-devel
gtk2-devel
gtk3-devel
gtk-doc
@@ -60,6 +62,7 @@ html2ps
hunspell-devel
iceauth
ImageMagick-devel
+imake
imlib2-devel
intltool
java-1_8_0-openjdk-devel
@@ -83,6 +86,7 @@ libdb-4_8-devel
libdvdread-devel
libexempi-devel
libexiv2-devel
+libfontenc-devel
libgadu-devel
libGeoIP-devel
libgpgme-devel
@@ -90,6 +94,7 @@ libgphoto2-devel
libgpod-devel
libgssglue-devel
libical-devel
+libICE-devel
libidn-devel
libiw-devel
libjack-devel
@@ -121,7 +126,9 @@ librsvg-devel
libsamplerate-devel
libSDL-devel
libsmbclient-devel
+libSM-devel
libsndfile-devel
+libssh-devel
libtag-devel
libtheora-devel
libtiff-devel
@@ -135,8 +142,17 @@ libvisual-devel
libvorbis-devel
libwmf-devel
libwpd-devel
+libXaw-devel
+libXdmcp-devel
libxine-devel
+libxkbfile-devel
+libXmu-devel
+libXScrnSaver-devel
libxslt-devel
+libXt-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
libyaz-devel
libzrtpcpp-devel
lirc-devel
@@ -160,19 +176,23 @@ patch
pciutils-devel
pcre-devel
pcsc-lite-devel
+perl-JSON
perl-PAR-Packer
perl-pcsc
pkcs11-helper-devel
pkgconfig(pygtk-2.0)
-postgresql10
-python-devel
+polkit-devel
+postgresql
+postgresql-server-devel
python3-devel
python3-sip-devel
+python-devel
recode
rpcgen
rpm-build
rpmlint
rsvg-convert
+rsync
ruby
ruby-devel
sane-backends-devel
@@ -183,6 +203,7 @@ subversion-devel
sudo
swig
sword-devel
+texinfo
torsocks
transfig
unixODBC-devel
diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64
index b2bd08902..8285a64f0 100644
--- a/redhat/docker/oss154/Dockerfile.x86_64
+++ b/redhat/docker/oss154/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM opensuse/leap:15.4
-ARG TDE_VERSION=14.0.12
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
@@ -9,10 +9,8 @@ COPY packages /packages
RUN set -x \
&& echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
&& echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
- && rm -fv /etc/zypp/repos.d/repo-sle-* \
&& zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \
- && zypper refresh \
- && zypper -n remove libjpeg62-devel \
+ && zypper -n refresh \
&& zypper -n update \
&& zypper -n install -l $(</packages)
@@ -30,3 +28,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
&& mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Install heimdal development files
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.4/repo/oss/src/libheimdal-7.7.0-bp154.1.43.src.rpm \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz" \
+ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \
+ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
+ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install
diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages
index 68265c8db..0eeaa3da6 100644
--- a/redhat/docker/oss154/packages
+++ b/redhat/docker/oss154/packages
@@ -20,6 +20,7 @@ clucene-core-devel
cmake
createrepo_c
cups-devel
+curl
cyrus-sasl-devel
dbus-1-devel
dbus-1-glib-devel
@@ -126,6 +127,7 @@ libSDL-devel
libSM-devel
libsmbclient-devel
libsndfile-devel
+libssh-devel
libtag-devel
libtheora-devel
libtiff-devel
@@ -175,12 +177,14 @@ patch
pciutils-devel
pcre-devel
pcsc-lite-devel
+perl(JSON)
perl-PAR-Packer
perl-pcsc
pkcs11-helper-devel
polkit-devel
-postgresql10
-postgresql10-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
python3-devel
python3-sip-devel
recode
@@ -198,6 +202,7 @@ subversion-devel
sudo
swig
sword-devel
+texinfo
torsocks
transfig
unixODBC-devel
@@ -206,6 +211,7 @@ usbutils
utempter-devel
valgrind
vim
+wget
wireless-tools
wv2-devel
xbase-devel
diff --git a/redhat/docker/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64
new file mode 100644
index 000000000..394650a12
--- /dev/null
+++ b/redhat/docker/oss155/Dockerfile.x86_64
@@ -0,0 +1,38 @@
+FROM opensuse/leap:15.5
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+ && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.5/ packman \
+ && zypper -n refresh \
+ && zypper -n update \
+ && zypper -n install -l $(</packages)
+
+RUN ln -sfv python3.6m /usr/include/python3.6 \
+ && ln -sfv python3 /usr/bin/python
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Install heimdal development files
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.5/repo/oss/src/libheimdal-7.8.0-bp155.2.7.src.rpm \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
+ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
+ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
+ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
diff --git a/redhat/docker/oss155/packages b/redhat/docker/oss155/packages
new file mode 100644
index 000000000..3d3897e5b
--- /dev/null
+++ b/redhat/docker/oss155/packages
@@ -0,0 +1,225 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+binutils-devel
+bison
+brp-check-suse
+brp-extract-appdata
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+createrepo_c
+cups-devel
+curl
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+docbook2x
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+font-util
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+git
+glu-devel
+gmime-devel
+gmime2_6-devel
+gmp-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+less
+libacl-devel
+libao-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libboost_python-py3-1_66_0-devel
+libboost_system1_66_0-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libfontenc-devel
+libgadu-devel
+libGeoIP-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libICE-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjpeg8-devel
+liblcms2-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libSM-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev1
+libudisks2-0-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXdmcp-devel
+libxine-devel
+libxkbfile-devel
+libXpm-devel
+libXmu-devel
+libXScrnSaver-devel
+libxslt-devel
+libXt-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl(JSON)
+perl-PAR-Packer
+perl-pcsc
+pkcs11-helper-devel
+polkit-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
+ppp
+python3-devel
+python3-sip-devel
+recode
+rpcgen
+rpm-build
+rpmlint
+rsvg-convert
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+systemd-sysvinit
+texinfo
+torsocks
+transfig
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+vim
+wget
+wireless-tools
+wv2-devel
+xbase-devel
+xcb-proto-devel
+xorg-x11
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
diff --git a/redhat/docker/oss155/rpmmacros b/redhat/docker/oss155/rpmmacros
new file mode 100644
index 000000000..7fe3f58e6
--- /dev/null
+++ b/redhat/docker/oss155/rpmmacros
@@ -0,0 +1,7 @@
+%dist .oss155
+%_smp_mflags -j8
+%jobs 8
+%sle_version 150500
+%_build_insert_debug_package %nil
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/oss156/Dockerfile.x86_64 b/redhat/docker/oss156/Dockerfile.x86_64
new file mode 100644
index 000000000..a41198e38
--- /dev/null
+++ b/redhat/docker/oss156/Dockerfile.x86_64
@@ -0,0 +1,41 @@
+FROM opensuse/leap:15.6
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+ && echo HTTP_PROXY="http://proxy.vtf:3128/" >>/etc/sysconfig/proxy \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.6/ packman \
+ && zypper -n refresh \
+ && zypper -n update \
+ && zypper -n install -l $(</packages)
+
+RUN ln -sfv python3.6m /usr/include/python3.6
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+RUN rpm -Uvh http://download.opensuse.org/source/distribution/leap/15.5/repo/oss/src/perl-PAR-Packer-1.057-bp155.1.4.src.rpm \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
+ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer"*".rpm"
+
+# Install heimdal development files
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/libheimdal-7.8.0-bp156.4.4.src.rpm \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
+ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
+ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
+ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
diff --git a/redhat/docker/oss156/packages b/redhat/docker/oss156/packages
new file mode 100644
index 000000000..cb0acc404
--- /dev/null
+++ b/redhat/docker/oss156/packages
@@ -0,0 +1,231 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+binutils-devel
+bison
+brp-check-suse
+brp-extract-appdata
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+createrepo_c
+cups-devel
+curl
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+docbook2x
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+font-util
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+git
+glu-devel
+gmime-devel
+gmime2_6-devel
+gmp-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+less
+libacl-devel
+libao-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libboost_python-py3-1_66_0-devel
+libboost_system1_66_0-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libfontenc-devel
+libgadu-devel
+libGeoIP-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libICE-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjpeg8-devel
+liblcms2-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libSM-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev1
+libudisks2-0-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXdmcp-devel
+libxine-devel
+libxkbfile-devel
+libXpm-devel
+libXmu-devel
+libXScrnSaver-devel
+libxslt-devel
+libXt-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl(Archive::Zip)
+perl(Getopt::ArgvFile)
+perl(IPC::Run3)
+perl(JSON)
+perl(Module::ScanDeps)
+perl(PAR)
+perl(PAR::Dist)
+perl-macros
+perl-pcsc
+pkcs11-helper-devel
+polkit-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
+ppp
+python3-devel
+python3-sip-devel
+recode
+rpcgen
+rpm-build
+rpmlint
+rsvg-convert
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+systemd-sysvinit
+texinfo
+torsocks
+transfig
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+vim
+wget
+wireless-tools
+wv2-devel
+xbase-devel
+xcb-proto-devel
+xorg-x11
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
diff --git a/redhat/docker/oss156/rpmmacros b/redhat/docker/oss156/rpmmacros
new file mode 100644
index 000000000..f34912d6c
--- /dev/null
+++ b/redhat/docker/oss156/rpmmacros
@@ -0,0 +1,7 @@
+%dist .oss156
+%_smp_mflags -j8
+%jobs 8
+%sle_version 150600
+%_build_insert_debug_package %nil
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64
index 72102ab0c..47b0054bd 100644
--- a/redhat/docker/oss421/Dockerfile.x86_64
+++ b/redhat/docker/oss421/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM opensuse:42.1
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64
index d2c6b2d2e..640c56f42 100644
--- a/redhat/docker/oss422/Dockerfile.x86_64
+++ b/redhat/docker/oss422/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM opensuse:42.2
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64
index fc33ddfd6..8da0fffe3 100644
--- a/redhat/docker/oss423/Dockerfile.x86_64
+++ b/redhat/docker/oss423/Dockerfile.x86_64
@@ -1,6 +1,6 @@
FROM opensuse:42.3
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index b286049c6..19aa7b6f4 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -1,24 +1,21 @@
FROM opensuse32/tumbleweed:latest
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=i686
# Add PACKMAN repository
COPY packages /packages
-RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
- && zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \
+RUN set -x \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
&& setarch ${ARCH} zypper -n refresh \
- && setarch ${ARCH} zypper -n dup \
&& setarch ${ARCH} zypper -n update \
+ && setarch ${ARCH} zypper -n dup \
&& setarch ${ARCH} zypper -n install --allow-vendor-change $(</packages)
# Add non-root user to build packages
-RUN useradd -m -s /bin/bash -u 1000 trinity \
+RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-# Fix postgresql
-RUN ln -sfv /usr/lib/postgresql10/bin/pg_config /usr/bin/pg_config
-
USER trinity
COPY rpmmacros /home/trinity/.rpmmacros
@@ -28,11 +25,15 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
-# Add GeoIP
-RUN setarch ${ARCH} rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
+# Install heimdal development files
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
+ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
+ && setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
+ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
# Add lilypond (i686 only)
-#RUN rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.6.src.rpm \
-# && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
-# && setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.5.src.rpm \
+ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
+ && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \
+ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm"
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index d708590cd..50ac34c5b 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -1,19 +1,19 @@
FROM opensuse/tumbleweed:latest
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Add PACKMAN repository
COPY packages /packages
-RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
+RUN set -x \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
&& zypper -n refresh \
- && zypper -n install busybox perl shadow \
&& zypper -n dup \
&& zypper -n update \
- && zypper -n install $(</packages)
+ && zypper -n install --allow-vendor-change $(</packages)
# Add non-root user to build packages
-RUN useradd -m -s /bin/bash -u 1000 trinity \
+RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
USER trinity
@@ -25,6 +25,11 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
&& sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
-# Add GeoIP
-RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
+# Install heimdal development files
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
+ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
+ && export ac_cv_sys_large_files=no \
+ && export ac_cv_sys_file_offset_bits=no \
+ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
+ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 184e75ae2..7032cacde 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -9,7 +9,6 @@ bison
bluez-devel
boost-devel
brp-check-suse
-brp-extract-appdata
ccache
cdparanoia
cdparanoia-devel
@@ -34,11 +33,13 @@ docbook-xsl-stylesheets
doxygen GraphicsMagick
docbook2x
dssi-devel
+extractpdfmark
fdupes
ffmpeg-4-libavcodec-devel
ffmpeg-4-libavdevice-devel
fftw3-devel
file-devel
+findutils
flac-devel
flex
font-util
@@ -96,6 +97,7 @@ libical-devel
libidn-devel
libiw-devel
libjack-devel
+libjasper7
libjasper-devel
liblcms2-devel
liblo-devel
@@ -126,6 +128,7 @@ libSDL-devel
libsensors4-devel
libsmbclient-devel
libsndfile-devel
+libssh-devel
libtag-devel
libtheora-devel
libtiff-devel
@@ -156,6 +159,7 @@ libyaz-devel
lirc-devel
make
makeinfo
+mc
meanwhile-devel
Mesa-devel
Mesa-libGL-devel
@@ -176,13 +180,17 @@ patch
pciutils-devel
pcre-devel
pcsc-lite-devel
+perl-JSON
perl-PAR-Packer
perl-pcsc
pkcs11-helper-devel
+pkgconfig(bdw-gc)
pkgconfig(guile-1.8)
+pkgconfig(guile-3.0)
polkit-devel
-postgresql10
-postgresql10-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
potrace-devel
ppp
python-devel
@@ -198,6 +206,7 @@ ruby
ruby-devel
sane-backends-devel
scons
+shadow
speex-devel
sqlite3-devel
subversion-devel
@@ -228,6 +237,7 @@ usbutils
utempter-devel
valgrind
vim
+wget
wireless-tools
wv2-devel
xcb-proto-devel
diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros
index cb1ceaa06..37788e61e 100644
--- a/redhat/docker/osstw/rpmmacros
+++ b/redhat/docker/osstw/rpmmacros
@@ -1,4 +1,5 @@
%dist .osstw
%_smp_mflags -j8
%jobs 8
-%__python %__python2
+%python python3
+%__python %__python3
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index 30bb665db..504e271c8 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -22,13 +22,13 @@ gawk
gcrypt
gdk-pixbuf2.0
glibc
-glibc-devel
gnupg
gnutls
grep
gzip
icu
icu69-data
+icu71-data
info-install
kernel-userspace-headers
krb5
@@ -39,7 +39,6 @@ lib64apt-pkg0
lib64assuan0
lib64attr1
lib64audit1
-lib64audit-devel
lib64blkid1
lib64brotlicommon1
lib64brotlidec1
@@ -50,6 +49,7 @@ lib64cdio12
lib64crack2
lib64curl4
lib64db4.8
+lib64db5.3
lib64dbnss4.8
lib64elfutils1
lib64ev4
@@ -69,8 +69,12 @@ lib64glib2.0_0
lib64gmp10
lib64gnutls30
lib64gpg-error0
+libgpg-error-common
+lib64gsasl
lib64gudev1.0_0
lib64icu69
+lib64icu71
+lib64idn11
lib64idn2_0
lib64intl8
lib64iso9660_7
@@ -84,8 +88,10 @@ lib64ksba8
lib64ldap2.4_2
lib64cap-ng0
lib64lua5.1
+lib64lua5.2
lib64lzma5
lib64magic1
+lib64mnl0
lib64mount1
lib64mpfr6
lib64ncurses5
@@ -97,11 +103,11 @@ lib64notify4
lib64npth0
lib64nspr4
lib64nss3
+lib64ntlm
lib64openssl1.0.0
lib64openssl1.1.0
lib64opts25
lib64pam0
-lib64pam-devel
lib64pam_userpass1
lib64pcre1
lib64pcre2_0
@@ -110,13 +116,15 @@ lib64png16_16
lib64png3
lib64popt0
lib64psl5
-lib64python3.6
+lib64python3.10
lib64readline7
lib64readline8
lib64rpm1
lib64rtmp1
lib64sasl2
lib64secret1_0
+lib64selinux
+lib64sharpyuv0
lib64sigsegv2
lib64smartcols1
lib64sqlite3_0
@@ -127,6 +135,7 @@ lib64tiff3
lib64tiff5
lib64tirpc3
lib64udev0
+lib64udev
lib64unbound8
lib64unistring2
lib64usb1.0_0
@@ -137,16 +146,17 @@ lib64webp7
lib64x11_6
lib64xau6
lib64xcrypt1
-lib64xcrypt-devel
lib64xdmcp6
lib64xml2_2
lib64zstd1
libgcc1
+libgomp1
libidn2-i18n
libnotify
libstdc++6
libtirpc
libxcb
+lsb-release
makedev
mktemp
multiarch-utils
@@ -158,6 +168,7 @@ openssl
p11-kit
pam
pam_tcb
+patch
perl
perl-base
perl-File-Sync
@@ -169,6 +180,7 @@ popt-data
procps
publicsuffix-list-dafsa
python3
+python3-rpm-macros
rmt
rootcerts
rpm
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index cd7689569..42ab539cc 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -1,7 +1,7 @@
#!/bin/bash -ex
NAME="pclinuxos"
-VERSION="${1:-2021}" # E.g: '2020'
+VERSION="${1:-2024}" # E.g: '2020'
IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}"
@@ -29,19 +29,17 @@ sudo mount --bind "/dev" "${INSTALLROOT}/dev"
sudo mkdir -p "${INSTALLROOT}/var/lib/rpm"
sudo rpmdb --initdb --root="${INSTALLROOT}"
-sudo rpm -Uvh --noscripts --root="${INSTALLROOT}" "/dev/shm/packages/"*".rpm"
-
-# Fix lzma library location
-sudo mv "${INSTALLROOT}/lib/liblzma."* "${INSTALLROOT}/lib64"
+sudo rpm -Uvh --noscripts --nodeps --root="${INSTALLROOT}" "/dev/shm/packages/"*".rpm"
# Réinstall distro from inside chroot
sudo mount --bind "/dev/shm" "${INSTALLROOT}/dev/shm"
sudo rm -rf "${INSTALLROOT}/var/lib/rpm"
sudo chroot "${INSTALLROOT}" rpmdb --initdb
-sudo chroot "${INSTALLROOT}" rpm -Uvh "/dev/shm/packages/"*".rpm"
+sudo chroot "${INSTALLROOT}" rpm -Uvh --nodeps "/dev/shm/packages/"*".rpm"
sudo cp "/etc/resolv.conf" "${INSTALLROOT}/etc/resolv.conf"
sudo chroot "${INSTALLROOT}" apt-get -y update
+sudo chroot "${INSTALLROOT}" apt-get -y --fix-broken install
sudo chroot "${INSTALLROOT}" apt-get -y upgrade
sudo umount "${INSTALLROOT}/dev/shm"
@@ -52,7 +50,4 @@ sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}"
docker run -ti --rm "${IMAGE}" ls -l
sudo rm -rf "${INSTALLROOT}"
-docker image save "${IMAGE}" >"${IMAGE}.tar"
-rm -f "${IMAGE}.tar.gz"
-pigz -9 "${IMAGE}.tar"
-mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs"
+docker image save "${IMAGE}" | pigz -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz"
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index f3d5ac938..1d92b8a8a 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,13 +1,13 @@
-FROM pclinuxos:2021
+FROM pclinuxos:2024
-ARG TDE_VERSION=14.1.0
+ARG TDE_VERSION=14.1.2
ARG ARCH=x86_64
# Update distribution
# Install Trinity build dependencies
COPY packages.${ARCH} /packages
-RUN apt-get -y update \
- && apt-get -y install glibc \
+RUN set -x \
+ && apt-get -y update \
&& apt-get -y dist-upgrade \
&& apt-get -y install $(</packages)
@@ -27,7 +27,6 @@ RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \
&& genla.sh libjpeg \
&& genla.sh liblcms \
&& genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
- && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so
# Add non-root user to build packages
RUN rm -rf /home/trinity \
@@ -56,3 +55,8 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm
+
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/updates/heimdal-7.7.1-1.3.mga8.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \
+ && echo sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index 3135b2a39..d34407ee8 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -13,6 +13,7 @@ clamav
clamav-devel
cmake
cups-devel
+dbus-glib-devel
desktop-file-utils
djvulibre
docbook-style-xsl
@@ -33,6 +34,7 @@ gamin-devel
gcc-c++
gettext-devel
glib2-devel
+gnokii-devel
gnutls-devel
gpgme-devel
gphoto2-devel
@@ -52,10 +54,10 @@ java-sun
lcms-devel
lib64clucene2-devel
lib64cryptsetup-devel
-lib64db4.8-devel
lib64dvdread-devel
lib64exiv2-devel
lib64fbclient-devel
+lib64ffmpeg-devel
lib64geoip-devel
lib64gif-devel
lib64gpod4
@@ -65,6 +67,7 @@ lib64gstreamer-plugins-base1.0-devel
lib64idn-devel
lib64inotifytools-devel
lib64iw29-devel
+lib64jack-devel
lib64nm-devel
lib64mpcdec-devel
lib64OpenSP5-devel
@@ -75,6 +78,7 @@ lib64poppler-devel
lib64readline-devel
lib64sane1-devel
lib64sndfile-devel
+lib64ssh-devel
lib64unwind-devel
lib64usb1.0-devel
lib64usb-compat0.1-devel
@@ -83,12 +87,12 @@ lib64xaw-devel
lib64xine1.2-devel
lib64xtst-devel
lib64yaz-devel
+libattr-devel
libcap-devel
libcdda-devel
libcln-devel
libconfig-devel
libcurl-devel
-libffmpeg-devel
libflac-devel
libflac++-devel
libfontenc-devel
@@ -158,21 +162,24 @@ net-snmp-devel
ocaml
OpenEXR-devel
openldap-devel
+openldap-servers
opensc
openslp-devel
pam-devel
+pcre-devel
perl-devel
perl-Image-Magick
perl-PAR-Packer
perl-pcsc-perl
pilot-link-devel
pkgconfig(pygtk-2.0)
+popt-devel
postgresql
postgresql-devel
ppp
pth-devel
python3
-python-devel
+python3-devel
python-rpm
qt4-devel
recode
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index a8b78eb0d..5c9fcc2e4 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -3,3 +3,5 @@
%jobs 8
%pclinuxos 2022
%configure %configure2_5x
+%python python3
+%__python /usr/bin/python3
diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh
index 028dfc578..bb626a9cc 100755
--- a/redhat/docker/pull.sh
+++ b/redhat/docker/pull.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
TDE_VERSION="$2"
ARCH="$3"
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2"
[ -z "${ARCH}" ] && ARCH="x86_64"
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh
index 9bed4159a..c5f8fb873 100755
--- a/redhat/docker/push.sh
+++ b/redhat/docker/push.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
TDE_VERSION="$2"
ARCH="$3"
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2"
[ -z "${ARCH}" ] && ARCH="x86_64"
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh
index 4e3b51673..2773f64ce 100755
--- a/redhat/docker/remove.sh
+++ b/redhat/docker/remove.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
TDE_VERSION="$2"
ARCH="$3"
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2"
[ -z "${ARCH}" ] && ARCH="x86_64"
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh
index 974e21ead..5a59db78c 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -4,12 +4,13 @@ DISTRIB="$1"
TDE_VERSION="$2"
ARCH="$3"
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2"
[ -z "${ARCH}" ] && ARCH="x86_64"
[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
DIST="$(sed -n ${DISTRIB}/rpmmacros -e "/%dist/ s|.* ||p")"
+if [ "${DIST}" = "%nil" ]; then DIST=".${DISTRIB}"; fi
mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}"
mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
@@ -18,6 +19,7 @@ chmod 777 "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbui
case "${TDE_VERSION}" in
"14.0."*) TDE_BRANCH="r14.0.x";;
+ "14.1."*) TDE_BRANCH="r14.1.x";;
*) TDE_BRANCH="master";;
esac
@@ -31,10 +33,12 @@ ${DOCKER} run -ti --rm \
-e TMPPATH=/tmp \
-e TDE_VERSION=${TDE_VERSION} \
-e TDE_BRANCH=${TDE_BRANCH} \
- -w /home/trinity/tde/${TDE_BRANCH}/tde-packaging/redhat \
+ -w /home/trinity/tde/${TDE_BRANCH}/tde/packaging/redhat \
-v ${HOME}/.gnupg:/home/trinity/.gnupg \
+ -v ${HOME}/tde/3rdparty:/home/trinity/tde/3rdparty \
-v ${HOME}/tde/master:/home/trinity/tde/master \
-v ${HOME}/tde/r14.0.x:/home/trinity/tde/r14.0.x \
+ -v ${HOME}/tde/r14.1.x:/home/trinity/tde/r14.1.x \
-v ${HOME}/tde/patches:/home/trinity/tde/patches \
-v ${HOME}/tde/tarballs:/home/trinity/tde/tarballs \
-v ${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}:/home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION} \
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index 174391037..31e63ef48 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -17,7 +17,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_prefix /opt/trinity
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 2470b3412..a03d6bd5f 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -67,7 +67,7 @@ This utility was originally written for openSUSE KDE3.
%prep
%setup -q -n fileshareset2
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "." || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "." || %__cp -f "/usr/share/libtool/ltmain.sh" "."
aclocal
autoconf
automake -a -c
@@ -97,7 +97,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
# Rename binary to avoid conflict with kde3
mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2"
-ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist"
+ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist"
%clean
diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec
index a2a42e6c6..f1a779fc9 100644
--- a/redhat/extras/htdig/htdig.spec
+++ b/redhat/extras/htdig/htdig.spec
@@ -1,17 +1,29 @@
%define _disable_ld_as_needed 1
%define _disable_ld_no_undefined 1
+%if 0%{?mdkver} >= 5000000
+%global __cc /usr/bin/gcc
+%global __cxx /usr/bin/g++
+%global prefer_gcc 1
+%endif
+
%define contentdir /var/www
Summary: A web indexing and searching system for a small domain or intranet
Name: htdig
-Version: 3.2.0b7
+Version: 3.2.0b6_19
Release: 1%{?dist}
License: GPL
Group: Networking/WWW
URL: http://www.htdig.org/
-Source0: htdig-3.2.0b7.tar.gz
+Source0: htdig_3.2.0b6.orig.tar.gz
+
+Patch1: patches/htdig_3.2.0b6-13.diff
+Patch2: patches/gcc-6
+Patch3: patches/sourceforge_logo
+Patch4: patches/drop-bogus-assignment
+Patch5: patches/gcc-11
BuildRequires: flex >= 2.5.4a-13
BuildRequires: libtool
@@ -20,6 +32,9 @@ BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-buildroot
+Provides: group(htdig)
+Provides: user(htdig)
+
%description
The ht://Dig system is a complete world wide web indexing and searching system
for a small domain or intranet. This system is not meant to replace the need
@@ -99,10 +114,10 @@ Libraries needed to develop for htdig.
%defattr(-,root,root)
%doc ChangeLog
%doc htdoc/*
-%{_libdir}/htdig/*.a
+#%{_libdir}/htdig/*.a
%{_libdir}/htdig/*.la
%{_libdir}/htdig/*[a-z].so
-%{_libdir}/htdig_db/*.a
+#%{_libdir}/htdig_db/*.a
%{_libdir}/htdig_db/*.la
%{_libdir}/htdig_db/*[a-z].so
%{_includedir}/*
@@ -172,7 +187,12 @@ fi
##########
%prep
-%setup -q
+%setup -q -n htdig-3.2.0b6
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
autoreconf -fiv
@@ -193,6 +213,10 @@ autoreconf -fiv
--with-apache=/usr/sbin/httpd \
--with-zlib=%{_prefix}
+%if 0%{?fedora} == 40
+echo "#define HAVE_SHMGET 1" >>"db/db_config.h"
+%endif
+
%__make %{?_smp_mflags}
mv htdoc/ChangeLog .
diff --git a/redhat/extras/htdig/patches/drop-bogus-assignment b/redhat/extras/htdig/patches/drop-bogus-assignment
new file mode 100644
index 000000000..2328280e3
--- /dev/null
+++ b/redhat/extras/htdig/patches/drop-bogus-assignment
@@ -0,0 +1,16 @@
+--- htdig-3.2.0b6.orig/htdig/Parsable.cc
++++ htdig-3.2.0b6/htdig/Parsable.cc
+@@ -74,7 +74,6 @@ Parsable::addString(Retriever& retriever
+ retriever.got_word(w, wordindex++, slot); // slot for img_alt
+ w = HtWordToken(0);
+ }
+- w = '\0';
+ }
+
+ //*****************************************************************************
+@@ -92,5 +91,4 @@ Parsable::addKeywordString(Retriever& re
+ retriever.got_word(w, wordindex++, 9);
+ w = HtWordToken(0);
+ }
+- w = '\0';
+ }
diff --git a/redhat/extras/htdig/patches/gcc-11 b/redhat/extras/htdig/patches/gcc-11
new file mode 100644
index 000000000..09c974cea
--- /dev/null
+++ b/redhat/extras/htdig/patches/gcc-11
@@ -0,0 +1,370 @@
+Index: b/htword/WordBitCompress.cc
+===================================================================
+--- a/htword/WordBitCompress.cc
++++ b/htword/WordBitCompress.cc
+@@ -29,7 +29,7 @@
+ #include"WordBitCompress.h"
+
+ // ******** HtVector_byte (implementation)
+-#define GType byte
++#define GType byte_t
+ #define HtVectorGType HtVector_byte
+ #include "HtVectorGenericCode.h"
+
+@@ -424,13 +424,13 @@
+ // **************************************************
+
+ void
+-BitStream::put_zone(byte *vals,int n,const char *tag)
++BitStream::put_zone(byte_t *vals,int n,const char *tag)
+ {
+ add_tag(tag);
+ for(int i=0;i<(n+7)/8;i++){put_uint(vals[i],TMin(8,n-8*i),NULL);}
+ }
+ void
+-BitStream::get_zone(byte *vals,int n,const char *tag)
++BitStream::get_zone(byte_t *vals,int n,const char *tag)
+ {
+ check_tag(tag);
+ for(int i=0;i<(n+7)/8;i++){vals[i]=get_uint(TMin(8,n-8*i));}
+@@ -699,16 +699,16 @@
+ if(all){printf("\n");}
+
+ }
+-byte *
++byte_t *
+ BitStream::get_data()
+ {
+- byte *res=(byte *)malloc(buff.size());
++ byte_t *res=(byte_t *)malloc(buff.size());
+ CHECK_MEM(res);
+ for(int i=0;i<buff.size();i++){res[i]=buff[i];}
+ return(res);
+ }
+ void
+-BitStream::set_data(const byte *nbuff,int nbits)
++BitStream::set_data(const byte_t *nbuff,int nbits)
+ {
+ if(buff.size()!=1 || bitpos!=0)
+ {
+@@ -835,7 +835,7 @@
+
+
+ int
+-Compressor::put_fixedbitl(byte *vals,int n,const char *tag)
++Compressor::put_fixedbitl(byte_t *vals,int n,const char *tag)
+ {
+ int cpos=bitpos;
+ int i,j;
+@@ -844,19 +844,19 @@
+ put_uint_vl(n,NBITS_NVALS,"size");
+ if(n==0){return 0;}
+
+- byte maxv=vals[0];
++ byte_t maxv=vals[0];
+ for(i=1;i<n;i++)
+ {
+- byte v=vals[i];
++ byte_t v=vals[i];
+ if(v>maxv){maxv=v;}
+ }
+ int nbits=num_bits(maxv);
+- if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte *) : overflow: nvals>2^16");}
++ if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte_t *) : overflow: nvals>2^16");}
+ put_uint(nbits,NBITS_NBITS_CHARVAL,"nbits");
+ add_tag("data");
+ for(i=0;i<n;i++)
+ {
+- byte v=vals[i];
++ byte_t v=vals[i];
+ for(j=0;j<nbits;j++) {put(v&pow2(j));}
+ }
+ return(bitpos-cpos);
+@@ -887,15 +887,15 @@
+ }
+ }
+ int
+-Compressor::get_fixedbitl(byte **pres,const char *tag/*="BADTAG!"*/)
++Compressor::get_fixedbitl(byte_t **pres,const char *tag/*="BADTAG!"*/)
+ {
+- if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte *): check_tag failed");}
++ if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte_t *): check_tag failed");}
+ int n=get_uint_vl(NBITS_NVALS);
+ if(!n){*pres=NULL;return 0;}
+ int nbits=get_uint(NBITS_NBITS_CHARVAL);
+- if(verbose)printf("get_fixedbitl(byte):n%3d nbits:%2d\n",n,nbits);
++ if(verbose)printf("get_fixedbitl(byte_t):n%3d nbits:%2d\n",n,nbits);
+ int i;
+- byte *res=new byte[n];
++ byte_t *res=new byte_t[n];
+ CHECK_MEM(res);
+ for(i=0;i<n;i++)
+ {
+Index: b/htword/WordBitCompress.h
+===================================================================
+--- a/htword/WordBitCompress.h
++++ b/htword/WordBitCompress.h
+@@ -28,9 +28,9 @@
+ #include"HtVector_int.h"
+ #include"HtMaxMin.h"
+
+-typedef unsigned char byte;
++typedef unsigned char byte_t;
+ // ******** HtVector_byte (header)
+-#define GType byte
++#define GType byte_t
+ #define HtVectorGType HtVector_byte
+ #include "HtVectorGeneric.h"
+
+@@ -123,12 +123,12 @@
+ }
+
+ // gets a bit from the bitstream
+- inline byte get(const char *tag=(char*)NULL)
++ inline byte_t get(const char *tag=(char*)NULL)
+ {
+ // SPEED CRITICAL SECTION
+ if(check_tag(tag)==NOTOK){errr("BitStream::get() check_tag failed");}
+ if(bitpos>=(buff.size()<<3)){errr("BitStream::get reading past end of BitStream!");}
+- byte res=buff[bitpos>>3] & pow2(bitpos & 0x07);
++ byte_t res=buff[bitpos>>3] & pow2(bitpos & 0x07);
+ // printf("get:res:%d bitpos:%5d/%d buff[%3d]=%x\n",res,bitpos,bitpos%8,bitpos/8,buff[bitpos/8]);
+ bitpos++;
+ return(res);
+@@ -139,8 +139,8 @@
+ unsigned int get_uint( int n,const char *tag=(char*)NULL);
+
+ // get/put n bits of data stored in vals
+- void put_zone(byte *vals,int n,const char *tag);
+- void get_zone(byte *vals,int n,const char *tag);
++ void put_zone(byte_t *vals,int n,const char *tag);
++ void get_zone(byte_t *vals,int n,const char *tag);
+
+ //
+ inline void add_tag(const char *tag)
+@@ -167,9 +167,9 @@
+ int buffsize(){return(buff.size());}
+
+ // get a copy of the buffer
+- byte *get_data();
++ byte_t *get_data();
+ // set the buffer from outside data (current buffer must be empty)
+- void set_data(const byte *nbuff,int nbits);
++ void set_data(const byte_t *nbuff,int nbits);
+
+ // use this for reading a BitStream after you have written in it
+ // (generally for debuging)
+@@ -211,7 +211,7 @@
+ #define NBITS_VAL 32
+ // number of bits to code he number of bits used by an unsigned int value
+ #define NBITS_NBITS_VAL 5
+-// number of bits to code the number of bits used by a byte value
++// number of bits to code the number of bits used by a byte_t value
+ #define NBITS_NBITS_CHARVAL 4
+
+ class Compressor : public BitStream
+@@ -240,8 +240,8 @@
+ int get_vals(unsigned int **pres,const char *tag=(char*)"BADTAG!");
+
+ // compress/decompress an array of bytes (very simple)
+- int put_fixedbitl(byte *vals,int n,const char *tag);
+- int get_fixedbitl(byte **pres,const char *tag=(char*)"BADTAG!");
++ int put_fixedbitl(byte_t *vals,int n,const char *tag);
++ int get_fixedbitl(byte_t **pres,const char *tag=(char*)"BADTAG!");
+
+ // compress/decompress an array of unsigned ints (very simple)
+ void get_fixedbitl(unsigned int *res,int n);
+Index: b/htword/WordDBPage.cc
+===================================================================
+--- a/htword/WordDBPage.cc
++++ b/htword/WordDBPage.cc
+@@ -155,7 +155,7 @@
+ Uncompress_main(pin);
+ break;
+ case CMPRTYPE_BADCOMPRESS:// this page did not compress correctly
+- pin->get_zone((byte *)pg,pgsz*8,"INITIALBUFFER");
++ pin->get_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER");
+ break;
+ default:
+ errr("WordDBPage::Uncompress: CMPRTYPE incoherent");
+@@ -181,7 +181,7 @@
+ int *rnum_sizes=new int[nnums];
+ CHECK_MEM(rnum_sizes);
+ // char differences between words
+- byte *rworddiffs=NULL;
++ byte_t *rworddiffs=NULL;
+ int nrworddiffs;
+
+ // *********** read header
+@@ -288,7 +288,7 @@
+ return OK;
+ }
+ void
+-WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs)
++WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs)
+ {
+ int irwordiffs=0;
+ int nfields=WordKey::NFields();
+@@ -405,7 +405,7 @@
+
+ // display
+ void
+-WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs)
++WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs)
+ {
+ int i,j;
+ if(verbose)
+@@ -464,7 +464,7 @@
+ res->put_uint(COMPRESS_VERSION,NBITS_COMPRESS_VERSION,"COMPRESS_VERSION");
+ res->put_uint(CMPRTYPE_BADCOMPRESS,NBITS_CMPRTYPE,"CMPRTYPE");
+
+- res->put_zone((byte *)pg,pgsz*8,"INITIALBUFFER");
++ res->put_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER");
+ }
+
+ if(verbose)
+@@ -761,7 +761,7 @@
+ printf("compare failed in some unknown place in header:\n");
+ for(i=0;i<(int)(sizeof(PAGE)-sizeof(db_indx_t));i++)
+ {
+- printf("%3d: %3x %3x\n",i,((byte *)pg)[i],((byte *)other.pg)[i]);
++ printf("%3d: %3x %3x\n",i,((byte_t *)pg)[i],((byte_t *)other.pg)[i]);
+ }
+ }
+
+@@ -998,7 +998,7 @@
+ printf("%5d: ",nn);
+ for(j=0;j<20;j++)
+ {
+- printf("%2x ",((byte *)pg)[nn++]);
++ printf("%2x ",((byte_t *)pg)[nn++]);
+ if(nn>=pgsz){break;}
+ }
+ printf("\n");
+Index: b/htword/WordDBPage.h
+===================================================================
+--- a/htword/WordDBPage.h
++++ b/htword/WordDBPage.h
+@@ -65,7 +65,7 @@
+ }
+ }
+ WordDBRecord():WordRecord(){;}
+- WordDBRecord(byte *dat,int len,int rectyp):WordRecord()
++ WordDBRecord(byte_t *dat,int len,int rectyp):WordRecord()
+ {
+ type=(rectyp ? DefaultType() : WORD_RECORD_STATS);
+ Unpack(String((char *)dat,len));
+@@ -118,7 +118,7 @@
+ }
+ else{Unpack(String((char *)nkey->data,nkey->len));}
+ }
+- WordDBKey(byte *data,int len):WordKey()
++ WordDBKey(byte_t *data,int len):WordKey()
+ {
+ key=NULL;
+ if(!data || !len){errr("WordDBKey::WordDBKey(data,len) !data || !len");}
+@@ -207,7 +207,7 @@
+ void *alloc_entry(int size)
+ {
+ size=WORD_ALIGN_TO(size,4);
+- int inp_pos=((byte *)&(pg->inp[insert_indx]))-(byte *)pg;
++ int inp_pos=((byte_t *)&(pg->inp[insert_indx]))-(byte_t *)pg;
+ insert_pos-=size;
+ if(insert_pos<=inp_pos)
+ {
+@@ -216,7 +216,7 @@
+ errr("WordDBPage::alloc_entry: PAGE OVERFLOW");
+ }
+ pg->inp[insert_indx++]=insert_pos;
+- return((void *)((byte *)pg+insert_pos));
++ return((void *)((byte_t *)pg+insert_pos));
+ }
+
+
+@@ -260,11 +260,11 @@
+ ky.Pack(pkey);
+ keylen=pkey.length();
+ }
+- int size=keylen+((byte *)&(bti.data))-((byte *)&bti);// pos of data field in BINTERNAL
++ int size=keylen+((byte_t *)&(bti.data))-((byte_t *)&bti);// pos of data field in BINTERNAL
+ if(empty)
+ {
+ if(verbose){printf("WordDBPage::insert_btikey: empty : BINTERNAL:%d datapos:%d keylen:%d size:%d alligned to:%d\n",(int)sizeof(BINTERNAL),
+- (int)(((byte *)&(bti.data))-((byte *)&bti)),
++ (int)(((byte_t *)&(bti.data))-((byte_t *)&bti)),
+ keylen,size,WORD_ALIGN_TO(size,4));}
+ }
+
+@@ -306,8 +306,8 @@
+ int Uncompress_main(Compressor *pin);
+ void Uncompress_vals_chaged_flags(Compressor &in,unsigned int **pcflags,int *pn);
+ int Uncompress_header(Compressor &in);
+- void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs);
+- void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs);
++ void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs);
++ void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs);
+
+ int TestCompress(int debuglevel);
+ int Compare(WordDBPage &other);
+@@ -326,14 +326,14 @@
+ out.put_uint(btikey(i)->type ,sizeof(btikey(i)->type )*8,label_str("seperatekey_bti_type" ,i));
+ out.put_uint(btikey(i)->pgno ,sizeof(btikey(i)->pgno )*8,label_str("seperatekey_bti_pgno" ,i));
+ out.put_uint(btikey(i)->nrecs,sizeof(btikey(i)->nrecs)*8,label_str("seperatekey_bti_nrecs",i));
+- if(len){out.put_zone((byte *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));}
++ if(len){out.put_zone((byte_t *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));}
+ }
+ else
+ {
+ int len=key(i)->len;
+ out.put_uint(len,NBITS_KEYLEN,label_str("seperatekey_len",i));
+ if(verbose){printf("WordDBPage::compress_key: compress(typ5):%d\n",len);}
+- out.put_zone((byte *)key(i)->data,8*len,label_str("seperatekey_data",i));
++ out.put_zone((byte_t *)key(i)->data,8*len,label_str("seperatekey_data",i));
+ }
+ }
+ void compress_data(Compressor &out,int i)
+@@ -341,7 +341,7 @@
+ int len=data(i)->len;
+ out.put_uint(len,NBITS_DATALEN,label_str("seperatedata_len",i));
+ if(verbose){printf("WordDBPage::compress_data: compressdata(typ5):%d\n",len);}
+- out.put_zone((byte *)data(i)->data,8*len,label_str("seperatedata_data",i));
++ out.put_zone((byte_t *)data(i)->data,8*len,label_str("seperatedata_data",i));
+ }
+ WordDBKey uncompress_key(Compressor &in,int i)
+ {
+@@ -360,7 +360,7 @@
+ if(len!=bti.len){errr("WordDBPage::uncompress_key: incoherence: len!=bti.len");}
+ if(len)
+ {
+- byte *gotdata=new byte[len];
++ byte_t *gotdata=new byte_t[len];
+ CHECK_MEM(gotdata);
+ in.get_zone(gotdata,8*len,label_str("seperatekey_btidata",i));
+ res=WordDBKey(gotdata,len);
+@@ -370,7 +370,7 @@
+ }
+ else
+ {
+- byte *gotdata=new byte[len];
++ byte_t *gotdata=new byte_t[len];
+ CHECK_MEM(gotdata);
+ in.get_zone(gotdata,8*len,label_str("seperatekey_data",i));
+ res=WordDBKey(gotdata,len);
+@@ -384,7 +384,7 @@
+ WordDBRecord res;
+ int len=in.get_uint(NBITS_DATALEN,label_str("seperatedata_len",i));
+ if(verbose)printf("uncompressdata:len:%d\n",len);
+- byte *gotdata=new byte[len];
++ byte_t *gotdata=new byte_t[len];
+ CHECK_MEM(gotdata);
+ in.get_zone(gotdata,8*len,label_str("seperatedata_data",i));
+ res=WordDBRecord(gotdata,len,rectyp);
+@@ -488,7 +488,7 @@
+ {
+ init0();
+ pgsz=npgsz;
+- pg=(PAGE *)(new byte[pgsz]);
++ pg=(PAGE *)(new byte_t[pgsz]);
+ CHECK_MEM(pg);
+ insert_pos=pgsz;
+ insert_indx=0;
diff --git a/redhat/extras/htdig/patches/gcc-6 b/redhat/extras/htdig/patches/gcc-6
new file mode 100644
index 000000000..5031ea0c7
--- /dev/null
+++ b/redhat/extras/htdig/patches/gcc-6
@@ -0,0 +1,12 @@
+Description: Fix FTBFS with gcc-6.
+--- htdig-3.2.0b6.orig/htfuzzy/Accents.cc
++++ htdig-3.2.0b6/htfuzzy/Accents.cc
+@@ -43,7 +43,7 @@ extern int debug;
+ | table iso-latin1 "minusculisee" et "de-accentuee" |
+ `--------------------------------------------------*/
+
+-static char MinusculeISOLAT1[256] = {
++static unsigned char MinusculeISOLAT1[256] = {
+ 0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23,
diff --git a/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff b/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff
new file mode 100644
index 000000000..4562e03fe
--- /dev/null
+++ b/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff
@@ -0,0 +1,176 @@
+Description: complete diff against upstream of version 3.2.0b6
+
+--- htdig-3.2.0b6.orig/db/os_rw.c
++++ htdig-3.2.0b6/db/os_rw.c
+@@ -5,6 +5,13 @@
+ * Sleepycat Software. All rights reserved.
+ */
+
++#define _XOPEN_SOURCE 500
++#include <sys/types.h>
++#include <unistd.h>
++#ifndef u_long
++typedef __u_long u_long;
++#endif
++
+ #include "db_config.h"
+
+ #ifndef lint
+--- htdig-3.2.0b6.orig/htcommon/defaults.cc
++++ htdig-3.2.0b6/htcommon/defaults.cc
+@@ -596,7 +596,7 @@
+ <a href=\"htfuzzy.html\">htfuzzy</a> for more information on the \
+ format of this file. \
+ " }, \
+-{ "endings_root2word_db", "${common_dir}/root2word.db", \
++{ "endings_root2word_db", "${database_dir}/root2word.db", \
+ "string", "htfuzzy htsearch", "", "all", "File Layout", "endings_root2word_db: /var/htdig/r2w.db", " \
+ This attributes specifies the database filename to be \
+ used in the 'endings' fuzzy search algorithm. The \
+@@ -610,7 +610,7 @@
+ This is because this database can be shared with \
+ different search databases. \
+ " }, \
+-{ "endings_word2root_db", "${common_dir}/word2root.db", \
++{ "endings_word2root_db", "${database_dir}/word2root.db", \
+ "string", "htfuzzy htsearch", "", "all", "File Layout", "endings_word2root_db: /var/htdig/w2r.bm", " \
+ This attributes specifies the database filename to be \
+ used in the 'endings' fuzzy search algorithm. The \
+@@ -2426,7 +2426,7 @@
+ that this does not limit the number of documents that \
+ are matched in any way. \
+ " }, \
+-{ "synonym_db", "${common_dir}/synonyms.db", \
++{ "synonym_db", "${database_dir}/synonyms.db", \
+ "string", "htsearch htfuzzy", "", "3.0", "File Layout", "synonym_db: ${database_base}.syn.db", " \
+ Points to the database that <a href=\"htfuzzy.html\"> \
+ htfuzzy</a> creates when the <strong>synonyms</strong> \
+--- htdig-3.2.0b6.orig/htdig/Server.cc
++++ htdig-3.2.0b6/htdig/Server.cc
+@@ -341,6 +341,8 @@
+ {
+ String fullpatt = "^[^:]*://[^/]*(";
+ fullpatt << pattern << ')';
++ if (pattern.length() == 0)
++ fullpatt = "";
+ _disallow.set(fullpatt, config->Boolean("case_sensitive"));
+ }
+ }
+--- htdig-3.2.0b6.orig/htsearch/Collection.h
++++ htdig-3.2.0b6/htsearch/Collection.h
+@@ -36,9 +36,9 @@
+ const char *docExcerpt);
+ ~Collection();
+
+- void Collection::Open();
++ void Open();
+
+- void Collection::Close();
++ void Close();
+
+ char *getWordFile() { return wordFile.get(); }
+ DocumentRef *getDocumentRef(int id);
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -54,6 +54,7 @@
+
+ #include <math.h>
+ #include <float.h>
++#include <values.h>
+
+ #if !defined(DBL_MAX)
+ # if defined (MAXDOUBLE)
+@@ -137,7 +138,7 @@
+ // Must temporarily stash the message in a String, since
+ // displaySyntaxError will overwrite the static temp used in form.
+
+- String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++ String s("Invalid sort method.");
+
+ displaySyntaxError(s);
+ return;
+--- htdig-3.2.0b6.orig/htsearch/htsearch.cc
++++ htdig-3.2.0b6/htsearch/htsearch.cc
+@@ -211,8 +211,7 @@
+ }
+ if (access((char*)configFile, R_OK) < 0)
+ {
+- reportError(form("Unable to read configuration file '%s'",
+- configFile.get()));
++ reportError("Unable to read configuration file");
+ }
+ config->Read(configFile);
+
+--- htdig-3.2.0b6.orig/htsearch/qtest.cc
++++ htdig-3.2.0b6/htsearch/qtest.cc
+@@ -132,8 +132,7 @@
+
+ if (access((char*)configFile, R_OK) < 0)
+ {
+- reportError(form("Unable to find configuration file '%s'",
+- configFile.get()));
++ reportError("Unable to find configuration file");
+ }
+
+ config->Read(configFile);
+--- htdig-3.2.0b6.orig/htword/WordDBPage.cc
++++ htdig-3.2.0b6/htword/WordDBPage.cc
+@@ -82,7 +82,7 @@
+ if(debuglevel>2)printf("TOTAL SIZE: %6d %8f\n",size,size/8.0);
+ // argh! compare failed somthing went wrong
+ // display the compress/decompress sequence and fail
+- if(cmp || size>8*1024*1000000000)
++ if(cmp || size>8*1024)
+ {
+ if(size>8*1024)
+ {
+--- htdig-3.2.0b6.orig/installdir/rundig
++++ htdig-3.2.0b6/installdir/rundig
+@@ -7,17 +7,18 @@
+ #
+ # This is a sample script to create a search database for ht://Dig.
+ #
+-DBDIR=@DATABASE_DIR@
+-COMMONDIR=@COMMON_DIR@
+-BINDIR=@BIN_DIR@
+-conffile=@DEFAULT_CONFIG_FILE@
++DBDIR=/var/lib/htdig
++COMMONDIR=/etc/htdig
++BINDIR=/usr/bin
++conffile=/etc/htdig/htdig.conf
+
+ # To help debug problems, try running rundig -vvv
+ # This will add lots of debugging output to all of the programs
+-stats= opts= alt=
++stats= opts= alt= nohtnotify=
+ while [ "$#" -gt 0 ]
+ do
+ case "$1" in
++ --no-htnotify) nohtnotify="true" ;;
+ -a) alt="$1" ;;
+ -s) stats="$1" ;;
+ -c) shift
+@@ -65,7 +66,11 @@
+ test -f db.words.db.work_weakcmpr &&
+ mv -f db.words.db.work_weakcmpr db.words.db_weakcmpr) ;;
+ esac
+-$BINDIR/htnotify $opts
++if [ "$nohtnotify" = "true" ]; then
++ echo "Skipping htnotify."
++else
++ $BINDIR/htnotify $opts
++fi
+ # If you want to use the soundex and (or) metaphone fuzzy matchings,
+ # Uncomment the following line
+ # $BINDIR/htfuzzy $opts soundex metaphone
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@
+ // Must temporarily stash the message in a String, since
+ // displaySyntaxError will overwrite the static temp used in form.
+
+- String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++ String s("Invalid search method.");
+
+ displaySyntaxError(s);
+ //return;
diff --git a/redhat/extras/htdig/patches/kfreebsd b/redhat/extras/htdig/patches/kfreebsd
new file mode 100644
index 000000000..d30d68be7
--- /dev/null
+++ b/redhat/extras/htdig/patches/kfreebsd
@@ -0,0 +1,25 @@
+From: Steven Chamberlain <steven@pyro.eu.org>
+Subject: only use ETIME if defined
+Bug-Debian: http://bugs.debian.org/765284
+Forwarded: no
+
+ETIME relates to an optional POSIX STREAMS extension not implemented
+on some platforms (such as GNU/kFreeBSD).
+
+Don't check for this return value on platforms that don't define it.
+
+--- htdig-3.2.0b6.orig/db/mut_pthread.c.orig 2002-02-02 18:18:05.000000000 +0000
++++ htdig-3.2.0b6/db/mut_pthread.c 2014-10-14 12:40:53.771737556 +0100
+@@ -201,7 +201,11 @@
+ * call, and Solaris delivers the signal to the wrong
+ * LWP.
+ */
+- if (ret != 0 && ret != ETIME && ret != ETIMEDOUT)
++ if (ret != 0 &&
++#ifdef ETIME
++ ret != ETIME &&
++#endif
++ ret != ETIMEDOUT)
+ return (ret);
+ }
+
diff --git a/redhat/extras/htdig/patches/series b/redhat/extras/htdig/patches/series
new file mode 100644
index 000000000..da0d40c91
--- /dev/null
+++ b/redhat/extras/htdig/patches/series
@@ -0,0 +1,6 @@
+htdig_3.2.0b6-13.diff
+kfreebsd
+gcc-6
+sourceforge_logo
+drop-bogus-assignment
+gcc-11
diff --git a/redhat/extras/htdig/patches/sourceforge_logo b/redhat/extras/htdig/patches/sourceforge_logo
new file mode 100644
index 000000000..dd3d1e719
--- /dev/null
+++ b/redhat/extras/htdig/patches/sourceforge_logo
@@ -0,0 +1,118 @@
+Description: don't remote-link SourceForge's logo
+ This let SourceForge track everyone who reads these docs. As the image is
+ not freely licensed, let's leave only a piece of text.
+--- htdig-3.2.0b6.orig/htdoc/FAQ.html
++++ htdig-3.2.0b6/htdoc/FAQ.html
+@@ -2585,6 +2585,6 @@ find /path/to/your/document/root -type f
+ Last modified: $Date: 2004/05/28 13:15:16 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/author.html
++++ htdig-3.2.0b6/htdoc/author.html
+@@ -34,6 +34,6 @@
+ Last modified: $Date: 2004/05/28 13:15:18 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/bugs.html
++++ htdig-3.2.0b6/htdoc/bugs.html
+@@ -50,6 +50,6 @@
+ Last modified: $Date: 2004/05/28 13:15:18 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/isp.html
++++ htdig-3.2.0b6/htdoc/isp.html
+@@ -81,7 +81,7 @@
+ Last modified: $Date: 2004/05/28 13:15:19 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/mailing.html
++++ htdig-3.2.0b6/htdoc/mailing.html
+@@ -55,6 +55,6 @@
+ Last modified: $Date: 2004/05/28 13:15:19 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/main.html
++++ htdig-3.2.0b6/htdoc/main.html
+@@ -103,6 +103,6 @@
+ Last modified: $Date: 2004/05/28 13:15:19 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/rundig.html
++++ htdig-3.2.0b6/htdoc/rundig.html
+@@ -184,7 +184,7 @@
+ Last modified: $Date: 2004/06/12 13:39:13 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/running.html
++++ htdig-3.2.0b6/htdoc/running.html
+@@ -131,7 +131,7 @@
+ Last modified: $Date: 2004/05/28 13:15:19 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/uses.html
++++ htdig-3.2.0b6/htdoc/uses.html
+@@ -646,7 +646,7 @@
+ Last modified: $Date: 2004/05/28 13:15:19 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/where.html
++++ htdig-3.2.0b6/htdoc/where.html
+@@ -121,6 +121,6 @@
+ <br>
+
+ <a href="http://sourceforge.net/">
+-<img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++SourceForge</a>
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/test/htdocs/set1/bad_local.htm
++++ htdig-3.2.0b6/test/htdocs/set1/bad_local.htm
+@@ -51,7 +51,7 @@
+ Last modified: $Date: 2004/01/18 12:54:15 $
+ <br>
+ <a href="http://sourceforge.net/">
+- <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++ SourceForge</a>
+
+ </body>
+ </html>
diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
index 8c26664fe..35f83a72e 100644
--- a/redhat/extras/pinentry-tqt/pinentry-tqt.spec
+++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
@@ -17,7 +17,7 @@
Name: pinentry-tqt
-Version: 1.1.1
+Version: 1.3.0
Release: 1%{?dist}
Summary: PIN or passphrase entry dialogs
Group: System/Libraries
@@ -45,7 +45,13 @@ BuildRequires: autoconf automake libtool m4
BuildRequires: pkgconfig
BuildRequires: libassuan-devel
+
+# SECRET support
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}secret-devel
+%else
BuildRequires: libsecret-devel
+%endif
Requires: pinentry
@@ -92,6 +98,7 @@ fi
--disable-pinentry-gnome3 \
--disable-pinentry-gtk2 \
--disable-pinentry-qt \
+ --disable-pinentry-qt4 \
--disable-pinentry-qt5 \
--disable-pinentry-tty
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 06391b49f..a73b9c7ee 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -16,7 +16,7 @@
#
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -138,7 +138,6 @@ Requires: trinity-kdiff3
Requires: trinity-kdirstat
Requires: trinity-keep
Requires: trinity-kerberostray
-#Requires: trinity-kerry
Requires: trinity-keximdb
Requires: trinity-kftpgrabber
Requires: trinity-kile
@@ -160,17 +159,18 @@ Requires: trinity-knowit
Requires: trinity-knmap
Requires: trinity-knutclient
Requires: trinity-koffice-suite
+Requires: trinity-kommando
Requires: trinity-kompose
Requires: trinity-konversation
Requires: trinity-kooldock
Requires: trinity-kopete-otr
Requires: trinity-kpicosim
-%if 0%{?sle_version} <= 150300
+%if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599 && 0%{?suse_version} != 1699
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6
Requires: trinity-kpilot
%endif
%endif
-#Requires: trinity-kplayer
+Requires: trinity-kplayer
Requires: trinity-krecipes
Requires: trinity-krename
Requires: trinity-krusader
@@ -205,22 +205,26 @@ Requires: trinity-smb4k
Requires: trinity-smartcardauth
Requires: trinity-soundkonverter
Requires: trinity-tastymenu
-%if 0%{?sle_version} <= 150300
+Requires: trinity-tdebluez
Requires: trinity-tde-guidance
-%endif
Requires: trinity-tde-style-baghira
Requires: trinity-tde-style-domino
Requires: trinity-tde-style-ia-ora
Requires: trinity-tde-style-lipstik
Requires: trinity-tde-style-qtcurve
+Requires: trinity-tde-style-polyester
Requires: trinity-tde-systemsettings
Requires: trinity-tdedocker
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
+Requires: trinity-tdeio-appinfo
+%endif
Requires: trinity-tdeio-apt
Requires: trinity-tdeio-ftps
Requires: trinity-tdeio-gopher
Requires: trinity-tdeio-locate
Requires: trinity-tdeio-sword
Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tdenetworkmanager
Requires: trinity-tdepacman
%if 0%{?rhel} != 5
Requires: trinity-tdepowersave
@@ -234,20 +238,12 @@ Requires: trinity-tellico
Requires: trinity-tork
Requires: trinity-twin-style-crystal
Requires: trinity-twin-style-dekorator
+Requires: trinity-twin-style-fahrenheit
+Requires: trinity-twin-style-machbunt
Requires: trinity-twin-style-suse2
Requires: trinity-wlassistant
Requires: trinity-yakuake
-# Network management
-# RHEL 6 and openSUSE 11.x: knetworkmanager8
-%if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6
-Requires: trinity-knetworkmanager
-%endif
-# Other distros use tdenetworkmanager (since R14)
-%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
-Requires: trinity-tdenetworkmanager
-%endif
-
# Power management
Obsoletes: trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 60ef22ddc..e6fccabdb 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -17,7 +17,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -65,7 +65,6 @@ This package installs the Trinity directory structure.
%dir %{tde_bindir}
%dir %{tde_datadir}
-%dir %{tde_confdir}
%dir %{tde_confdir}/magic
%dir %{tde_docdir}
diff --git a/redhat/libheimdal-7.7.0-bp153.1.19.src.rpm b/redhat/libheimdal-7.7.0-bp153.1.19.src.rpm
new file mode 100644
index 000000000..bb7546295
--- /dev/null
+++ b/redhat/libheimdal-7.7.0-bp153.1.19.src.rpm
Binary files differ
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index 66d8f9eac..68bc75af8 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg kipi-plugins
%define tde_prefix /opt/trinity
@@ -79,7 +79,12 @@ BuildRequires: gettext
BuildRequires: gcc-c++
# JPEG support
-BuildRequires: libjpeg-devel
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
# EXIV2
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -93,10 +98,14 @@ BuildRequires: libexiv2-devel
%endif
# GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_gpod 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gpod-devel >= 0.4.2
+%else
BuildRequires: libgpod-devel >= 0.4.2
%endif
+%endif
# LCMS support
%if 0%{?suse_version} || 0%{?rhel} >= 7
@@ -107,16 +116,28 @@ BuildRequires: lcms-devel
# GPHOTO2 support
%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gphoto-devel
+%else
BuildRequires: gphoto2-devel
+%endif
%else
BuildRequires: libgphoto2-devel
%endif
# TIFF support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}tiff-devel
+%else
BuildRequires: libtiff-devel
+%endif
# XSLT support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xslt-devel
+%else
BuildRequires: libxslt-devel
+%endif
# MESA support
%if 0%{?rhel} || 0%{?fedora}
@@ -127,9 +148,13 @@ BuildRequires: mesa-libGLU-devel
%if 0%{?pclinuxos}
BuildRequires: MesaGLU-devel
%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -201,7 +226,7 @@ PicasaWebExport: Export pictures to Picasa web service
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec
index 3f4464dac..e881fc9b8 100644
--- a/redhat/libraries/libkdcraw/libkdcraw.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg libkdcraw
%define tde_prefix /opt/trinity
@@ -56,7 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-filesystem >= %{tde_version}
@@ -74,7 +74,12 @@ BuildRequires: lcms-devel
%endif
# JPEG support
-BuildRequires: libjpeg-devel
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
# AUTOTOOLS
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -168,7 +173,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -178,6 +183,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 858918854..c44f92c28 100644
--- a/redhat/libraries/libkexiv2/libkexiv2.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg libkexiv2
%define tde_prefix /opt/trinity
@@ -67,7 +67,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: gettext
BuildRequires: gcc-c++
@@ -86,7 +86,11 @@ BuildRequires: libexiv2-devel
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -149,7 +153,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -159,6 +163,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec
index 3d66e9868..38e0d979c 100644
--- a/redhat/libraries/libkipi/libkipi.spec
+++ b/redhat/libraries/libkipi/libkipi.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg libkipi
%define tde_prefix /opt/trinity
@@ -80,19 +80,32 @@ BuildRequires: lcms-devel
%endif
# JPEG support
-BuildRequires: libjpeg-devel
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
# CMAKE
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
%description
Libkipi is a library
@@ -169,7 +182,7 @@ Homepage: http://www.kipi-plugins.org/
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -179,6 +192,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index 4cfa2120f..8168d4711 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -26,7 +26,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg libksquirrel
%define tde_prefix /opt/trinity
@@ -35,6 +35,7 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
@@ -70,8 +71,8 @@ BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: pkgconfig
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
+# CMAKE
+BuildRequires: cmake libtool
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
%endif
@@ -91,33 +92,49 @@ BuildRequires: gettext
BuildRequires: gettext-devel
# OPENEXR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openexr-devel
+%else
BuildRequires: OpenEXR-devel
+%endif
# TIFF support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}tiff-devel
+%else
BuildRequires: libtiff-devel
+%endif
# GIF support
%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-BuildRequires: giflib-devel
+BuildRequires: giflib-devel
%else
-BuildRequires: libungif-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gif-devel
+%else
+BuildRequires: libungif-devel
+%endif
%endif
# MNG support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mng-devel
+%else
BuildRequires: libmng-devel
+%endif
# DJVU support
-%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_djvu 1
BuildRequires: djvulibre
%endif
# XMEDCON support
-%if 0%{?fedora}
-%define with_xmedcon 1
-BuildRequires: xmedcon
-BuildRequires: xmedcon-devel
-%endif
+#if 0%{?fedora}
+#define with_xmedcon 1
+#BuildRequires: xmedcon
+#BuildRequires: xmedcon-devel
+#endif
# RSVG support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -132,6 +149,9 @@ BuildRequires: librsvg2
BuildRequires: librsvg2-tools
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}rsvg2-devel
+%endif
BuildRequires: librsvg
%endif
%if 0%{?suse_version}
@@ -169,7 +189,11 @@ BuildRequires: freetype-devel
%endif
# WMF support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}wmf-devel
+%else
BuildRequires: libwmf-devel
+%endif
# XML2 support
BuildRequires: libxml2-devel
@@ -243,6 +267,8 @@ This package contains the runtime libraries for KSquirrel.
%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0.8.0
+%{tde_libdir}/ksquirrel-libs/libkls_msp.so.0
+%{tde_libdir}/ksquirrel-libs/libkls_msp.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0
@@ -310,7 +336,7 @@ This package contains the runtime libraries for KSquirrel.
%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0.8.0
%{tde_libdir}/libksquirrel-libs-png.so.0
-%{tde_libdir}/libksquirrel-libs-png.so.0.0.0
+%{tde_libdir}/libksquirrel-libs-png.so.0.8.0
%{tde_libdir}/libksquirrel-libs.so.0
%{tde_libdir}/libksquirrel-libs.so.0.8.0
%dir %{tde_datadir}/ksquirrel-libs
@@ -324,6 +350,23 @@ This package contains the runtime libraries for KSquirrel.
%{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui
%{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
%{tde_datadir}/ksquirrel-libs/rgbmap
+%{tde_mandir}/man1/ksquirrel-libs-camera2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-dcraw.1
+%{tde_mandir}/man1/ksquirrel-libs-dicom2png.1
+%{tde_mandir}/man1/ksquirrel-libs-fig2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-iff2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-leaf2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm-s.1
+%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-mac2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-neo2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-pi12ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-pi32ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-svg2png.1
+%{tde_mandir}/man1/ksquirrel-libs-ttf2pnm.1
+%{tde_mandir}/man1/ksquirrel-libs-utah2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-xcf2pnm.1
+%{tde_mandir}/man1/ksquirrel-libs-xim2ppm.1
##########
@@ -344,6 +387,7 @@ This package contains the development libraries for KSquirrel.
%{tde_includedir}/ksquirrel-libs/fmt_defs.h
%{tde_includedir}/ksquirrel-libs/fmt_types.h
%{tde_includedir}/ksquirrel-libs/fmt_utils.h
+%{tde_includedir}/ksquirrel-libs/ksquirrel_libs_export.h
%{tde_includedir}/ksquirrel-libs/settings.h
%{tde_libdir}/ksquirrel-libs/libkls_avs.la
%{tde_libdir}/ksquirrel-libs/libkls_avs.so
@@ -399,6 +443,8 @@ This package contains the development libraries for KSquirrel.
%{tde_libdir}/ksquirrel-libs/libkls_mdl.so
%{tde_libdir}/ksquirrel-libs/libkls_mng.la
%{tde_libdir}/ksquirrel-libs/libkls_mng.so
+%{tde_libdir}/ksquirrel-libs/libkls_msp.la
+%{tde_libdir}/ksquirrel-libs/libkls_msp.so
%{tde_libdir}/ksquirrel-libs/libkls_mtv.la
%{tde_libdir}/ksquirrel-libs/libkls_mtv.so
%{tde_libdir}/ksquirrel-libs/libkls_neo.la
@@ -525,44 +571,47 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then
%__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|"
fi
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-%if 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 || 0%{?fedora} >= 34
-CXXFLAGS="${CXXFLAGS} -std=c++11"
-%endif
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+ %__mkdir_p build
+ cd build
+fi
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_includedir} \
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- %{?with_djvu:--enable-djvu}
+ -DBUILD_ALL=ON \
+ -DBUILD_DICOM=OFF \
+ -DBUILD_PICT=OFF \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make -C build install DESTDIR=%{buildroot}
%clean
diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index d27b53dee..80c14f13b 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg libtdeldap
%define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gcc-c++
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: pkgconfig
# LIBTOOL
@@ -77,17 +77,25 @@ BuildRequires: libtool-ltdl-devel
%endif
# SASL support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}sasl-devel
+%else
BuildRequires: %{_lib}sasl2-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: cyrus-sasl-devel
%endif
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: lib64ldap-devel
+%else
BuildRequires: openldap-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
@@ -106,8 +114,12 @@ BuildRequires: libheimdal-devel
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}udev-devel
+%else
BuildRequires: libudev-devel
%endif
+%endif
# LIBCOM_ERR support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -118,13 +130,21 @@ BuildRequires: %{_lib}ext2fs-devel
%endif
# ACL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}acl-devel
+%else
BuildRequires: libacl-devel
+%endif
# IDN support
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -176,7 +196,12 @@ if [ -d "/usr/include/openldap24" ]; then
RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
fi
-if ! rpm -E %%cmake|grep -q "cd build"; then
+# heimdal pkgconfig (Fedora)
+if [ -d "%{_libdir}/heimdal/lib/pkgconfig" ]; then
+ PKG_CONFIG_PATH="%{_libdir}/heimdal/lib/pkgconfig:${PKG_CONFIG_PATH}"
+fi
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -186,6 +211,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec
index 42421f156..38ad6cce6 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg libtqt-perl
%define tde_prefix /opt/trinity
@@ -122,7 +122,7 @@ It provides an object-oriented interface and is easy to use.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/pytde/pytde.spec
index cde093dd8..23c576859 100644
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ b/redhat/libraries/pytde/pytde.spec
@@ -1,5 +1,5 @@
#
-# spec file for package python-trinity (version R14)
+# spec file for package pytde (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -18,9 +18,9 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
-%define tde_pkg python-trinity
+%define tde_pkg pytde
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -63,19 +63,17 @@ BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
+%if "%{python}" == ""
+%global python python3
%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
-BuildRequires: python-tqt-devel
-Requires: python-tqt
+BuildRequires: pytqt-devel
+Requires: pytqt
# SIP
BuildRequires: sip4-tqt-devel >= 4.10.5
@@ -83,6 +81,8 @@ Requires: sip4-tqt >= 4.10.5
Obsoletes: python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
%description
Python binding module that provides wide access to the Trinity API,
@@ -93,8 +93,20 @@ from tdeio, tdejs, tdehtml and tdeprint.
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pytde*.py*
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitearch}/dcopexport.py*
+%{python_sitearch}/dcopext.py*
+%{python_sitearch}/pytdeconfig.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/__pycache__/dcopexport.*.pyc
+%{python_sitearch}/__pycache__/dcopext.*.pyc
+%{python_sitearch}/__pycache__/pytdeconfig.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/dcopexport.py
+%pycached %{python_sitearch}/dcopext.py
+%pycached %{python_sitearch}/pytdeconfig.py
+%endif
##########
@@ -105,6 +117,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
Development .sip files with definitions of PyTDE classes. They
@@ -127,6 +141,8 @@ Group: Development/Libraries/Python
Obsoletes: python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
%description doc
General documentation and examples for PyTDE providing programming
@@ -134,7 +150,7 @@ tips and working code you can use to learn from.
%files doc
%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
+%{tde_tdedocdir}/HTML/en/pytde/
##########
@@ -147,9 +163,7 @@ tips and working code you can use to learn from.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|"
-%endif
+%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python3|"
%build
@@ -174,7 +188,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Install documentation
%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
-%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
+%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/pytde/
%clean
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec
index 000f79b48..4cbfab470 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg pytdeextensions
%define tde_prefix /opt/trinity
@@ -62,11 +62,11 @@ BuildRequires: gettext
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
-BuildRequires: python-tqt-devel >= %{?epoch:%{epoch}:}3.18.1
-BuildRequires: trinity-python-trinity-devel
+BuildRequires: pytqt-devel >= %{?epoch:%{epoch}:}3.18.1
+BuildRequires: trinity-pytde-devel
BuildRequires: trinity-pytqt-tools
-Requires: python-tqt
-Requires: trinity-python-trinity
+Requires: pytqt
+Requires: trinity-pytde
Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -75,14 +75,12 @@ BuildRequires: sip4-tqt-devel >= 4.10.5
Requires: sip4-tqt >= 4.10.5
# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
+%if "%{python}" == ""
+%global python python3
%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
@@ -182,20 +180,12 @@ for f in src/*.py; do
-e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g"
done
-# Do not look for 'libpython2.x.so' (from -devel) package.
-# Instead look for versioned runtime library.
-LIBPYTHON="$(readlink %{_libdir}/libpython2.*.so)"
-if [ -f "%{_libdir}/${LIBPYTHON}" ]; then
- %__sed -i "src/tdedistutils.py" \
- -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|"
-fi
-
# Fix FTBFS on RHEL 5
%if 0%{?rhel} == 5
%__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g"
%endif
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 || 0%{?sle_version} >= 150600
%__sed -i "app_templates/kcontrol_module/setup.py" \
"app_templates/kcontrol_module/src/kcontrol_module.py" \
"app_templates/kdeapp/setup.py" \
@@ -204,7 +194,7 @@ fi
"app_templates/kdeutility/src/kdeutility.py" \
"app_templates/tdeioslave/setup.py" \
"app_templates/tdeioslave/src/tdeioslave.py" \
- -e "s|/usr/bin/python|/usr/bin/env python2|"
+ -e "s|/usr/bin/python|/usr/bin/env %{python}|"
%endif