diff options
Diffstat (limited to 'redhat/applications')
| -rw-r--r-- | redhat/applications/adept/adept.spec | 208 | ||||
| -rw-r--r-- | redhat/applications/development/kdbg/kdbg.spec (renamed from redhat/applications/kdbg/kdbg.spec) | 4 | ||||
| -rw-r--r-- | redhat/applications/development/kdiff3/kdiff3.spec (renamed from redhat/applications/kdiff3/kdiff3.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/development/kpicosim/kpicosim.spec (renamed from redhat/applications/kpicosim/kpicosim.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/development/kscope/kscope.spec (renamed from redhat/applications/kscope/kscope.spec) | 62 | ||||
| -rw-r--r-- | redhat/applications/development/ktechlab/ktechlab.spec (renamed from redhat/applications/ktechlab/ktechlab.spec) | 54 | ||||
| -rw-r--r-- | redhat/applications/development/kxmleditor/kxmleditor.spec (renamed from redhat/applications/kxmleditor/kxmleditor.spec) | 9 | ||||
| -rw-r--r-- | redhat/applications/development/piklab/piklab.spec (renamed from redhat/applications/piklab/piklab.spec) | 7 | ||||
| -rw-r--r-- | redhat/applications/development/tdesvn/tdesvn.spec (renamed from redhat/applications/tdesvn/tdesvn.spec) | 10 | ||||
| -rw-r--r-- | redhat/applications/filelight-l10n/filelight-l10n.spec | 112 | ||||
| -rw-r--r-- | redhat/applications/games/knights/knights.spec (renamed from redhat/applications/knights/knights.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/games/tdepacman/tdepacman.spec (renamed from redhat/applications/tdepacman/tdepacman.spec) | 5 | ||||
| -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) | 2 | ||||
| -rw-r--r-- | redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec (renamed from redhat/applications/gwenview-i18n/gwenview-i18n.spec) | 4 | ||||
| -rw-r--r-- | redhat/applications/graphics/gwenview/gwenview.spec (renamed from redhat/applications/gwenview/gwenview.spec) | 0 | ||||
| -rw-r--r-- | redhat/applications/graphics/ksquirrel/ksquirrel.spec (renamed from redhat/applications/ksquirrel/ksquirrel.spec) | 0 | ||||
| -rw-r--r-- | redhat/applications/graphics/potracegui/potracegui.spec (renamed from redhat/applications/potracegui/potracegui.spec) | 5 | ||||
| l--------- | redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh | 1 | ||||
| l--------- | redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 | 1 | ||||
| l--------- | redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 | 1 | ||||
| -rw-r--r-- | redhat/applications/internet/kasablanca/kasablanca.spec (renamed from redhat/applications/kasablanca/kasablanca.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/internet/kbiff/kbiff.spec (renamed from redhat/applications/kbiff/kbiff.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/internet/kftpgrabber/kftpgrabber.spec (renamed from redhat/applications/kftpgrabber/kftpgrabber.spec) | 52 | ||||
| -rw-r--r-- | redhat/applications/internet/knmap/knmap.spec (renamed from redhat/applications/knmap/knmap.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/internet/konversation/konversation.spec (renamed from redhat/applications/konversation/konversation.spec) | 15 | ||||
| -rw-r--r-- | redhat/applications/internet/kopete-otr/kopete-otr.spec (renamed from redhat/applications/kopete-otr/kopete-otr.spec) | 56 | ||||
| -rw-r--r-- | redhat/applications/internet/kshowmail/kshowmail.spec (renamed from redhat/applications/kshowmail/kshowmail.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/internet/kstreamripper/kstreamripper.spec (renamed from redhat/applications/kstreamripper/kstreamripper.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/internet/ktorrent/ktorrent.spec (renamed from redhat/applications/ktorrent/ktorrent.spec) | 1 | ||||
| -rw-r--r-- | redhat/applications/internet/kvirc/kvirc.spec (renamed from redhat/applications/kvirc/kvirc.spec) | 0 | ||||
| -rw-r--r-- | redhat/applications/internet/kvpnc/kvpnc.spec (renamed from redhat/applications/kvpnc/kvpnc.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/internet/smb4k/smb4k.spec (renamed from redhat/applications/smb4k/smb4k.spec) | 0 | ||||
| -rw-r--r-- | redhat/applications/internet/tork/tork.spec (renamed from redhat/applications/tork/tork.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/knetworkmanager8/knetworkmanager8.spec | 193 | ||||
| -rw-r--r-- | redhat/applications/kpowersave/kpowersave.spec | 209 | ||||
| -rw-r--r-- | redhat/applications/kuickshow/kuickshow.spec | 168 | ||||
| -rw-r--r-- | redhat/applications/misc/bibletime/bibletime.spec (renamed from redhat/applications/bibletime/bibletime.spec) | 77 | ||||
| -rw-r--r-- | redhat/applications/misc/fusion-icon/fusion-icon.spec (renamed from redhat/applications/fusion-icon/fusion-icon.spec) | 0 | ||||
| -rw-r--r-- | redhat/applications/misc/kcmldap/kcmldap.spec (renamed from redhat/applications/kcmldap/kcmldap.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec (renamed from redhat/applications/kcmldapcontroller/kcmldapcontroller.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec (renamed from redhat/applications/kcmldapmanager/kcmldapmanager.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/misc/kerberostray/kerberostray.spec (renamed from redhat/applications/kerberostray/kerberostray.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/misc/krecipes/krecipes.spec (renamed from redhat/applications/krecipes/krecipes.spec) | 10 | ||||
| -rw-r--r-- | redhat/applications/multimedia/amarok/amarok.spec (renamed from redhat/applications/amarok/amarok.spec) | 37 | ||||
| -rw-r--r-- | redhat/applications/multimedia/codeine/codeine.spec (renamed from redhat/applications/codeine/codeine.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec (renamed from redhat/applications/k3b-i18n/k3b-i18n.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/multimedia/k3b/k3b.spec (renamed from redhat/applications/k3b/k3b.spec) | 11 | ||||
| -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) | 2 | ||||
| -rw-r--r-- | redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec (renamed from redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec) | 48 | ||||
| -rw-r--r-- | redhat/applications/multimedia/kaffeine/kaffeine.spec (renamed from redhat/applications/kaffeine/kaffeine.spec) | 5 | ||||
| -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) | 5 | ||||
| -rw-r--r-- | redhat/applications/multimedia/kplayer/kplayer.spec (renamed from redhat/applications/kplayer/kplayer.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec (renamed from redhat/applications/mplayerthumbs/mplayerthumbs.spec) | 25 | ||||
| -rw-r--r-- | redhat/applications/multimedia/rosegarden/rosegarden.spec (renamed from redhat/applications/rosegarden/rosegarden.spec) | 10 | ||||
| -rw-r--r-- | redhat/applications/multimedia/soundkonverter/soundkonverter.spec (renamed from redhat/applications/soundkonverter/soundkonverter.spec) | 0 | ||||
| -rw-r--r-- | redhat/applications/multimedia/tderadio/tderadio.spec (renamed from redhat/applications/tderadio/tderadio.spec) | 72 | ||||
| -rw-r--r-- | redhat/applications/office/basket/basket.spec (renamed from redhat/applications/basket/basket.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/office/kbibtex/kbibtex.spec (renamed from redhat/applications/kbibtex/kbibtex.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/office/kbookreader/kbookreader.spec (renamed from redhat/applications/kbookreader/kbookreader.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/office/keximdb/keximdb.spec (renamed from redhat/applications/keximdb/keximdb.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/office/kile/kile.spec (renamed from redhat/applications/kile/kile.spec) | 55 | ||||
| -rw-r--r-- | redhat/applications/office/kmymoney/kmymoney.spec (renamed from redhat/applications/kmymoney/kmymoney.spec) | 91 | ||||
| -rw-r--r-- | redhat/applications/office/kmymoney/kmymoneytitlelabel.png (renamed from redhat/applications/kmymoney/kmymoneytitlelabel.png) | bin | 557 -> 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) | 3 | ||||
| -rw-r--r-- | redhat/applications/office/koffice-i18n/koffice-i18n.spec (renamed from redhat/applications/koffice-i18n/koffice-i18n.spec) | 78 | ||||
| -rw-r--r-- | redhat/applications/office/koffice/koffice.spec (renamed from redhat/applications/koffice/koffice.spec) | 48 | ||||
| -rw-r--r-- | redhat/applications/office/koffice/koshell.png (renamed from redhat/applications/koffice/koshell.png) | bin | 2531 -> 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) | 3 | ||||
| -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) | 34 | ||||
| -rw-r--r-- | redhat/applications/settings/kima/kima.spec (renamed from redhat/applications/kima/kima.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/settings/kiosktool/kiosktool.spec (renamed from redhat/applications/kiosktool/kiosktool.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/settings/kkbswitch/kkbswitch.spec (renamed from redhat/applications/kkbswitch/kkbswitch.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/settings/klcddimmer/klcddimmer.spec (renamed from redhat/applications/klcddimmer/klcddimmer.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/settings/kmyfirewall/kmyfirewall.spec (renamed from redhat/applications/kmyfirewall/kmyfirewall.spec) | 0 | ||||
| -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.spec (renamed from redhat/applications/tde-guidance/tde-guidance.spec) | 105 | ||||
| -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) | 63 | ||||
| -rw-r--r-- | redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec (renamed from redhat/applications/tdenetworkmanager/tdenetworkmanager.spec) | 6 | ||||
| -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) | 3 | ||||
| -rw-r--r-- | redhat/applications/settings/wlassistant/wlassistant.spec (renamed from redhat/applications/wlassistant/wlassistant.spec) | 20 | ||||
| -rw-r--r-- | redhat/applications/system/dolphin/dolphin.spec (renamed from redhat/applications/dolphin/dolphin.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/system/katapult/katapult.spec (renamed from redhat/applications/katapult/katapult.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/system/kbfx/kbfx.spec (renamed from redhat/applications/kbfx/kbfx.spec) | 6 | ||||
| -rw-r--r-- | redhat/applications/system/kcmautostart/kcmautostart.spec (renamed from redhat/applications/kcmautostart/kcmautostart.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/system/kdbusnotification/kdbusnotification.spec (renamed from redhat/applications/kdbusnotification/kdbusnotification.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/system/klamav/klamav.spec (renamed from redhat/applications/klamav/klamav.spec) | 12 | ||||
| -rw-r--r-- | redhat/applications/system/knemo/knemo.spec (renamed from redhat/applications/knemo/knemo.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/system/knetload/knetload.spec (renamed from redhat/applications/knetload/knetload.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/system/knetstats/knetstats.spec (renamed from redhat/applications/knetstats/knetstats.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/system/kooldock/kooldock.spec (renamed from redhat/applications/kooldock/kooldock.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/system/krusader/krusader.spec (renamed from redhat/applications/krusader/krusader.spec) | 0 | ||||
| -rw-r--r-- | redhat/applications/system/kshutdown/kshutdown.spec (renamed from redhat/applications/kshutdown/kshutdown.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/system/ksystemlog/ksystemlog.spec (renamed from redhat/applications/ksystemlog/ksystemlog.spec) | 57 | ||||
| -rw-r--r-- | redhat/applications/system/kvkbd/kvkbd.spec (renamed from redhat/applications/kvkbd/kvkbd.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec | 132 | ||||
| -rw-r--r-- | redhat/applications/system/smartcardauth/smartcardauth.spec (renamed from redhat/applications/smartcardauth/smartcardauth.spec) | 3 | ||||
| -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) | 3 | ||||
| -rw-r--r-- | redhat/applications/system/tdebluez/tdebluez.spec | 254 | ||||
| -rw-r--r-- | redhat/applications/system/tdedocker/tdedocker.spec (renamed from redhat/applications/tdedocker/tdedocker.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/system/tdepowersave/tdepowersave.spec (renamed from redhat/applications/tdepowersave/tdepowersave.spec) | 9 | ||||
| -rw-r--r-- | redhat/applications/system/tdesshaskpass/tdesshaskpass.spec | 160 | ||||
| -rw-r--r-- | redhat/applications/system/yakuake/yakuake.spec (renamed from redhat/applications/yakuake/yakuake.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec | 161 | ||||
| -rw-r--r-- | redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec (renamed from redhat/applications/tdeio-apt/tdeio-apt.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec (renamed from redhat/applications/tdeio-ftps/tdeio-ftps.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec (renamed from redhat/applications/tdeio-gopher/tdeio-gopher.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec (renamed from redhat/applications/tdeio-locate/tdeio-locate.spec) | 12 | ||||
| -rw-r--r-- | redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec (renamed from redhat/applications/tdeio-sword/tdeio-sword.spec) | 5 | ||||
| -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) | 5 | ||||
| -rw-r--r-- | redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec (renamed from redhat/applications/gtk-qt-engine/gtk-qt-engine.spec) | 25 | ||||
| -rw-r--r-- | redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec (renamed from redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec) | 66 | ||||
| -rw-r--r-- | redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec (renamed from redhat/applications/kgtk-qt3/kgtk-qt3.spec) | 6 | ||||
| -rw-r--r-- | redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec (renamed from redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec) | 3 | ||||
| -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) | 0 | ||||
| -rw-r--r-- | redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec (renamed from redhat/applications/tde-style-baghira/tde-style-baghira.spec) | 6 | ||||
| -rw-r--r-- | redhat/applications/themes/tde-style-domino/tde-style-domino.spec (renamed from redhat/applications/tde-style-domino/tde-style-domino.spec) | 3 | ||||
| -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) | 3 | ||||
| -rw-r--r-- | redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec (renamed from redhat/applications/tde-style-lipstik/tde-style-lipstik.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec (renamed from redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec) | 6 | ||||
| -rw-r--r-- | redhat/applications/themes/tdmtheme/tdmtheme.spec (renamed from redhat/applications/tdmtheme/tdmtheme.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec (renamed from redhat/applications/twin-style-crystal/twin-style-crystal.spec) | 51 | ||||
| -rw-r--r-- | redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec | 159 | ||||
| -rw-r--r-- | redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec | 154 | ||||
| -rw-r--r-- | redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec (renamed from redhat/applications/twin-style-suse2/twin-style-suse2.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/utilities/abakus/abakus.spec (renamed from redhat/applications/abakus/abakus.spec) | 6 | ||||
| -rw-r--r-- | redhat/applications/utilities/filelight/filelight.spec (renamed from redhat/applications/filelight/filelight.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/utilities/kbarcode/kbarcode.spec (renamed from redhat/applications/kbarcode/kbarcode.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/utilities/kchmviewer/kchmviewer.spec (renamed from redhat/applications/kchmviewer/kchmviewer.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/utilities/kcpuload/kcpuload.spec (renamed from redhat/applications/kcpuload/kcpuload.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/utilities/kdirstat/kdirstat.spec (renamed from redhat/applications/kdirstat/kdirstat.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/utilities/keep/keep.spec (renamed from redhat/applications/keep/keep.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/utilities/knutclient/knutclient.spec (renamed from redhat/applications/knutclient/knutclient.spec) | 7 | ||||
| -rw-r--r-- | redhat/applications/utilities/kompose/kompose.spec (renamed from redhat/applications/kompose/kompose.spec) | 5 | ||||
| -rw-r--r-- | redhat/applications/utilities/krename/krename.spec (renamed from redhat/applications/krename/krename.spec) | 3 | ||||
| -rw-r--r-- | redhat/applications/utilities/ksensors/ksensors.spec (renamed from redhat/applications/ksensors/ksensors.spec) | 5 | ||||
| -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) | 49 |
150 files changed, 1981 insertions, 1591 deletions
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 5a4a17a69..593ff73da 100644 --- a/redhat/applications/kdbg/kdbg.spec +++ b/redhat/applications/development/kdbg/kdbg.spec @@ -63,7 +63,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool m4 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -129,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 d6283c3ad..085e83b9f 100644 --- a/redhat/applications/kdiff3/kdiff3.spec +++ b/redhat/applications/development/kdiff3/kdiff3.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -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_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec index 0b175326b..bd6a45ea8 100644 --- a/redhat/applications/kpicosim/kpicosim.spec +++ b/redhat/applications/development/kpicosim/kpicosim.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -120,6 +120,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 \ @@ -159,7 +160,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog COPYING README.md %{tde_bindir}/kpicosim %{tde_tdeappdir}/kpicosim.desktop %{tde_datadir}/apps/katepart/syntax/psm.xml diff --git a/redhat/applications/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec index 0df980cff..36bade6eb 100644 --- a/redhat/applications/kscope/kscope.spec +++ b/redhat/applications/development/kscope/kscope.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext Requires: cscope -BuildRequires: autoconf automake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -123,45 +123,48 @@ Main Features: %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} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd 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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %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 %{tde_pkg} Development IDE @@ -174,13 +177,14 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog +%doc AUTHORS COPYING README.md ChangeLog %{tde_bindir}/kscope %{tde_tdeappdir}/kscope.desktop %{tde_datadir}/apps/kscope/ %{tde_tdedocdir}/HTML/en/kscope/ %{tde_datadir}/icons/hicolor/*/apps/kscope.png %{tde_datadir}/icons/locolor/*/apps/kscope.png +%{tde_mandir}/man1/kscope.1* %changelog diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec index 848381fce..84364ac92 100644 --- a/redhat/applications/ktechlab/ktechlab.spec +++ b/redhat/applications/development/ktechlab/ktechlab.spec @@ -61,7 +61,7 @@ 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 @@ -101,47 +101,45 @@ Homepage: http://ktechlab.org/ %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}" -# 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} \ +if ! rpm -E %%cmake|grep -q "cd 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_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GPSIM=OFF \ + .. -%__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 %find_lang %{tde_pkg} -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Development/ktechlab.desktop" "%{?buildroot}%{tde_tdeappdir}" -%__rm -rf "%{?buildroot}%{tde_datadir}/applnk" - # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file -r -n ktechlab Science Math @@ -166,6 +164,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/mimelnk/application/x-flowcode.desktop %{tde_datadir}/mimelnk/application/x-ktechlab.desktop %{tde_datadir}/mimelnk/application/x-microbe.desktop +%{tde_mandir}/man1/ktechlab.1* +%{tde_mandir}/man1/microbe.1* %changelog diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec index c7e72f756..e380101ae 100644 --- a/redhat/applications/kxmleditor/kxmleditor.spec +++ b/redhat/applications/development/kxmleditor/kxmleditor.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +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 @@ -110,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 \ @@ -131,10 +130,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 diff --git a/redhat/applications/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec index ff8d574d2..ddc1c3123 100644 --- a/redhat/applications/piklab/piklab.spec +++ b/redhat/applications/development/piklab/piklab.spec @@ -84,7 +84,12 @@ BuildRequires: readline-devel 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 diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec index f5313d607..98047b557 100644 --- a/redhat/applications/tdesvn/tdesvn.spec +++ b/redhat/applications/development/tdesvn/tdesvn.spec @@ -60,7 +60,8 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake libtool +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -90,7 +91,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 @@ -116,7 +117,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 @@ -266,6 +267,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 \ @@ -274,7 +276,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 6522d35cc..027d087be 100644 --- a/redhat/applications/knights/knights.spec +++ b/redhat/applications/games/knights/knights.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -131,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/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec index fc7c580e1..348b72e65 100644 --- a/redhat/applications/tdepacman/tdepacman.spec +++ b/redhat/applications/games/tdepacman/tdepacman.spec @@ -66,7 +66,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -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 \ @@ -131,7 +132,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%doc AUTHORS ChangeLog COPYING README.md TODO %{tde_bindir}/tdepacman %{tde_tdeappdir}/tdepacman.desktop %{tde_datadir}/apps/tdepacman/ 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 8579c9918..5c4815399 100644 --- a/redhat/applications/digikam/digikam.spec +++ b/redhat/applications/graphics/digikam/digikam.spec @@ -308,9 +308,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/ %lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/ %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/ -#lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/ %lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/ -#lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/ %lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/ %lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/ diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec index ab08edf97..e39d2a6da 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec +++ b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec @@ -66,7 +66,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -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..723996a29 100644 --- a/redhat/applications/gwenview/gwenview.spec +++ b/redhat/applications/graphics/gwenview/gwenview.spec diff --git a/redhat/applications/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec index fc17cceda..fc17cceda 100644 --- a/redhat/applications/ksquirrel/ksquirrel.spec +++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec index e48acc481..173c739c1 100644 --- a/redhat/applications/potracegui/potracegui.spec +++ b/redhat/applications/graphics/potracegui/potracegui.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -120,6 +120,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 \ @@ -158,7 +159,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog COPYING README.md %{tde_bindir}/potracegui %{tde_tdeappdir}/potracegui.desktop %{tde_datadir}/apps/potracegui/ 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 3185b4c15..06004d5f4 100644 --- a/redhat/applications/kasablanca/kasablanca.spec +++ b/redhat/applications/internet/kasablanca/kasablanca.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -139,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 \ @@ -177,7 +178,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog COPYING README.md %{tde_bindir}/kasablanca %{tde_datadir}/apps/kasablanca/ %{tde_datadir}/config.kcfg/kbconfig.kcfg diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec index cf2381a2e..b7dcdd2ba 100644 --- a/redhat/applications/kbiff/kbiff.spec +++ b/redhat/applications/internet/kbiff/kbiff.spec @@ -64,7 +64,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -122,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 \ @@ -160,7 +161,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog +%doc AUTHORS COPYING README.md ChangeLog %{tde_bindir}/kbiff %{tde_libdir}/libtdeinit_kbiff.la %{tde_libdir}/libtdeinit_kbiff.so diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec index 07c03d26e..6dd764389 100644 --- a/redhat/applications/kftpgrabber/kftpgrabber.spec +++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -124,38 +124,41 @@ 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 QTDIR export PATH="%{tde_bindir}:${PATH}" -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +if ! rpm -E %%cmake|grep -q "cd 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} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %find_lang %{tde_pkg} @@ -166,7 +169,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog +%doc AUTHORS COPYING README.md ChangeLog %{tde_bindir}/kftpgrabber %{tde_libdir}/libkftpinterfaces.so.0 %{tde_libdir}/libkftpinterfaces.so.0.0.0 @@ -188,6 +191,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/services/kftpimportplugin_ncftp.desktop %{tde_datadir}/servicetypes/kftpbookmarkimportplugin.desktop %{tde_tdedocdir}/HTML/en/kftpgrabber/ +%{tde_mandir}/man1/kftpgrabber.1* %files devel diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec index d93d68d2b..6317ab30d 100644 --- a/redhat/applications/knmap/knmap.spec +++ b/redhat/applications/internet/knmap/knmap.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -133,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 \ @@ -177,7 +178,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog +%doc AUTHORS COPYING README.md ChangeLog %{tde_bindir}/knmap %{tde_tdeappdir}/knmap.desktop %{tde_datadir}/apps/knmap/ diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec index a77b13313..f368e749f 100644 --- a/redhat/applications/konversation/konversation.spec +++ b/redhat/applications/internet/konversation/konversation.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -74,6 +74,13 @@ BuildRequires: libidn-devel # OPENSSL support BuildRequires: openssl-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 # SUSE desktop files utility %if 0%{?suse_version} @@ -110,6 +117,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 +190,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 @@ -201,6 +209,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 +272,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 b2f6fe6fa..df690fe31 100644 --- a/redhat/applications/kopete-otr/kopete-otr.spec +++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec @@ -68,7 +68,7 @@ BuildRequires: trinity-tdenetwork-devel >= %{tde_version} # Kopete is provided by tdenetwork Requires: trinity-kopete >= %{tde_version} -BuildRequires: autoconf automake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -104,39 +104,47 @@ users with IM-Cients supporting the OTR encryption method. %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} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +if ! rpm -E %%cmake|grep -q "cd 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_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DCMAKE_LIBRARY_PATH=%{tde_libdir} \ + -DKOPETE_INCLUDE_DIR=%{tde_tdeincludedir}/kopete \ + \ + -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 + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + .. -%__make %{_smp_mflags} || %__make +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build # Unwanted files %__rm -f %{?buildroot}%{tde_libdir}/libkotr.so @@ -150,7 +158,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f kopete_otr.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%doc AUTHORS COPYING README.md %{tde_libdir}/libkotr.la %{tde_libdir}/libkotr.so.0 %{tde_libdir}/libkotr.so.0.0.0 diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec index c9550e8cc..286488b60 100644 --- a/redhat/applications/kshowmail/kshowmail.spec +++ b/redhat/applications/internet/kshowmail/kshowmail.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -118,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 \ @@ -160,7 +161,7 @@ install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/i %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog +%doc AUTHORS COPYING README.md ChangeLog %{tde_bindir}/kshowmail %{tde_tdelibdir}/kcm_kshowmailconfigaccounts.la %{tde_tdelibdir}/kcm_kshowmailconfigaccounts.so diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec index 11686d704..3360fc21f 100644 --- a/redhat/applications/kstreamripper/kstreamripper.spec +++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec @@ -75,7 +75,7 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} %description @@ -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..4cb54d155 100644 --- a/redhat/applications/ktorrent/ktorrent.spec +++ b/redhat/applications/internet/ktorrent/ktorrent.spec @@ -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..da3af96ad 100644 --- a/redhat/applications/kvirc/kvirc.spec +++ b/redhat/applications/internet/kvirc/kvirc.spec diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec index ca2bd8d39..2a9d9ca92 100644 --- a/redhat/applications/kvpnc/kvpnc.spec +++ b/redhat/applications/internet/kvpnc/kvpnc.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -126,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 \ @@ -159,7 +160,7 @@ export PATH="%{_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%doc AUTHORS ChangeLog COPYING README.md TODO %{tde_bindir}/kvpnc %{tde_tdeappdir}/kvpnc.desktop %{tde_datadir}/apps/kvpnc/ diff --git a/redhat/applications/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec index 8d1ee44d5..8d1ee44d5 100644 --- a/redhat/applications/smb4k/smb4k.spec +++ b/redhat/applications/internet/smb4k/smb4k.spec diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index 940fb8e98..66d721f6b 100644 --- a/redhat/applications/tork/tork.spec +++ b/redhat/applications/internet/tork/tork.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -124,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 \ @@ -153,7 +154,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README TODO ChangeLog USINGTORK +%doc AUTHORS ChangeLog COPYING README.md TODO USINGTORK %{tde_bindir}/tork %{tde_bindir}/torkarkollon %{tde_bindir}/usewithtor 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/kpowersave/kpowersave.spec b/redhat/applications/kpowersave/kpowersave.spec deleted file mode 100644 index 3046fedf4..000000000 --- a/redhat/applications/kpowersave/kpowersave.spec +++ /dev/null @@ -1,209 +0,0 @@ -# -# spec file for package kpowersave (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 kpowersave -%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.7.3 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: HAL based power management applet for Trinityfiles or directories. -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: hal-devel -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 - -BuildRequires: cmake 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 - -# 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 - - -########## - -%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 - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ - -DCMAKE_SKIP_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" \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README 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 - -%changelog diff --git a/redhat/applications/kuickshow/kuickshow.spec b/redhat/applications/kuickshow/kuickshow.spec deleted file mode 100644 index d8a94d07c..000000000 --- a/redhat/applications/kuickshow/kuickshow.spec +++ /dev/null @@ -1,168 +0,0 @@ -# -# spec file for package kuickshow (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 kuickshow -%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.13 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: Quick picture viewer for TDE -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: 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 - -# 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. - - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - - -%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} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} - - -%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" - - -%clean -%__rm -rf %{buildroot} - - -%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/ - - -%changelog diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec index 4ecd291ea..ad1fe5dcb 100644 --- a/redhat/applications/bibletime/bibletime.spec +++ b/redhat/applications/misc/bibletime/bibletime.spec @@ -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 -q "cd 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..e3f8bf5cb 100644 --- a/redhat/applications/fusion-icon/fusion-icon.spec +++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec index b7f6b8bde..68af31207 100644 --- a/redhat/applications/kcmldap/kcmldap.spec +++ b/redhat/applications/misc/kcmldap/kcmldap.spec @@ -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,7 +67,7 @@ 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: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -196,6 +196,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 1b2b39808..c99c0b685 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec @@ -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: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -190,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/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec index efce26148..bbe317e3d 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec @@ -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: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -174,6 +174,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 de4e6cdbc..38e159c48 100644 --- a/redhat/applications/kerberostray/kerberostray.spec +++ b/redhat/applications/misc/kerberostray/kerberostray.spec @@ -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: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -153,6 +153,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 69c3d81f8..e2f5fa46d 100644 --- a/redhat/applications/krecipes/krecipes.spec +++ b/redhat/applications/misc/krecipes/krecipes.spec @@ -79,7 +79,12 @@ BuildRequires: brp-check-trinity BuildRequires: mysql-devel # POSTGRESQL support -BuildRequires: postgresql-devel +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 # SQLITE support BuildRequires: sqlite-devel @@ -120,6 +125,7 @@ export PATH="%{tde_bindir}:${PATH}" --includedir=%{tde_tdeincludedir} \ --docdir=%{tde_tdedocdir} \ --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ \ --disable-dependency-tracking \ --disable-debug \ @@ -175,6 +181,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 52085c0c0..d0aa408ce 100644 --- a/redhat/applications/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -66,7 +66,7 @@ BuildRequires: trinity-filesystem >= %{tde_version} Requires: trinity-filesystem >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: gettext @@ -99,13 +99,25 @@ 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: postgresql-devel BuildRequires: SDL-devel BuildRequires: taglib-devel BuildRequires: sqlite-devel +# 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 + # not used anymore, in favor of libvisual ? -- Rex #{?fedora:BuildRequires: xmms-devel} @@ -114,7 +126,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 @@ -155,7 +167,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 @@ -252,14 +264,10 @@ BuildRequires: rubypick %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)")} +%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 @@ -279,7 +287,7 @@ Amarok is a multimedia player with: %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc COPYING AUTHORS ChangeLog README +%doc COPYING AUTHORS ChangeLog README.md %{tde_bindir}/amarok %{tde_bindir}/amarokapp %{tde_bindir}/amarokcollectionscanner @@ -449,7 +457,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 @@ -474,6 +482,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 273d8e5e7..60a487700 100644 --- a/redhat/applications/codeine/codeine.spec +++ b/redhat/applications/multimedia/codeine/codeine.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -124,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 \ @@ -152,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING FAQ README TODO +%doc COPYING FAQ README.md TODO %{tde_bindir}/codeine %{tde_tdeappdir}/codeine.desktop %{tde_datadir}/apps/codeine/ diff --git a/redhat/applications/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec index 0d3fe2c20..e995c3215 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n.spec +++ b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec @@ -70,7 +70,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -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 216bebdf9..ed7d62590 100644 --- a/redhat/applications/k3b/k3b.spec +++ b/redhat/applications/multimedia/k3b/k3b.spec @@ -63,7 +63,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -90,7 +90,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 @@ -271,7 +271,7 @@ start. %{tde_tdelibdir}/libk3bwavedecoder.la %{tde_tdelibdir}/libk3bwavedecoder.so %lang(en) %{tde_tdedocdir}/HTML/en/k3b/ - +%{tde_mandir}/man1/k3b.1* ########## @@ -422,6 +422,10 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +%if 0%{?rhel} == 7 +RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11" +%endif + if ! rpm -E %%cmake|grep -q "cd build"; then %__mkdir_p build cd build @@ -432,6 +436,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/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..0a9801a8d 100644 --- a/redhat/applications/k9copy/k9copy.spec +++ b/redhat/applications/multimedia/k9copy/k9copy.spec @@ -150,6 +150,7 @@ fi --bindir=%{tde_bindir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ + --mandir=%{tde_mandir} \ \ --disable-dependency-tracking \ --disable-debug \ @@ -185,6 +186,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 775501caa..c37dad135 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec +++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec @@ -59,7 +59,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: autoconf automake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -98,33 +98,47 @@ when a page containing a supported media format is loaded. %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" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -%configure \ - --prefix=%{_libdir}/mozilla \ +if [ -d "%{_includedir}/nspr4" ]; then + RPM_OPT_FLAGS="-I%{_includedir}/nspr4 ${RPM_OPT_FLAGS}" +fi + +if ! rpm -E %%cmake|grep -q "cd 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_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} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + .. -%__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 # Remove useless filess %__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a @@ -136,7 +150,7 @@ export PATH="%{tde_bindir}:${PATH}" %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog COPYING # These files are installed outside TDE prefix %dir %{_libdir}/mozilla %dir %{_libdir}/mozilla/plugins diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec index ecc2cfd85..da41a4682 100644 --- a/redhat/applications/kaffeine/kaffeine.spec +++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec @@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -217,7 +217,7 @@ Konqueror plugin, OSD and much more. %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%doc AUTHORS ChangeLog COPYING README.md TODO %{tde_bindir}/kaffeine %{tde_libdir}/libkaffeinepart.so %{tde_tdelibdir}/lib*.* @@ -293,6 +293,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 b7d0b5e80..74db046b5 100644 --- a/redhat/applications/kmplayer/kmplayer.spec +++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -170,7 +170,7 @@ KMPlayer can: %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL README TODO +%doc AUTHORS COPYING ChangeLog INSTALL README.md TODO %{tde_bindir}/kmplayer %{tde_bindir}/knpplayer %{tde_bindir}/kxvplayer @@ -279,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 \ diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec index 602b6c371..bb86e0371 100644 --- a/redhat/applications/kplayer/kplayer.spec +++ b/redhat/applications/multimedia/kplayer/kplayer.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -131,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/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec index b565d8602..14d1f1fb0 100644 --- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -124,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 \ @@ -147,23 +148,23 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=%{buildroot} -C build -%find_lang %{tde_pkg} - %clean %__rm -rf $RPM_BUILD_ROOT -%files -f %{tde_pkg}.lang +%files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -%{tde_bindir}/mplayerthumbsconfig -%{tde_tdelibdir}/videopreview.la -%{tde_tdelibdir}/videopreview.so -%{tde_datadir}/apps/videopreview/ -%{tde_datadir}/config.kcfg/mplayerthumbs.kcfg -%{tde_datadir}/services/videopreview.desktop -%{tde_tdedocdir}/HTML/en/videopreview/ +%doc AUTHORS ChangeLog COPYING README.md +%{tde_bindir}/mplayer-thumbnailer-config +%{tde_tdelibdir}/mplayer-thumbnailer.la +%{tde_tdelibdir}/mplayer-thumbnailer.so +%{tde_datadir}/apps/mplayer-thumbnailer/ +%{tde_datadir}/apps/tdeconf_update/mplayer-thumbnailer-cfg-rename.upd +%{tde_datadir}/config.kcfg/mplayer-thumbnailer.kcfg +%{tde_datadir}/services/mplayer-thumbnailer.desktop +%{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/ +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo %changelog diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec index f3437f155..3e6834a7f 100644 --- a/redhat/applications/rosegarden/rosegarden.spec +++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec @@ -64,7 +64,8 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -114,7 +115,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 @@ -186,6 +187,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,6 +234,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..6c3ffae19 100644 --- a/redhat/applications/soundkonverter/soundkonverter.spec +++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec index 47ef2c7ca..4070f8b6b 100644 --- a/redhat/applications/tderadio/tderadio.spec +++ b/redhat/applications/multimedia/tderadio/tderadio.spec @@ -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 @@ -147,45 +147,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 -q "cd 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,7 +185,7 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -202,6 +194,13 @@ export PATH="%{tde_bindir}:${PATH}" %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} @@ -211,6 +210,8 @@ export PATH="%{tde_bindir}:${PATH}" %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 @@ -226,5 +227,8 @@ export PATH="%{tde_bindir}:${PATH}" %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 1f99ea6c0..35916dcb1 100644 --- a/redhat/applications/basket/basket.spec +++ b/redhat/applications/office/basket/basket.spec @@ -65,7 +65,7 @@ BuildRequires: trinity-kontact-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gpgme-devel -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -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 76d62aaf5..bef708968 100644 --- a/redhat/applications/kbibtex/kbibtex.spec +++ b/redhat/applications/office/kbibtex/kbibtex.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -125,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 \ @@ -162,7 +163,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING NEWS README TODO ChangeLog +%doc AUTHORS COPYING NEWS README.md TODO ChangeLog %{tde_bindir}/kbibtex %{tde_tdelibdir}/libkbibtexpart.la %{tde_tdelibdir}/libkbibtexpart.so diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec index 0d9692b4f..22ba62914 100644 --- a/redhat/applications/kbookreader/kbookreader.spec +++ b/redhat/applications/office/kbookreader/kbookreader.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -119,6 +119,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 b457b4ec7..967b8a3c6 100644 --- a/redhat/applications/keximdb/keximdb.spec +++ b/redhat/applications/office/keximdb/keximdb.spec @@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils BuildRequires: trinity-koffice-devel BuildRequires: trinity-koffice-kexi -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -125,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/kile/kile.spec b/redhat/applications/office/kile/kile.spec index 31b8d0947..d7d26d1e1 100644 --- a/redhat/applications/kile/kile.spec +++ b/redhat/applications/office/kile/kile.spec @@ -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 -q "cd 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 bbe79ffb4..fa7afc315 100644 --- a/redhat/applications/kmymoney/kmymoney.spec +++ b/redhat/applications/office/kmymoney/kmymoney.spec @@ -68,7 +68,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -84,6 +84,7 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +BuildRequires: html2ps BuildRequires: recode BuildRequires: libofx-devel @@ -148,17 +149,17 @@ have '%{name}' package installed, you will hardly find this package useful. %{tde_datadir}/apps/kmymoney2/ %{tde_datadir}/config.kcfg/kmymoney2.kcfg %{tde_datadir}/icons/hicolor/*/*/*.png -%dir %{tde_datadir}/icons/Tango/ -%dir %{tde_datadir}/icons/Tango/*/ -%dir %{tde_datadir}/icons/Tango/*/*/ -%{tde_datadir}/icons/Tango/*/*/*.png -%{tde_datadir}/icons/Tango/scalable/*.svgz +#%dir %{tde_datadir}/icons/Tango/ +#%dir %{tde_datadir}/icons/Tango/*/ +#%dir %{tde_datadir}/icons/Tango/*/*/ +#%{tde_datadir}/icons/Tango/*/*/*.png +#%{tde_datadir}/icons/Tango/scalable/*.svgz %{tde_datadir}/icons/locolor/*/*/*.png -%dir %{tde_datadir}/icons/oxygen/ -%dir %{tde_datadir}/icons/oxygen/*/ -%dir %{tde_datadir}/icons/oxygen/*/*/ -%{tde_datadir}/icons/oxygen/*/*/*.png -%{tde_datadir}/icons/oxygen/scalable/*.svgz +#%dir %{tde_datadir}/icons/oxygen/ +#%dir %{tde_datadir}/icons/oxygen/*/ +#%dir %{tde_datadir}/icons/oxygen/*/*/ +#%{tde_datadir}/icons/oxygen/*/*/*.png +#%{tde_datadir}/icons/oxygen/scalable/*.svgz %{tde_tdedocdir}/HTML/en/kmymoney2/ %{tde_mandir}/man1/kmymoney2.* %{tde_datadir}/apps/kmm_ofximport/ @@ -181,7 +182,8 @@ This package contains development files needed for KMyMoney plugins. %{tde_libdir}/libkmm_mymoney.la %{tde_libdir}/libkmm_plugin.la %{tde_libdir}/*.so -#{_libdir}/tqt3/plugins/designer/libkmymoney.so +%{_libdir}/tqt3/plugins/designer/libkmymoney.la +%{_libdir}/tqt3/plugins/designer/libkmymoney.so ########## @@ -197,54 +199,49 @@ This package contains development files needed for KMyMoney plugins. %__install -m644 %{SOURCE1} kmymoney2/widgets/ -%__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 +unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 -LDFLAGS="-Wl,--allow-shlib-undefined" -%endif -# 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} \ +if ! rpm -E %%cmake|grep -q "cd 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}" \ + -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DDOC_INSTALL_DIR="%{tde_docdir}" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ + -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DWITH_ALL_OPTIONS=ON \ \ - --with-qmake=%{_bindir}/tqmake \ - --with-qt-dir=%{_libdir}/tqt3 \ + -DBUILD_ALL=ON \ \ - --disable-pdf-docs \ - --enable-ofxplugin \ - --enable-ofxbanking \ - --enable-qtdesigner \ - --disable-sqlite3 + .. -%__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 %find_lang kmymoney2 diff --git a/redhat/applications/kmymoney/kmymoneytitlelabel.png b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png Binary files differindex 70d72ac98..70d72ac98 100644 --- a/redhat/applications/kmymoney/kmymoneytitlelabel.png +++ b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png 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 020616bd3..4f1c28370 100644 --- a/redhat/applications/knowit/knowit.spec +++ b/redhat/applications/office/knowit/knowit.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -119,6 +119,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..077854145 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n.spec +++ b/redhat/applications/office/koffice-i18n/koffice-i18n.spec @@ -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 -q "cd 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} diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec index b3c4c2da2..e137cc9b9 100644 --- a/redhat/applications/koffice/koffice.spec +++ b/redhat/applications/office/koffice/koffice.spec @@ -113,16 +113,18 @@ BuildRequires: libexif-devel BuildRequires: readline-devel # 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)")} +# 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 # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 @@ -216,9 +218,14 @@ BuildRequires: trinity-poppler-devel >= 0.12 # POSTGRESQL support # Requires 'libpqxx', for kexi-driver-pgqsl %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} -%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 +%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0 %define with_postgresql 1 +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 BuildRequires: libpqxx-devel %endif %endif @@ -239,7 +246,7 @@ BuildRequires: wv2-devel # MESA support %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}mesagl1-devel +BuildRequires: %{_lib}mesagl-devel BuildRequires: %{_lib}mesaglu1-devel %endif %if 0%{?fedora} || 0%{?rhel} @@ -251,11 +258,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 @@ -377,12 +379,18 @@ Requires: perl %{tde_tdeappdir}/*koshell.desktop %{tde_datadir}/apps/kofficewidgets/ %if 0%{?with_kross} +%if 0%{?with_python} %{tde_datadir}/apps/kross/ %{tde_tdelibdir}/krosspython.* +%endif %if 0%{?with_ruby} %{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* ########## @@ -419,6 +427,7 @@ License: LGPLv2+ %{tde_libdir}/libkrossapi.so.* %{tde_libdir}/libkrossmain.so.* %endif +%{tde_mandir}/man1/kspread.1* ########## @@ -464,6 +473,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* ########## @@ -526,6 +536,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* ########## @@ -550,6 +562,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* ########## @@ -576,6 +589,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* ########## @@ -605,6 +619,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* ########## @@ -710,6 +726,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* ########## @@ -750,6 +767,7 @@ Requires: dejavu %{tde_datadir}/apps/kformula/ %{tde_datadir}/services/kformula*.desktop %{tde_tdeappdir}/*kformula.desktop +%{tde_mandir}/man1/kformula.1* ########## diff --git a/redhat/applications/koffice/koshell.png b/redhat/applications/office/koffice/koshell.png Binary files differindex c66ef99e8..c66ef99e8 100644 --- a/redhat/applications/koffice/koshell.png +++ b/redhat/applications/office/koffice/koshell.png 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 e7914058d..dd4c68ad5 100644 --- a/redhat/applications/kpilot/kpilot.spec +++ b/redhat/applications/office/kpilot/kpilot.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: trinity-tdepim-devel >= %{tde_version} BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -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_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ 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 3a92024ea..ee92c8f4b 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/ @@ -69,7 +69,7 @@ BuildRequires: trinity-libpoppler-tqt-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -139,7 +139,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 @@ -154,17 +154,16 @@ BuildRequires: libacl-devel BuildRequires: libattr-devel # 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)")} +%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 +# Readline support +BuildRequires: readline-devel + Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release} @@ -189,6 +188,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* ########## @@ -220,7 +220,14 @@ documentation. %{tde_datadir}/apps/tellico/*.xml %{tde_datadir}/apps/tellico/*.png %{tde_datadir}/apps/tellico/entry-templates +%if 0%{?rhel} == 7 || 0%{?suse_version} %{tde_datadir}/apps/tellico/*.py* +%if 0%{?rhel} == 7 +%{tde_datadir}/apps/tellico/__pycache__/ +%endif +%else +%pycached %{tde_datadir}/apps/tellico/*.py +%endif %{tde_datadir}/apps/tellico/pics %{tde_datadir}/apps/tellico/report-templates %{tde_datadir}/apps/tellico/tellico.dtd @@ -289,7 +296,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 @@ -309,6 +316,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 4d6efa03e..827385dc7 100644 --- a/redhat/applications/kima/kima.spec +++ b/redhat/applications/settings/kima/kima.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -124,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 \ @@ -162,7 +163,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%doc AUTHORS ChangeLog COPYING README.md TODO %{tde_tdelibdir}/libkima.la %{tde_tdelibdir}/libkima.so %{tde_datadir}/apps/kicker/applets/kima.desktop diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec index 1cbea5c09..5aae73aa9 100644 --- a/redhat/applications/kiosktool/kiosktool.spec +++ b/redhat/applications/settings/kiosktool/kiosktool.spec @@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -122,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 \ @@ -167,7 +168,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO +%doc ChangeLog COPYING README.md TODO %{tde_bindir}/kiosktool %{tde_bindir}/kiosktool-tdedirs %{tde_tdeappdir}/kiosktool.desktop diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec index 33377275b..4381ff697 100644 --- a/redhat/applications/kkbswitch/kkbswitch.spec +++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -129,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 \ @@ -174,7 +175,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog README TODO +%doc AUTHORS ChangeLog README.md TODO %{tde_bindir}/kkbswitch %{tde_tdeappdir}/kkbswitch.desktop %{tde_datadir}/apps/kkbswitch/ diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec index cee0f837f..918f57f48 100644 --- a/redhat/applications/klcddimmer/klcddimmer.spec +++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -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_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ @@ -147,7 +148,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING LICENSE NEWS README +%doc AUTHORS COPYING LICENSE NEWS README.md %{tde_libdir}/klcddimmer_panelapplet.la %{tde_libdir}/klcddimmer_panelapplet.so %{tde_datadir}/apps/kicker/applets/klcddimmer.desktop diff --git a/redhat/applications/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index 7998140e5..7998140e5 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec 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/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 202b88003..946a06d97 100644 --- a/redhat/applications/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -65,7 +65,7 @@ BuildRequires: desktop-file-utils BuildRequires: trinity-pytdeextensions BuildRequires: trinity-libpythonize0-devel -BuildRequires: trinity-python-trinity +BuildRequires: trinity-pytde BuildRequires: chrpath BuildRequires: autoconf automake libtool m4 @@ -88,8 +88,8 @@ 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: pytqt-devel +BuildRequires: trinity-pytde-devel BuildRequires: trinity-pytqt-tools # LIBXXF86VM support @@ -105,6 +105,7 @@ BuildRequires: libXxf86vm-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 @@ -143,19 +144,15 @@ BuildRequires: xscreensaver-gl %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)")} +%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 -Requires: python-tqt -Requires: trinity-python-trinity +Requires: pytqt +Requires: trinity-pytde Requires: trinity-pytdeextensions %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} Requires: hwdata @@ -194,6 +191,7 @@ or can be run as standalone applications. %{tde_datadir}/apps/guidance/ %{tde_tdeappdir}/*.desktop %{tde_datadir}/icons/crystalsvg/*/*/*.png +%if 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/%{name}/SMBShareSelectDialog.py* %{python_sitearch}/%{name}/SimpleCommandRunner.py* %{python_sitearch}/%{name}/fuser.py* @@ -205,9 +203,34 @@ or can be run as standalone applications. %{python_sitearch}/%{name}/unixauthdb.py* %{python_sitearch}/%{name}/userconfig.py* %{python_sitearch}/%{name}/wineconfig.py* +%if 0%{?rhel} == 7 +%{python_sitearch}/%{name}/__pycache__/SMBShareSelectDialog.*.pyc +%{python_sitearch}/%{name}/__pycache__/SimpleCommandRunner.*.pyc +%{python_sitearch}/%{name}/__pycache__/fuser.*.pyc +%{python_sitearch}/%{name}/__pycache__/fuser_ui.*.pyc +%{python_sitearch}/%{name}/__pycache__/grubconfig.*.pyc +%{python_sitearch}/%{name}/__pycache__/mountconfig.*.pyc +%{python_sitearch}/%{name}/__pycache__/serviceconfig.*.pyc +%{python_sitearch}/%{name}/__pycache__/sizeview.*.pyc +%{python_sitearch}/%{name}/__pycache__/unixauthdb.*.pyc +%{python_sitearch}/%{name}/__pycache__/userconfig.*.pyc +%{python_sitearch}/%{name}/__pycache__/wineconfig.*.pyc +%endif +%else +%pycached %{python_sitearch}/%{name}/SMBShareSelectDialog.py +%pycached %{python_sitearch}/%{name}/SimpleCommandRunner.py +%pycached %{python_sitearch}/%{name}/fuser.py +%pycached %{python_sitearch}/%{name}/fuser_ui.py +%pycached %{python_sitearch}/%{name}/grubconfig.py +%pycached %{python_sitearch}/%{name}/mountconfig.py +%pycached %{python_sitearch}/%{name}/serviceconfig.py +%pycached %{python_sitearch}/%{name}/sizeview.py +%pycached %{python_sitearch}/%{name}/unixauthdb.py +%pycached %{python_sitearch}/%{name}/userconfig.py +%pycached %{python_sitearch}/%{name}/wineconfig.py +%endif %{tde_tdedocdir}/HTML/en/guidance/ - # Files from powermanager %if 0%{?with_powermanager} %exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png @@ -236,12 +259,28 @@ Guidance configuration tools. %files backends %defattr(-,root,root,-) %dir %{python_sitearch}/%{name} +%if 0%{?rhel} == 7 || 0%{?suse_version} %{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%{?rhel} == 7 +%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc +%{python_sitearch}/%{name}/__pycache__/drivedetect.*.pyc +%{python_sitearch}/%{name}/__pycache__/wineread.*.pyc +%{python_sitearch}/%{name}/__pycache__/winewrite.*.pyc +%{python_sitearch}/%{name}/__pycache__/xf86misc.*.pyc +%endif +%else +%pycached %{python_sitearch}/%{name}/MicroHAL.py +%pycached %{python_sitearch}/%{name}/drivedetect.py +%pycached %{python_sitearch}/%{name}/wineread.py +%pycached %{python_sitearch}/%{name}/winewrite.py +%pycached %{python_sitearch}/%{name}/xf86misc.py +%endif +%{python_sitearch}/ixf86misc*.so +%{python_sitearch}/xf86misc*.pyc ########## @@ -268,6 +307,7 @@ suspend using HAL. %files powermanager %defattr(-,root,root,-) %{tde_bindir}/guidance-power-manager +%if 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/%{name}/MicroHAL.py* %{python_sitearch}/%{name}/guidance-power-manager.py* %{python_sitearch}/%{name}/powermanage.py* @@ -276,6 +316,24 @@ suspend using HAL. %{python_sitearch}/%{name}/guidance_power_manager_ui.py* %{python_sitearch}/%{name}/notify.py* %{python_sitearch}/%{name}/tooltip.py* +%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc +%{python_sitearch}/%{name}/__pycache__/guidance-power-manager.*.pyc +%{python_sitearch}/%{name}/__pycache__/powermanage.*.pyc +%{python_sitearch}/%{name}/__pycache__/gpmhelper.*.pyc +%{python_sitearch}/%{name}/__pycache__/powermanager_ui.*.pyc +%{python_sitearch}/%{name}/__pycache__/guidance_power_manager_ui.*.pyc +%{python_sitearch}/%{name}/__pycache__/notify.*.pyc +%{python_sitearch}/%{name}/__pycache__/tooltip.*.pyc +%else +%pycached %{python_sitearch}/%{name}/MicroHAL.py +%pycached %{python_sitearch}/%{name}/guidance-power-manager.py +%pycached %{python_sitearch}/%{name}/powermanage.py +%pycached %{python_sitearch}/%{name}/gpmhelper.py +%pycached %{python_sitearch}/%{name}/powermanager_ui.py +%pycached %{python_sitearch}/%{name}/guidance_power_manager_ui.py +%pycached %{python_sitearch}/%{name}/notify.py +%pycached %{python_sitearch}/%{name}/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 @@ -305,7 +363,7 @@ suspend using HAL. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -#export PYTHONPATH=%{python_sitearch}/python-tqt +#export PYTHONPATH=%{python_sitearch}/pytqt # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia export PYTHONDONTWRITEBYTECODE= @@ -327,7 +385,7 @@ 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" +export PYTHONPATH="%{python_sitearch}/pytqt" # Support for 'sip4-tqt' export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}" @@ -384,8 +442,9 @@ chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so ##### 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} +%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc*.so %{buildroot}%{python_sitearch}/ +%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/__pycache__/xf86misc*.pyc %{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 @@ -433,13 +492,8 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py # 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,' \ + sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/env %python\1,' \ $i > $i.temp; if cmp --quiet $i $i.temp; then rm -f $i.temp; @@ -453,6 +507,7 @@ done # Removes useless files find %{buildroot} -name "*.egg-info" -exec rm -f {} \; find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; +%__rm -rf %{buildroot}%{tde_libdir}/python*/site-packages/guidance-*.egg-info/ %clean 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 74527fb76..18b2af3d8 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec +++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec @@ -69,7 +69,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -84,7 +84,9 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +%if 0%{?suse_version} == 0 || 0%{?sle_version} <= 150300 Requires: trinity-guidance +%endif %description @@ -102,42 +104,47 @@ Control Centre with an improved user interface. %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 kde_confdir="%{tde_confdir}" - - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --sysconfdir=%{tde_sysconfdir} \ - --mandir=%{tde_mandir} \ - --program-prefix="" \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd 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} \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -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 %__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-laptops.directory @@ -168,7 +175,7 @@ done %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc README TODO +%doc README.md TODO %dir %{tde_sysconfdir}/xdg %dir %{tde_sysconfdir}/xdg/menus %dir %{tde_sysconfdir}/xdg/menus/applications-merged @@ -184,7 +191,7 @@ done %config(noreplace) %{tde_confdir}/systemsettingsrc %{tde_datadir}/desktop-directories/*.directory %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png -%{tde_tdedocdir}/HTML/en/systemsettings/ +%{tde_tdedocdir}/HTML/en/tde-systemsettings/ %{tde_mandir}/man1/systemsettings.1* %changelog diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec index 5673869bf..bae1fa842 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec @@ -62,7 +62,8 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -135,7 +136,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 @@ -218,6 +219,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 16d2e8bc8..78395d8da 100644 --- a/redhat/applications/tdesudo/tdesudo.spec +++ b/redhat/applications/settings/tdesudo/tdesudo.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -123,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/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec index a750235df..00322f76c 100644 --- a/redhat/applications/wlassistant/wlassistant.spec +++ b/redhat/applications/settings/wlassistant/wlassistant.spec @@ -61,7 +61,8 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -95,20 +96,16 @@ 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%{?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)")} +%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 @@ -156,6 +153,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 \ @@ -165,7 +163,7 @@ fi -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - -DBUILD_ALL=on \ + -DBUILD_ALL=ON \ .. %__make %{?_smp_mflags} diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec index ecc07e7da..be49385f3 100644 --- a/redhat/applications/dolphin/dolphin.spec +++ b/redhat/applications/system/dolphin/dolphin.spec @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -119,6 +119,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 a1c8fc008..a2d25b15f 100644 --- a/redhat/applications/katapult/katapult.spec +++ b/redhat/applications/system/katapult/katapult.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -120,6 +120,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 f19de7f83..415697e00 100644 --- a/redhat/applications/kbfx/kbfx.spec +++ b/redhat/applications/system/kbfx/kbfx.spec @@ -62,7 +62,8 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake libtool +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -81,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 @@ -146,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/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec index 8d9a9aa3f..09b86d7a6 100644 --- a/redhat/applications/kcmautostart/kcmautostart.spec +++ b/redhat/applications/system/kcmautostart/kcmautostart.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -119,6 +119,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 \ @@ -152,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f autostart.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL README +%doc AUTHORS ChangeLog COPYING INSTALL README.md %{tde_tdelibdir}/kcm_autostart.la %{tde_tdelibdir}/kcm_autostart.so %{tde_tdeappdir}/autostart.desktop diff --git a/redhat/applications/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec index e5a23059a..380ea714c 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification.spec +++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec @@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -133,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/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec index edc1de0f6..015eaa364 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.0 %endif %define tde_pkg klamav %define tde_prefix /opt/trinity @@ -40,7 +40,12 @@ Summary: Frontend for clamav Version: 0.46 Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -License: GPLv2+ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + Group: Applications/Utilities Vendor: Trinity Project @@ -53,7 +58,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -100,6 +105,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 5349d8c26..b6f820d57 100644 --- a/redhat/applications/knemo/knemo.spec +++ b/redhat/applications/system/knemo/knemo.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -98,6 +98,7 @@ BuildRequires: libidn-devel BuildRequires: openssl-devel # Wireless support +%define with_wifi 1 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 BuildRequires: wireless-tools-devel %endif @@ -150,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 \ @@ -159,6 +161,7 @@ fi -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ -DWITH_ALL_OPTIONS=ON \ + %{!?with_wifi:-DWITH_LIBIW=OFF} \ -DWITH_GCC_VISIBILITY=ON \ \ -DBUILD_ALL=ON \ diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec index ed13175ab..33cddaa00 100644 --- a/redhat/applications/knetload/knetload.spec +++ b/redhat/applications/system/knetload/knetload.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -124,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/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec index e52cc8256..6fc41e1f5 100644 --- a/redhat/applications/knetstats/knetstats.spec +++ b/redhat/applications/system/knetstats/knetstats.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -119,6 +119,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 b2634aaf6..410e8e783 100644 --- a/redhat/applications/kooldock/kooldock.spec +++ b/redhat/applications/system/kooldock/kooldock.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -128,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 \ @@ -161,7 +162,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..cf314c68f 100644 --- a/redhat/applications/krusader/krusader.spec +++ b/redhat/applications/system/krusader/krusader.spec diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec index 53ec37121..f86297e04 100644 --- a/redhat/applications/kshutdown/kshutdown.spec +++ b/redhat/applications/system/kshutdown/kshutdown.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -125,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 \ @@ -163,7 +164,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog COPYING README.md %{tde_bindir}/kshutdown %{tde_tdelibdir}/kshutdownlockout_panelapplet.la %{tde_tdelibdir}/kshutdownlockout_panelapplet.so diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec index 38f6d8f7b..731557a72 100644 --- a/redhat/applications/ksystemlog/ksystemlog.spec +++ b/redhat/applications/system/ksystemlog/ksystemlog.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -97,39 +97,46 @@ quickly see problems occuring on their server. %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} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd 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 # Missing category will make this fail. echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" @@ -143,7 +150,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS COPYING README.md %{tde_bindir}/ksystemlog %{tde_tdeappdir}/ksystemlog.desktop %{tde_datadir}/apps/ksystemlog/ @@ -151,5 +158,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz %{tde_tdedocdir}/HTML/en/ksystemlog/ +%{tde_mandir}/man1/ksystemlog.1* + %changelog diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec index fcc0a8dda..1a36e6ce4 100644 --- a/redhat/applications/kvkbd/kvkbd.spec +++ b/redhat/applications/system/kvkbd/kvkbd.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -118,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 \ @@ -157,7 +158,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README +%doc AUTHORS COPYING README.md %{tde_bindir}/kvkbd %{tde_tdeappdir}/kvkbd.desktop %{tde_datadir}/apps/kvkbd/ diff --git a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec new file mode 100644 index 000000000..bbcf45ee8 --- /dev/null +++ b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec @@ -0,0 +1,132 @@ +# +# spec file for package polkit-agent-tde (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 +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif +%define tde_pkg polkit-agent-tde +%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} +Version: 0.99.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE dialogs for PolicyKit +Group: Environment/Desktop +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: libpolkit-tqt-devel + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +%description +PolicyKit is an application-level toolkit for defining and handling the policy +that allows unprivileged processes to speak to privileged processes. + +It is a framework for centralizing the decision making process with respect to +granting access to privileged operations for unprivileged (desktop) applications. + +PolicyKit-agent-tde provides a D-Bus session bus service that is used to +bring up authentication dialogs used for obtaining privileges. + + +%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 -q "cd 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 \ + \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%{_bindir}/polkit-agent-tde +%dir %{_datadir}/autostart +%{_datadir}/autostart/polkit-agent-tde.desktop + + +%changelog diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec index 08d5fb76d..ac53e189a 100644 --- a/redhat/applications/smartcardauth/smartcardauth.spec +++ b/redhat/applications/system/smartcardauth/smartcardauth.spec @@ -66,7 +66,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -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 8a5032bc8..635273ad1 100644 --- a/redhat/applications/tastymenu/tastymenu.spec +++ b/redhat/applications/system/tastymenu/tastymenu.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -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_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..e17236b1c --- /dev/null +++ b/redhat/applications/system/tdebluez/tdebluez.spec @@ -0,0 +1,254 @@ +# +# 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.0 +%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 +BuildRequires: libacl-devel + +# 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 -q "cd 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 21e8a6715..1b7f796f1 100644 --- a/redhat/applications/tdedocker/tdedocker.spec +++ b/redhat/applications/system/tdedocker/tdedocker.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -146,6 +146,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/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec index db0ae8d73..a57c0e328 100644 --- a/redhat/applications/tdepowersave/tdepowersave.spec +++ b/redhat/applications/system/tdepowersave/tdepowersave.spec @@ -63,7 +63,8 @@ BuildRequires: desktop-file-utils BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 -BuildRequires: cmake libtool +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -87,6 +88,7 @@ BuildRequires: libudev-devel # 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 @@ -116,7 +118,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 @@ -187,6 +189,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 \ @@ -231,7 +234,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 new file mode 100644 index 000000000..8277d6397 --- /dev/null +++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec @@ -0,0 +1,160 @@ +# +# spec file for package tdesshaskpass (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 tdesshaskpass +%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.4.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: interactively prompt users for a passphrase for ssh-add +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: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-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 + +%if 0%{?sle_version} >= 150200 +Requires: openssh +%else +Requires: openssh-clients +%endif + +%description +A TDE version of ssh-askpass with TDEWallet support. + +########## + +%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 -q "cd 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 \ + -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 + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc ChangeLog COPYING README.md +%{tde_bindir}/* +%{tde_mandir}/man1/*.1* + + +%changelog diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec index c1bf91ab4..97d9157af 100644 --- a/redhat/applications/yakuake/yakuake.spec +++ b/redhat/applications/system/yakuake/yakuake.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -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_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ 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..57f61207f --- /dev/null +++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec @@ -0,0 +1,161 @@ +# +# 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.0 +%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 +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-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 +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 -q "cd 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 9899044ee..3efdf5d7e 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt.spec +++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -118,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/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec index 640bc8809..947e89b16 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -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_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ @@ -154,7 +155,7 @@ fi %files -f tdeio_ftps.lang %defattr(-,root,root,-) %defattr(-,root,root,-) -%doc README Changelog COPYING AUTHORS +%doc README.md Changelog COPYING AUTHORS %{tde_tdelibdir}/tdeio_ftps.la %{tde_tdelibdir}/tdeio_ftps.so %{tde_datadir}/services/ftps.protocol diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec index 87fe4c307..8b833c35e 100644 --- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -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_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 8ee35756e..e8a4418ed 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate.spec +++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -84,7 +84,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 @@ -133,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 \ @@ -155,19 +156,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 2846be7dd..8a3804e89 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec @@ -66,7 +66,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -131,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 \ @@ -163,7 +164,7 @@ fi %files -f tdeio_sword.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%doc AUTHORS ChangeLog COPYING README.md TODO %{tde_tdelibdir}/tdeio_sword.la %{tde_tdelibdir}/tdeio_sword.so %{tde_datadir}/apps/tdeio_sword/ 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 149e5a882..6bb629f89 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -65,7 +65,7 @@ BuildRequires: desktop-file-utils Obsoletes: trinity-kio-umountwrapper < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-kio-umountwrapper = %{?epoch:%{epoch}:}%{version}-%{release} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -123,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 \ @@ -179,7 +180,7 @@ fi %files -f tdeio_umountwrapper.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README +%doc AUTHORS COPYING README.md %{tde_bindir}/tdeio_umountwrapper %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper %dir %{tde_datadir}/apps/d3lphin diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec index 43f5a2637..457febb76 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec +++ b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec @@ -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: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -136,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 \ @@ -154,29 +152,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..ce227d406 100644 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec +++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -96,58 +96,46 @@ 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 -q "cd 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 diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec index 4120e4b9d..76893f3c9 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec +++ b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec @@ -62,7 +62,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -88,7 +89,7 @@ BuildRequires: gtk+2.0-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 @@ -138,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/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec index 96e00f658..97ac46a3f 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec +++ b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -129,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/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec index d564e576e..d564e576e 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 diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec index 6a4c5c7f3..3ae8a3cf4 100644 --- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec +++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec @@ -62,7 +62,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -102,6 +102,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 \ @@ -143,6 +144,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/twin_baghira_config.so %{tde_libdir}/usermanager_panelapplet.la %{tde_libdir}/usermanager_panelapplet.so +%{tde_tdeappdir}/bab.desktop %{tde_datadir}/apps/baghira/ %{tde_datadir}/apps/kicker/applets/baghira-starter.desktop %{tde_datadir}/apps/kicker/applets/baghira-usermanager.desktop @@ -189,6 +191,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 9fc33cf88..55517e191 100644 --- a/redhat/applications/tde-style-domino/tde-style-domino.spec +++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec @@ -62,7 +62,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -98,6 +98,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 eee02ddbb..febea2eab 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 @@ -60,7 +60,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -106,6 +106,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-lipstik/tde-style-lipstik.spec b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec index 80223ce84..d021dccf8 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec +++ b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec @@ -65,7 +65,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -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_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ \ diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec index d58d8fb5c..f7df29f07 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec +++ b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec @@ -61,7 +61,8 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake libtool +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -84,7 +85,7 @@ BuildRequires: libacl-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 @@ -146,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/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec index 85a6c65ab..abb9f2240 100644 --- a/redhat/applications/tdmtheme/tdmtheme.spec +++ b/redhat/applications/themes/tdmtheme/tdmtheme.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -120,6 +120,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 82d5534e4..8d53b5469 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec +++ b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec @@ -61,7 +61,7 @@ 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 @@ -100,40 +100,43 @@ And it is of course nice to look at. Upstream says: %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}" -# Warning: --enable-gcc-visibility makes decoration unusable. -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +if ! rpm -E %%cmake|grep -q "cd 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_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -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 \ + .. -%__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 + +%find_lang %{tde_pkg} %clean @@ -141,7 +144,7 @@ export PATH="%{tde_bindir}:${PATH}" -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_tdelibdir}/twin3_crystal.la diff --git a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec new file mode 100644 index 000000000..e5a20e401 --- /dev/null +++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec @@ -0,0 +1,159 @@ +# +# spec file for package twin-style-dekorator (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 twin-style-dekorator +%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: 1.0.5 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Semi transparant window decoration for Trinity +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 +Crystal offers you pseudo transparent titlebar, buttons and borders +transparent, so you can see more of your lovely background image +Transparancy and buttons can be costumized to match your wishes. +Offers rounded corners as well + +And it is of course nice to look at. Upstream says: +"- Don't forget to breathe, while drooling." + +########## + +%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 -q "cd 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} \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=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,-) +%doc AUTHORS COPYING +%{tde_tdelibdir}/twin3_deKorator.la +%{tde_tdelibdir}/twin3_deKorator.so +%{tde_tdelibdir}/twin_deKorator_config.la +%{tde_tdelibdir}/twin_deKorator_config.so +%{tde_datadir}/apps/deKorator/ +%{tde_datadir}/apps/twin/deKorator.desktop + + +%changelog diff --git a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec new file mode 100644 index 000000000..d8734ef3d --- /dev/null +++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec @@ -0,0 +1,154 @@ +# +# spec file for package twin-style-machbunt (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 twin-style-machbunt +%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.1/9.2 +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 KDE Window decoration extracted from SUSE 9.1/9.2. + +An example color scheme 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 -q "cd 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 \ + \ + -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 + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_tdelibdir}/twin3_MachBunt.la +%{tde_tdelibdir}/twin3_MachBunt.so +%{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc +%{tde_datadir}/apps/twin/MachBunt.desktop + + +%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 ec3533239..48ae0e695 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.0 %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: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -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 840ba20d0..432c6072c 100644 --- a/redhat/applications/abakus/abakus.spec +++ b/redhat/applications/utilities/abakus/abakus.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -75,7 +75,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 @@ -131,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 \ @@ -168,6 +169,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 da445b80a..09023a7c8 100644 --- a/redhat/applications/filelight/filelight.spec +++ b/redhat/applications/utilities/filelight/filelight.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -70,7 +70,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 @@ -127,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_NO_BUILTIN_CHRPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index 4fea52fc7..b197f9741 100644 --- a/redhat/applications/kbarcode/kbarcode.spec +++ b/redhat/applications/utilities/kbarcode/kbarcode.spec @@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -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_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 6b313a27c..c2904d693 100644 --- a/redhat/applications/kchmviewer/kchmviewer.spec +++ b/redhat/applications/utilities/kchmviewer/kchmviewer.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -141,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 \ @@ -192,7 +193,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc ChangeLog COPYING FAQ README +%doc ChangeLog COPYING FAQ README.md %{tde_bindir}/kchmviewer %{tde_tdelibdir}/tdeio_msits.la %{tde_tdelibdir}/tdeio_msits.so diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec index 1b45a498b..594396581 100644 --- a/redhat/applications/kcpuload/kcpuload.spec +++ b/redhat/applications/utilities/kcpuload/kcpuload.spec @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -120,6 +120,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 b91f176b3..1b9bc1148 100644 --- a/redhat/applications/kdirstat/kdirstat.spec +++ b/redhat/applications/utilities/kdirstat/kdirstat.spec @@ -61,7 +61,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -125,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/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec index c3ddddc77..adbf9d811 100644 --- a/redhat/applications/keep/keep.spec +++ b/redhat/applications/utilities/keep/keep.spec @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -124,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/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec index aa8f2eb91..ab101e33e 100644 --- a/redhat/applications/knutclient/knutclient.spec +++ b/redhat/applications/utilities/knutclient/knutclient.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -106,7 +106,7 @@ stations using an UPS. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} # Fix permissions -chmod 644 AUTHORS README COPYING ChangeLog +chmod 644 AUTHORS README.md COPYING ChangeLog %build @@ -124,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 \ @@ -167,7 +168,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog COPYING README.md %{tde_bindir}/knutclient %{tde_tdeappdir}/knutclient.desktop %{tde_datadir}/apps/knutclient/knutclientui.rc diff --git a/redhat/applications/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec index 543b695ec..6fbe30cfa 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.0 %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: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -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 7e14786a8..e36feb919 100644 --- a/redhat/applications/krename/krename.spec +++ b/redhat/applications/utilities/krename/krename.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -118,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_NO_BUILTIN_CHRPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec index 1e0d080d6..f89269441 100644 --- a/redhat/applications/ksensors/ksensors.spec +++ b/redhat/applications/utilities/ksensors/ksensors.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -126,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 \ @@ -163,7 +164,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING FAQ README TODO +%doc AUTHORS ChangeLog COPYING FAQ README.md TODO %{tde_bindir}/ksensors %{tde_tdeappdir}/ksensors.desktop %{tde_datadir}/apps/ksensors/ diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec index 21ca470e2..7164239fb 100644 --- a/redhat/applications/mathemagics/mathemagics.spec +++ b/redhat/applications/utilities/mathemagics/mathemagics.spec @@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: cmake +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -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 \ @@ -116,10 +117,10 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README +%doc AUTHORS COPYING README.md %{tde_bindir}/mathemagics %{tde_tdeappdir}/mathemagics.desktop -%{tde_datadir}/apps/mathemagics/mathemagicsui.rc +%{tde_datadir}/apps/mathemagics/ %{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png %{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png %{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec index 152d4554d..4a421c78a 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -109,32 +109,33 @@ This package contains the TDE user interface of qalculate. %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}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ + +if ! rpm -E %%cmake|grep -q "cd 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_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -142,7 +143,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang qalculate_tde @@ -158,13 +159,13 @@ export PATH="%{tde_bindir}:${PATH}" %files -f qalculate_tde.lang %defattr(-,root,root,-) -%{tde_bindir}/qalculate %{tde_bindir}/qalculate-tde %{tde_datadir}/apps/qalculate_tde/ %{tde_tdeappdir}/qalculate_tde.desktop %{tde_tdedocdir}/HTML/en/qalculate_tde/ %{tde_datadir}/icons/hicolor/*/apps/qalculate_tde.png %{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png +%{tde_mandir}/man1/qalculate-tde.1* %changelog |
