summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2021-01-30 14:34:02 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2021-01-30 22:29:41 +0100
commit6581dc50b83f203d65eac61c00a159ab2a6ddb5d (patch)
tree85c02d38ca9dcedc28798ee41c4b16ec7260e9bc
parent87e57a1a070839a44db16a0410ef57902db2df3e (diff)
downloadtde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.tar.gz
tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.zip
RPM: massive update and cleanup
-rw-r--r--redhat/Makefile (renamed from redhat/Makefile.r14)324
-rw-r--r--redhat/Makefile.v3.5.13-sru569
-rw-r--r--redhat/applications/abakus/abakus-3.5.13.2.spec126
-rw-r--r--redhat/applications/abakus/abakus.spec20
-rw-r--r--redhat/applications/adept/adept-3.5.13.2.spec183
-rw-r--r--redhat/applications/adept/adept.spec (renamed from redhat/applications/adept/adept-14.0.0.spec)2
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch15
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.2.spec438
-rw-r--r--redhat/applications/amarok/amarok.spec (renamed from redhat/applications/amarok/amarok-14.0.0.spec)66
-rw-r--r--redhat/applications/basket/basket-3.5.13.2.spec157
-rw-r--r--redhat/applications/basket/basket.spec (renamed from redhat/applications/basket/basket-14.0.0.spec)62
-rw-r--r--redhat/applications/bibletime/bibletime-3.5.13.2.spec146
-rw-r--r--redhat/applications/bibletime/bibletime.spec (renamed from redhat/applications/bibletime/bibletime-14.0.0.spec)6
-rw-r--r--redhat/applications/codeine/codeine.spec165
-rw-r--r--redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec86
-rw-r--r--redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch22
-rw-r--r--redhat/applications/digikam/digikam-3.5.13.2.spec311
-rw-r--r--redhat/applications/digikam/digikam.spec (renamed from redhat/applications/digikam/digikam-14.0.0.spec)2
-rw-r--r--redhat/applications/dolphin/dolphin-3.5.13.2.spec139
-rw-r--r--redhat/applications/dolphin/dolphin.spec2
-rw-r--r--redhat/applications/filelight-l10n/filelight-l10n.spec2
-rw-r--r--redhat/applications/filelight/filelight-3.5.13.2.spec134
-rw-r--r--redhat/applications/filelight/filelight.spec (renamed from redhat/applications/filelight/filelight-14.0.0.spec)7
-rw-r--r--redhat/applications/fusion-icon/fusion-icon-14.0.0.spec92
-rw-r--r--redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch17
-rw-r--r--redhat/applications/fusion-icon/fusion-icon.spec10
-rw-r--r--redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff50
-rw-r--r--redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff553
-rw-r--r--redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff435
-rw-r--r--redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff138
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec146
l---------redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh2
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine.spec (renamed from redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec)18
l---------redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde42
l---------redhat/applications/gtk-qt-engine/gtkrc-2.0-kde42
-rw-r--r--redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec (renamed from redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec)2
-rw-r--r--redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec167
-rw-r--r--redhat/applications/gwenview-i18n/gwenview-i18n.spec2
-rw-r--r--redhat/applications/gwenview/gwenview-3.5.13.2.spec187
-rw-r--r--redhat/applications/gwenview/gwenview.spec (renamed from redhat/applications/gwenview/gwenview-14.0.0.spec)2
-rw-r--r--redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec405
-rw-r--r--redhat/applications/k3b-i18n/k3b-i18n.spec (renamed from redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec)2
-rw-r--r--redhat/applications/k3b/k3b-3.5.13.2.spec468
-rw-r--r--redhat/applications/k3b/k3b.spec (renamed from redhat/applications/k3b/k3b-14.0.0.spec)2
-rw-r--r--redhat/applications/k3b/k3brc6
-rw-r--r--redhat/applications/k9copy/k9copy-3.5.13.2.spec146
-rw-r--r--redhat/applications/k9copy/k9copy.spec (renamed from redhat/applications/k9copy/k9copy-14.0.0.spec)2
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch22
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec120
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch11
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec131
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec110
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec (renamed from redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec)14
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13.2.spec289
-rw-r--r--redhat/applications/kaffeine/kaffeine.spec (renamed from redhat/applications/kaffeine/kaffeine-14.0.0.spec)6
-rw-r--r--redhat/applications/kasablanca/kasablanca.spec (renamed from redhat/applications/kasablanca/kasablanca-14.0.0.spec)60
-rw-r--r--redhat/applications/katapult/katapult-3.5.13.2.spec173
-rw-r--r--redhat/applications/katapult/katapult.spec4
-rw-r--r--redhat/applications/kbarcode/kbarcode-3.5.13.2.spec154
-rw-r--r--redhat/applications/kbarcode/kbarcode.spec13
-rw-r--r--redhat/applications/kbfx/kbfx-3.5.13.2.spec173
-rw-r--r--redhat/applications/kbfx/kbfx.spec3
-rw-r--r--redhat/applications/kbibtex/kbibtex.spec6
-rw-r--r--redhat/applications/kbiff/kbiff.spec8
-rw-r--r--redhat/applications/kbookreader/kbookreader-3.5.13.2.spec118
-rw-r--r--redhat/applications/kbookreader/kbookreader.spec10
-rw-r--r--redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec145
-rw-r--r--redhat/applications/kchmviewer/kchmviewer.spec (renamed from redhat/applications/kchmviewer/kchmviewer-14.0.0.spec)77
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec124
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-fr.po52
-rw-r--r--redhat/applications/kcmautostart/kcmautostart.spec4
-rw-r--r--redhat/applications/kcmldap/kcmldap.spec26
-rw-r--r--redhat/applications/kcmldapcontroller/kcmldapcontroller.spec (renamed from redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec)91
-rw-r--r--redhat/applications/kcmldapmanager/kcmldapmanager.spec (renamed from redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec)94
-rw-r--r--redhat/applications/kcpuload/kcpuload-3.5.13.2.spec125
-rw-r--r--redhat/applications/kcpuload/kcpuload.spec10
-rw-r--r--redhat/applications/kdbg/kdbg.spec (renamed from redhat/applications/kdbg/kdbg-14.0.0.spec)4
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch15
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec117
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification.spec (renamed from redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec)70
-rw-r--r--redhat/applications/kdiff3/kdiff3-3.5.13.2.spec138
-rw-r--r--redhat/applications/kdiff3/kdiff3.spec (renamed from redhat/applications/kdiff3/kdiff3-14.0.0.spec)76
-rw-r--r--redhat/applications/kdirstat/kdirstat-3.5.13.2.spec133
-rw-r--r--redhat/applications/kdirstat/kdirstat.spec8
-rw-r--r--redhat/applications/keep/keep-3.5.13.2.spec128
-rw-r--r--redhat/applications/keep/keep.spec (renamed from redhat/applications/keep/keep-14.0.0.spec)66
-rw-r--r--redhat/applications/kerberostray/kerberostray.spec (renamed from redhat/applications/kerberostray/kerberostray-14.0.0.spec)92
-rw-r--r--redhat/applications/keximdb/keximdb.spec14
-rw-r--r--redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch39
-rw-r--r--redhat/applications/kftpgrabber/kftpgrabber.spec (renamed from redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec)4
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec126
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3.spec (renamed from redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec)2
-rw-r--r--redhat/applications/kile/kile-3.5.13.2.spec194
-rw-r--r--redhat/applications/kile/kile.spec (renamed from redhat/applications/kile/kile-14.0.0.spec)2
-rw-r--r--redhat/applications/kima/kima-3.5.13.2.spec121
-rw-r--r--redhat/applications/kima/kima.spec (renamed from redhat/applications/kima/kima-14.0.0.spec)66
-rw-r--r--redhat/applications/kiosktool/kiosktool-3.5.13.2.spec125
-rw-r--r--redhat/applications/kiosktool/kiosktool.spec6
-rw-r--r--redhat/applications/kkbswitch/kkbswitch.spec11
-rw-r--r--redhat/applications/klcddimmer/klcddimmer.spec10
-rw-r--r--redhat/applications/kmplayer/kmplayer-3.5.13.2.spec275
-rw-r--r--redhat/applications/kmplayer/kmplayer.spec (renamed from redhat/applications/kmplayer/kmplayer-14.0.0.spec)10
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec193
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall.spec (renamed from redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec)4
-rw-r--r--redhat/applications/kmymoney/kmymoney-3.5.13.2.spec268
-rw-r--r--redhat/applications/kmymoney/kmymoney.spec (renamed from redhat/applications/kmymoney/kmymoney-14.0.0.spec)8
-rw-r--r--redhat/applications/knemo/knemo-3.5.13.2.spec136
-rw-r--r--redhat/applications/knemo/knemo.spec (renamed from redhat/applications/knemo/knemo-14.0.0.spec)78
-rw-r--r--redhat/applications/knetload/knetload-3.5.13.2.spec132
-rw-r--r--redhat/applications/knetload/knetload.spec2
-rw-r--r--redhat/applications/knetstats/knetstats-3.5.13.2.spec123
-rw-r--r--redhat/applications/knetstats/knetstats.spec2
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch10
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch22
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec179
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager8.spec (renamed from redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec)2
-rw-r--r--redhat/applications/knights/knights-3.5.13.2.spec132
-rw-r--r--redhat/applications/knights/knights.spec16
-rw-r--r--redhat/applications/knmap/knmap.spec14
-rw-r--r--redhat/applications/knowit/knowit-3.5.13.2.spec135
-rw-r--r--redhat/applications/knowit/knowit.spec2
-rw-r--r--redhat/applications/knutclient/knutclient-3.5.13.2.spec126
-rw-r--r--redhat/applications/knutclient/knutclient.spec13
-rw-r--r--redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec1045
-rw-r--r--redhat/applications/koffice-i18n/koffice-i18n.spec (renamed from redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec)2
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2.spec1157
-rw-r--r--redhat/applications/koffice/koffice.spec (renamed from redhat/applications/koffice/koffice-14.0.0.spec)31
-rw-r--r--redhat/applications/koffice/koshell.pngbin0 -> 2531 bytes
-rw-r--r--redhat/applications/konversation/konversation-3.5.13.2.spec174
-rw-r--r--redhat/applications/konversation/konversation.spec10
-rw-r--r--redhat/applications/kooldock/kooldock.spec36
-rw-r--r--redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec151
-rw-r--r--redhat/applications/kopete-otr/kopete-otr.spec (renamed from redhat/applications/kopete-otr/kopete-otr-14.0.0.spec)2
-rw-r--r--redhat/applications/kpicosim/kpicosim-3.5.13.2.spec124
-rw-r--r--redhat/applications/kpicosim/kpicosim.spec23
-rw-r--r--redhat/applications/kpilot/kpilot-3.5.13.2.spec173
-rw-r--r--redhat/applications/kpilot/kpilot.spec2
-rw-r--r--redhat/applications/kplayer/kplayer.spec2
-rw-r--r--redhat/applications/kpowersave/kpowersave-3.5.13.2.spec158
-rw-r--r--redhat/applications/kpowersave/kpowersave.spec (renamed from redhat/applications/kpowersave/kpowersave-14.0.0.spec)4
-rw-r--r--redhat/applications/krecipes/krecipes.spec (renamed from redhat/applications/krecipes/krecipes-14.0.0.spec)2
-rw-r--r--redhat/applications/krename/krename-3.5.13.2.spec127
-rw-r--r--redhat/applications/krename/krename.spec2
-rw-r--r--redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch62
-rw-r--r--redhat/applications/krusader/krusader-3.5.13.2.spec155
-rw-r--r--redhat/applications/krusader/krusader.spec (renamed from redhat/applications/krusader/krusader-14.0.0.spec)2
-rw-r--r--redhat/applications/kscope/kscope.spec (renamed from redhat/applications/kscope/kscope-14.0.0.spec)2
-rw-r--r--redhat/applications/ksensors/ksensors-3.5.13.2.spec139
-rw-r--r--redhat/applications/ksensors/ksensors.spec9
-rw-r--r--redhat/applications/kshowmail/kshowmail.spec (renamed from redhat/applications/kshowmail/kshowmail-14.0.0.spec)71
-rw-r--r--redhat/applications/kshutdown/kshutdown.spec6
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec121
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec6
-rw-r--r--redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec146
-rw-r--r--redhat/applications/ksquirrel/ksquirrel.spec (renamed from redhat/applications/ksquirrel/ksquirrel-14.0.0.spec)14
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec95
-rw-r--r--redhat/applications/kstreamripper/kstreamripper.spec (renamed from redhat/applications/kstreamripper/kstreamripper-14.0.0.spec)28
-rw-r--r--redhat/applications/kstreamripper/scons-local-2.5.1.tar.gzbin0 -> 426545 bytes
-rw-r--r--redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec122
-rw-r--r--redhat/applications/ksystemlog/ksystemlog.spec (renamed from redhat/applications/ksystemlog/ksystemlog-14.0.0.spec)10
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch11
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13.2.spec132
-rw-r--r--redhat/applications/ktechlab/ktechlab.spec (renamed from redhat/applications/ktechlab/ktechlab-14.0.0.spec)6
-rw-r--r--redhat/applications/ktorrent/ktorrent-3.5.13.2.spec184
-rw-r--r--redhat/applications/ktorrent/ktorrent.spec (renamed from redhat/applications/ktorrent/ktorrent-14.0.0.spec)2
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13.2.spec127
-rw-r--r--redhat/applications/kuickshow/kuickshow.spec (renamed from redhat/applications/kuickshow/kuickshow-14.0.0.spec)2
-rw-r--r--redhat/applications/kvirc/kvirc-3.5.13.2.spec211
-rw-r--r--redhat/applications/kvirc/kvirc.spec (renamed from redhat/applications/kvirc/kvirc-14.0.0.spec)2
-rw-r--r--redhat/applications/kvkbd/kvkbd-3.5.13.2.spec117
-rw-r--r--redhat/applications/kvkbd/kvkbd.spec10
-rw-r--r--redhat/applications/kvpnc/kvpnc-14.0.0.patch19
-rw-r--r--redhat/applications/kvpnc/kvpnc.spec5
-rw-r--r--redhat/applications/kxmleditor/kxmleditor.spec59
-rw-r--r--redhat/applications/mathemagics/mathemagics.spec130
-rw-r--r--redhat/applications/mplayerthumbs/mplayerthumbs.spec6
-rw-r--r--redhat/applications/piklab/piklab-3.5.13.2.spec145
-rw-r--r--redhat/applications/piklab/piklab.spec (renamed from redhat/applications/piklab/piklab-14.0.0.spec)2
-rw-r--r--redhat/applications/potracegui/potracegui-3.5.13.2.spec122
-rw-r--r--redhat/applications/potracegui/potracegui.spec14
-rw-r--r--redhat/applications/qalculate-tde/qalculate-tde.spec8
-rw-r--r--redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec (renamed from redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec)6
-rw-r--r--redhat/applications/rosegarden/rosegarden-3.5.13.2.spec217
-rw-r--r--redhat/applications/rosegarden/rosegarden.spec (renamed from redhat/applications/rosegarden/rosegarden-14.0.0.spec)2
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec138
-rw-r--r--redhat/applications/smartcardauth/smartcardauth.spec (renamed from redhat/applications/smartcardauth/smartcardauth-14.0.0.spec)85
-rw-r--r--redhat/applications/smb4k/smb4k-3.5.13.2.spec174
-rw-r--r--redhat/applications/smb4k/smb4k.spec (renamed from redhat/applications/smb4k/smb4k-14.0.0.spec)3
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec171
-rw-r--r--redhat/applications/soundkonverter/soundkonverter.spec (renamed from redhat/applications/soundkonverter/soundkonverter-14.0.0.spec)3
-rw-r--r--redhat/applications/tastymenu/tastymenu.spec2
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch51
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec466
-rw-r--r--redhat/applications/tde-guidance/tde-guidance.spec (renamed from redhat/applications/tde-guidance/tde-guidance-14.0.0.spec)31
-rw-r--r--redhat/applications/tde-style-baghira/tde-style-baghira.spec57
-rw-r--r--redhat/applications/tde-style-domino/tde-style-domino.spec51
-rw-r--r--redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec2
-rw-r--r--redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec116
-rw-r--r--redhat/applications/tde-style-lipstik/tde-style-lipstik.spec (renamed from redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec)59
-rw-r--r--redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec139
-rw-r--r--redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec (renamed from redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec)2
-rw-r--r--redhat/applications/tde-systemsettings/tde-settings-laptops.directory (renamed from redhat/applications/tde-systemsettings/kde-settings-laptops.directory)0
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec145
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings.spec (renamed from redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec)20
-rw-r--r--redhat/applications/tdedocker/tdedocker.spec41
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch33
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec121
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt.spec (renamed from redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec)56
-rw-r--r--redhat/applications/tdeio-ftps/tdeio-ftps.spec11
-rw-r--r--redhat/applications/tdeio-gopher/tdeio-gopher.spec2
-rw-r--r--redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec128
-rw-r--r--redhat/applications/tdeio-locate/tdeio-locate.spec (renamed from redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec)2
-rw-r--r--redhat/applications/tdeio-sword/tdeio-sword.spec10
-rw-r--r--redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec130
-rw-r--r--redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec11
-rw-r--r--redhat/applications/tdenetworkmanager/tdenetworkmanager.spec20
-rw-r--r--redhat/applications/tdepacman/tdepacman.spec (renamed from redhat/extras/kpacman/kpacman-14.0.0.spec)107
-rw-r--r--redhat/applications/tdepowersave/tdepowersave.spec (renamed from redhat/applications/tdepowersave/tdepowersave-14.0.0.spec)7
-rw-r--r--redhat/applications/tderadio/tderadio-3.5.13.2.spec171
-rw-r--r--redhat/applications/tderadio/tderadio.spec (renamed from redhat/applications/tderadio/tderadio-14.0.0.spec)5
-rw-r--r--redhat/applications/tdesudo/tdesudo-3.5.13.2.spec110
-rw-r--r--redhat/applications/tdesudo/tdesudo.spec2
-rw-r--r--redhat/applications/tdesvn/tdesvn-14.0.0.patch57
-rw-r--r--redhat/applications/tdesvn/tdesvn-3.5.13.2.spec255
-rw-r--r--redhat/applications/tdesvn/tdesvn.spec (renamed from redhat/applications/tdesvn/tdesvn-14.0.0.spec)6
-rw-r--r--redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec119
-rw-r--r--redhat/applications/tdmtheme/tdmtheme.spec6
-rw-r--r--redhat/applications/tellico/tellico-3.5.13.2.spec232
-rw-r--r--redhat/applications/tellico/tellico.spec (renamed from redhat/applications/tellico/tellico-14.0.0.spec)12
-rw-r--r--redhat/applications/tork/tork.spec (renamed from redhat/applications/tork/tork-14.0.0.spec)3
-rw-r--r--redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec117
-rw-r--r--redhat/applications/twin-style-crystal/twin-style-crystal.spec (renamed from redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec)2
-rw-r--r--redhat/applications/wlassistant/wlassistant-3.5.13.2.spec140
-rw-r--r--redhat/applications/wlassistant/wlassistant.spec (renamed from redhat/applications/wlassistant/wlassistant-14.0.0.spec)31
-rw-r--r--redhat/applications/yakuake/yakuake-3.5.13.2.spec114
-rw-r--r--redhat/applications/yakuake/yakuake.spec2
-rwxr-xr-xredhat/build/build_rpm_package.sh4
-rwxr-xr-xredhat/build/configure_repository.sh2
-rwxr-xr-xredhat/build/gather_rpm_sources.sh4
-rwxr-xr-xredhat/build/get_installed_package_version.sh2
-rwxr-xr-xredhat/build/get_latest_built_package_filename.sh2
-rwxr-xr-xredhat/build/get_latest_built_package_version.sh21
-rwxr-xr-xredhat/build/get_latest_tarball_filename.sh38
-rwxr-xr-xredhat/build/get_latest_tarball_version.sh2
-rwxr-xr-xredhat/build/get_rpm_package_name.sh14
-rwxr-xr-xredhat/build/get_source_files.sh2
-rwxr-xr-xredhat/build/get_spec_version.sh2
-rwxr-xr-xredhat/build/get_specfile.sh2
-rwxr-xr-xredhat/build/install_rpm_package.sh2
-rwxr-xr-xredhat/build/is_latest_package_built.sh14
-rwxr-xr-xredhat/build/is_latest_package_installed.sh4
-rwxr-xr-xredhat/build/update_repository.sh2
-rw-r--r--redhat/dependencies/akode/akode-3.5.13.2.spec350
-rw-r--r--redhat/dependencies/akode/akode.spec (renamed from redhat/dependencies/akode/akode-14.0.0.spec)2
-rw-r--r--redhat/dependencies/arts/arts-3.5.13.2.spec312
-rw-r--r--redhat/dependencies/arts/arts.spec (renamed from redhat/dependencies/arts/arts-14.0.0.spec)7
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec245
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt.spec (renamed from redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec)2
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec183
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec (renamed from redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec)2
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch44
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec194
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt.spec (renamed from redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec)2
-rw-r--r--redhat/dependencies/libart-lgpl/libart-lgpl.spec (renamed from redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec)48
-rw-r--r--redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch193
-rw-r--r--redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec195
-rw-r--r--redhat/dependencies/libcaldav/libcaldav.spec (renamed from redhat/dependencies/libcaldav/libcaldav-14.0.0.spec)61
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch164
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec195
-rw-r--r--redhat/dependencies/libcarddav/libcarddav.spec (renamed from redhat/dependencies/libcarddav/libcarddav-14.0.0.spec)59
-rw-r--r--redhat/dependencies/libr/libr.spec180
-rw-r--r--redhat/dependencies/python-tqt/python-tqt.spec (renamed from redhat/dependencies/python-tqt/python-tqt-14.0.0.spec)19
-rw-r--r--redhat/dependencies/qt3/assistant3.desktop9
-rw-r--r--redhat/dependencies/qt3/designer3.desktop11
-rw-r--r--redhat/dependencies/qt3/linguist3.desktop10
-rwxr-xr-xredhat/dependencies/qt3/qt.csh33
-rwxr-xr-xredhat/dependencies/qt3/qt.sh32
-rw-r--r--redhat/dependencies/qt3/qt3-3.5.13.2.patch516
-rw-r--r--redhat/dependencies/qt3/qt3-3.5.13.2.spec561
-rw-r--r--redhat/dependencies/qt3/qtconfig3.desktop9
-rw-r--r--redhat/dependencies/sip4-tqt/sip4-tqt.spec (renamed from redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec)28
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec122
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls.spec (renamed from redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec)24
-rw-r--r--redhat/dependencies/tqca/tqca-3.5.13.2.spec164
-rw-r--r--redhat/dependencies/tqca/tqca.spec (renamed from redhat/dependencies/tqca/tqca-14.0.0.spec)45
-rw-r--r--redhat/dependencies/tqscintilla/tqscintilla.spec (renamed from redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec)8
-rw-r--r--redhat/dependencies/tqt3/tqassistant.desktop13
-rw-r--r--redhat/dependencies/tqt3/tqdesigner.desktop78
-rw-r--r--redhat/dependencies/tqt3/tqlinguist.desktop26
-rw-r--r--redhat/dependencies/tqt3/tqt3.spec82
-rw-r--r--redhat/dependencies/tqt3/tqtconfig.desktop13
-rw-r--r--redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec270
-rw-r--r--redhat/dependencies/tqtinterface/tqtinterface.spec (renamed from redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec)12
-rwxr-xr-xredhat/docker/build.sh15
-rw-r--r--redhat/docker/el5/Dockerfile.i6862
-rw-r--r--redhat/docker/el5/Dockerfile.x86_642
-rw-r--r--redhat/docker/el5/packages.trinity1
-rw-r--r--redhat/docker/el6/Dockerfile.i68660
-rw-r--r--redhat/docker/el6/Dockerfile.x86_6464
-rw-r--r--redhat/docker/el6/centos-6.repo30
-rw-r--r--redhat/docker/el6/epel-6.repo5
-rw-r--r--redhat/docker/el6/packages (renamed from redhat/docker/el6/packages.trinity)29
-rw-r--r--redhat/docker/el6/packages.base7
-rw-r--r--redhat/docker/el6/repoforge-6.repo5
-rw-r--r--redhat/docker/el7/Dockerfile.x86_6453
-rw-r--r--redhat/docker/el7/packages15
-rw-r--r--redhat/docker/el8/Dockerfile.x86_6497
-rw-r--r--redhat/docker/el8/centos-devel.repo12
-rw-r--r--redhat/docker/el8/packages205
-rw-r--r--redhat/docker/el8/rpmbuild.repo11
-rw-r--r--redhat/docker/el8/rpmmacros3
-rw-r--r--redhat/docker/f25/Dockerfile.x86_642
-rw-r--r--redhat/docker/f25/packages1
-rw-r--r--redhat/docker/f26/Dockerfile.i6862
-rw-r--r--redhat/docker/f26/Dockerfile.x86_642
-rw-r--r--redhat/docker/f26/packages1
-rw-r--r--redhat/docker/f27/Dockerfile.i6862
-rw-r--r--redhat/docker/f27/Dockerfile.x86_642
-rw-r--r--redhat/docker/f27/packages1
-rw-r--r--redhat/docker/f28/Dockerfile.i6862
-rw-r--r--redhat/docker/f28/Dockerfile.x86_642
-rw-r--r--redhat/docker/f28/packages1
-rw-r--r--redhat/docker/f29/Dockerfile.i6862
-rw-r--r--redhat/docker/f29/Dockerfile.x86_642
-rw-r--r--redhat/docker/f29/packages1
-rw-r--r--redhat/docker/f30/Dockerfile.i68629
-rw-r--r--redhat/docker/f30/Dockerfile.x86_6429
-rw-r--r--redhat/docker/f30/packages (renamed from redhat/packages.f24)31
-rw-r--r--redhat/docker/f30/rpmbuild.repo11
-rw-r--r--redhat/docker/f30/rpmmacros3
-rw-r--r--redhat/docker/f31/Dockerfile.x86_6429
-rw-r--r--redhat/docker/f31/packages (renamed from redhat/packages.f23)37
-rw-r--r--redhat/docker/f31/rpmbuild.repo11
-rw-r--r--redhat/docker/f31/rpmmacros3
-rw-r--r--redhat/docker/f32/Dockerfile.x86_6428
-rw-r--r--redhat/docker/f32/packages (renamed from redhat/packages.f21)79
-rw-r--r--redhat/docker/f32/rpmbuild.repo11
-rw-r--r--redhat/docker/f32/rpmmacros3
-rw-r--r--redhat/docker/mga5/Dockerfile.x86_642
-rw-r--r--redhat/docker/mga6/Dockerfile.i68654
-rw-r--r--redhat/docker/mga6/Dockerfile.x86_6454
-rw-r--r--redhat/docker/mga6/packages.i68621
-rw-r--r--redhat/docker/mga6/packages.x86_6420
-rw-r--r--redhat/docker/mga6/rpmmacros1
-rw-r--r--redhat/docker/mga7/Dockerfile.i68644
-rw-r--r--redhat/docker/mga7/Dockerfile.x86_6444
-rw-r--r--redhat/docker/mga7/packages.i686 (renamed from redhat/packages.mga)163
-rw-r--r--redhat/docker/mga7/packages.x86_64 (renamed from redhat/packages.mga4)112
-rw-r--r--redhat/docker/mga7/rpmmacros4
-rwxr-xr-xredhat/docker/opensuse32.sh43
-rw-r--r--redhat/docker/oss131/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss132/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss150/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss151/Dockerfile.x86_6423
-rw-r--r--redhat/docker/oss151/packages (renamed from redhat/packages.oss123)121
-rw-r--r--redhat/docker/oss151/rpmmacros3
-rw-r--r--redhat/docker/oss152/Dockerfile.x86_6425
-rw-r--r--redhat/docker/oss152/packages (renamed from redhat/packages.oss)126
-rw-r--r--redhat/docker/oss152/rpmmacros3
-rw-r--r--redhat/docker/oss421/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss422/Dockerfile.x86_642
-rw-r--r--redhat/docker/oss423/Dockerfile.x86_642
-rw-r--r--redhat/docker/osstw/Dockerfile.i68628
-rw-r--r--redhat/docker/osstw/Dockerfile.x86_6428
-rw-r--r--redhat/docker/osstw/packages39
-rw-r--r--redhat/docker/osstw/rpmmacros1
-rw-r--r--redhat/docker/pclinuxos.pkg37
-rwxr-xr-xredhat/docker/pclinuxos.sh6
-rw-r--r--redhat/docker/pclinuxos/Dockerfile.x86_6448
-rw-r--r--redhat/docker/pclinuxos/packages.x86_6423
-rw-r--r--redhat/docker/pclinuxos/rpmmacros4
-rwxr-xr-xredhat/docker/pull.sh2
-rwxr-xr-xredhat/docker/push.sh2
-rwxr-xr-xredhat/docker/remove.sh2
-rwxr-xr-xredhat/docker/run.sh10
-rw-r--r--redhat/libraries/kipi-plugins/kipi-plugins.spec2
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec165
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw.spec (renamed from redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec)2
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec155
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2.spec (renamed from redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec)68
-rw-r--r--redhat/libraries/libkipi/libkipi-3.5.13.2.spec167
-rw-r--r--redhat/libraries/libkipi/libkipi.spec (renamed from redhat/libraries/libkipi/libkipi-14.0.0.spec)73
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec514
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel.spec (renamed from redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec)16
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap.spec (renamed from redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec)89
-rw-r--r--redhat/libraries/libtqt-perl/libtqt-perl.spec (renamed from redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec)4
-rw-r--r--redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch41
-rw-r--r--redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch11
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec225
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions.spec (renamed from redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec)32
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch56
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch11
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec186
-rw-r--r--redhat/libraries/python-trinity/python-trinity.spec (renamed from redhat/libraries/python-trinity/python-trinity-14.0.0.spec)20
-rw-r--r--redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec1492
-rw-r--r--redhat/main/tde-i18n/tde-i18n.spec (renamed from redhat/main/tde-i18n/tde-i18n-14.0.0.spec)4
-rw-r--r--redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec583
-rw-r--r--redhat/main/tdeaccessibility/tdeaccessibility.spec (renamed from redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec)4
-rw-r--r--redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec735
-rw-r--r--redhat/main/tdeaddons/tdeaddons.spec (renamed from redhat/main/tdeaddons/tdeaddons-14.0.0.spec)29
-rw-r--r--redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec538
-rw-r--r--redhat/main/tdeadmin/tdeadmin.spec8
-rw-r--r--redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec744
-rw-r--r--redhat/main/tdeartwork/tdeartwork.spec (renamed from redhat/main/tdeartwork/tdeartwork-14.0.0.spec)4
l---------redhat/main/tdebase/pamd.kcheckpass-trinity.el81
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc295
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc15)0
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc16)0
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc32 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc17)0
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga25
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga35
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga45
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc18)0
l---------redhat/main/tdebase/pamd.kcheckpass-trinity.pclos1
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc19)0
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc20)0
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc21)0
l---------redhat/main/tdebase/pamd.kdm-trinity-np.el81
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc1515
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc1615
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc1715
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2116
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2216
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2316
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2416
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2516
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2616
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2716
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2816
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2916
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc30 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.fc18)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc31 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.fc19)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc32 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.fc20)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.mga210
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.mga411
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.mga7 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.mga3)0
l---------redhat/main/tdebase/pamd.kdm-trinity-np.pclos1
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.pclos20127
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.pclos20137
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.pclos20147
l---------redhat/main/tdebase/pamd.kdm-trinity.el81
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc1518
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc1618
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc1718
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc1819
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc1919
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2019
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2119
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2221
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2321
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2723
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2823
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2923
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc30 (renamed from redhat/main/tdebase/pamd.kdm-trinity.fc24)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc31 (renamed from redhat/main/tdebase/pamd.kdm-trinity.fc25)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc32 (renamed from redhat/main/tdebase/pamd.kdm-trinity.fc26)0
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.mga213
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.mga313
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.mga7 (renamed from redhat/main/tdebase/pamd.kdm-trinity.mga4)2
l---------redhat/main/tdebase/pamd.kdm-trinity.pclos1
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.pclos20128
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.pclos20138
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.pclos20148
l---------redhat/main/tdebase/pamd.kscreensaver-trinity.el81
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc155
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc165
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc175
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc185
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc195
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc205
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc215
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc225
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc235
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc245
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc255
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc265
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc275
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc285
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc295
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc22)0
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc23)0
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc32 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc24)0
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga25
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga35
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga45
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc25)0
l---------redhat/main/tdebase/pamd.kscreensaver-trinity.pclos1
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc26)0
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc27)0
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.fc28)0
-rw-r--r--redhat/main/tdebase/tdebase-3.5.13.2.spec3886
-rw-r--r--redhat/main/tdebase/tdebase.spec168
-rw-r--r--redhat/main/tdebase/tdm.el6.ppbin915 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.el6.te2
-rw-r--r--redhat/main/tdebase/tdm.el7.ppbin931 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.el7.te2
-rw-r--r--redhat/main/tdebase/tdm.el8.te11
-rw-r--r--redhat/main/tdebase/tdm.fc17.ppbin936 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc17.te13
-rw-r--r--redhat/main/tdebase/tdm.fc18.ppbin936 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc18.te11
-rw-r--r--redhat/main/tdebase/tdm.fc19.ppbin936 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc19.te11
-rw-r--r--redhat/main/tdebase/tdm.fc20.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc21.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc22.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc23.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc24.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc25.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc26.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc27.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc28.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc29.ppbin932 -> 0 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc30.te (renamed from redhat/main/tdebase/tdm.fc21.te)2
-rw-r--r--redhat/main/tdebase/tdm.fc31.te (renamed from redhat/main/tdebase/tdm.fc22.te)2
-rw-r--r--redhat/main/tdebase/tdm.fc32.te (renamed from redhat/main/tdebase/tdm.fc20.te)2
-rw-r--r--redhat/main/tdebase/tdm.service.el712
-rw-r--r--redhat/main/tdebase/tdm.service.fc1813
-rw-r--r--redhat/main/tdebase/tdm.service.fc1913
-rw-r--r--redhat/main/tdebase/tdm.service.fc2012
-rw-r--r--redhat/main/tdebase/tdm.service.fc2112
-rw-r--r--redhat/main/tdebase/tdm.service.fc2212
-rw-r--r--redhat/main/tdebase/tdm.service.fc2312
-rw-r--r--redhat/main/tdebase/tdm.service.fc2412
-rw-r--r--redhat/main/tdebase/tdm.service.fc2512
-rw-r--r--redhat/main/tdebase/tdm.service.fc2612
-rw-r--r--redhat/main/tdebase/tdm.service.fc2712
-rw-r--r--redhat/main/tdebase/tdm.service.fc2812
-rw-r--r--redhat/main/tdebase/tdm.service.fc2912
-rw-r--r--redhat/main/tdebindings/filter-requires.sh9
-rw-r--r--redhat/main/tdebindings/tdebindings-3.5.13.2.spec1195
-rw-r--r--redhat/main/tdebindings/tdebindings.spec (renamed from redhat/main/tdebindings/tdebindings-14.0.0.spec)72
-rw-r--r--redhat/main/tdeedu/tdeedu-3.5.13.2.spec1367
-rw-r--r--redhat/main/tdeedu/tdeedu.spec (renamed from redhat/main/tdeedu/tdeedu-14.0.0.spec)168
-rw-r--r--redhat/main/tdegames/tdegames-3.5.13.2.spec1647
-rw-r--r--redhat/main/tdegames/tdegames.spec (renamed from redhat/main/tdegames/tdegames-14.0.0.spec)21
-rw-r--r--redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec1332
-rw-r--r--redhat/main/tdegraphics/tdegraphics.spec (renamed from redhat/main/tdegraphics/tdegraphics-14.0.0.spec)14
-rw-r--r--redhat/main/tdelibs/tdelibs-14.0.1.patch31
-rw-r--r--redhat/main/tdelibs/tdelibs-14.1.0.patch13
-rw-r--r--redhat/main/tdelibs/tdelibs-3.5.13.2.spec581
-rw-r--r--redhat/main/tdelibs/tdelibs.spec23
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec1145
l---------redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec1
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec1336
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia.spec (renamed from redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec)13
-rw-r--r--redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec1308
-rw-r--r--redhat/main/tdenetwork/tdenetwork.spec (renamed from redhat/main/tdenetwork/tdenetwork-14.0.0.spec)39
-rw-r--r--redhat/main/tdepim/tdepim-14.0.0.patch90
-rw-r--r--redhat/main/tdepim/tdepim-3.5.13.2.spec2366
-rw-r--r--redhat/main/tdepim/tdepim.spec30
-rw-r--r--redhat/main/tdesdk/tdesdk-3.5.13.2.spec1250
-rw-r--r--redhat/main/tdesdk/tdesdk.spec (renamed from redhat/main/tdesdk/tdesdk-14.0.0.spec)28
-rw-r--r--redhat/main/tdetoys/tdetoys-3.5.13.2.spec430
-rw-r--r--redhat/main/tdetoys/tdetoys.spec2
-rw-r--r--redhat/main/tdeutils/tdeutils-3.5.13.2.spec1063
-rw-r--r--redhat/main/tdeutils/tdeutils.spec26
-rw-r--r--redhat/main/tdevelop/tdevelop-3.5.13.2.spec659
-rw-r--r--redhat/main/tdevelop/tdevelop.spec (renamed from redhat/main/tdevelop/tdevelop-14.0.0.spec)12
-rw-r--r--redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec552
-rw-r--r--redhat/main/tdewebdev/tdewebdev.spec (renamed from redhat/main/tdewebdev/tdewebdev-14.0.0.spec)6
-rw-r--r--redhat/notes.txt72
-rw-r--r--redhat/packages.f20203
-rw-r--r--redhat/packages.f22200
-rw-r--r--redhat/packages.fedora203
565 files changed, 4232 insertions, 51843 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile
index b2a3480bd..76bc9bf25 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile
@@ -1,7 +1,9 @@
SHELL := /bin/bash
PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.5})
+TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.7})
+TDE_GIT_DIR := $(shell cd ../../tde; pwd)
TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd)
+RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))"
DIST := $(shell rpm -E %dist)
buildpkg = \
@@ -21,43 +23,40 @@ buildpkg = \
echo
-all: dependencies main libraries applications i18n meta extras
-dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt
+all: dependencies main libraries applications i18n meta
+dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications: abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc kxmleditor mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tastymenu tdedocker tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
+applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kompose koverartist kpacman mathemagics png2qrgb
+extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb
### Trinity Dependencies
akode: tqtinterface trinity-filesystem
$(call buildpkg,dependencies/akode)
-arts: tqtinterface trinity-filesystem esound cmake
+arts: tqtinterface trinity-filesystem esound
$(call buildpkg,dependencies/arts)
-avahi-tqt: tqtinterface autoconf automake libtool2
+avahi-tqt: tqtinterface
$(call buildpkg,dependencies/avahi-tqt)
-dbus-1-tqt: tqtinterface cmake
+dbus-1-tqt: tqtinterface
$(call buildpkg,dependencies/dbus-1-tqt)
-dbus-tqt: tqtinterface cmake
+dbus-tqt: tqtinterface
$(call buildpkg,dependencies/dbus-tqt)
-libart_lgpl: tqtinterface libtool2
+libart_lgpl: tqtinterface
$(call buildpkg,dependencies/libart-lgpl)
-libcaldav: tqtinterface autoconf libcurl
+libcaldav: tqtinterface
$(call buildpkg,dependencies/libcaldav)
-libcarddav: tqtinterface autoconf libcurl
+libcarddav: tqtinterface
$(call buildpkg,dependencies/libcarddav)
-libr:
- $(call buildpkg,dependencies/libr)
-
python-tqt: sip4-tqt tdelibs tqscintilla
$(call buildpkg,dependencies/python-tqt)
@@ -76,7 +75,7 @@ tqscintilla: tqca-tls tdelibs
tqt3:
$(call buildpkg,dependencies/tqt3)
-tqtinterface: tqt3 cmake
+tqtinterface: tqt3
$(call buildpkg,dependencies/tqtinterface)
# Main packages
@@ -92,7 +91,7 @@ tdeadmin: tdebase
tdeartwork: tdebase
$(call buildpkg,main/tdeartwork)
-tdebase: tdelibs cmake htdig fileshareset
+tdebase: tdelibs htdig fileshareset
$(call buildpkg,main/tdebase)
tdebindings: tdebase tqscintilla
@@ -104,11 +103,10 @@ tdeedu: tdebase
tdegames: tdebase tdemultimedia
$(call buildpkg,main/tdegames)
-tdegraphics: tdebase poppler cmake lcms
+tdegraphics: tdebase lcms
$(call buildpkg,main/tdegraphics)
-tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl file
- [ -x /usr/libexec/utempter/utempter ] && sudo chmod a+r /usr/libexec/utempter/utempter || :
+tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl
$(call buildpkg,main/tdelibs)
tdemultimedia: tdebase akode
@@ -117,10 +115,10 @@ tdemultimedia: tdebase akode
tdenetwork: tdebase rdesktop
$(call buildpkg,main/tdenetwork)
-tdepim: tdebase libcaldav libcarddav cmake dirmngr
+tdepim: tdebase libcaldav libcarddav
$(call buildpkg,main/tdepim)
-tdesdk: tdebase tdebindings cmake
+tdesdk: tdebase tdebindings
$(call buildpkg,main/tdesdk)
tdetoys: tdebase
@@ -129,147 +127,48 @@ tdetoys: tdebase
tdeutils: tdebase
$(call buildpkg,main/tdeutils)
-tdevelop: tdebase tdesdk cmake tar
+tdevelop: tdebase tdesdk
$(call buildpkg,main/tdevelop)
tdewebdev: tdebase tdesdk
$(call buildpkg,main/tdewebdev)
### 3rd party libraries and tools
-autoconf: m4
-# Build on CentOS 5 only
-ifneq (,$(filter $(DIST),.el5 .el6))
- $(call buildpkg,3rdparty/autoconf)
-endif
-
-automake:
-# Build on CentOS 5 only
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/automake)
-endif
-
-cmake:
-# Build on CentOS 5 only
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/cmake)
-endif
-
-cscope:
-# Build on PCLOS only
-ifneq ($(wildcard /etc/pclinuxos-release),)
- $(call buildpkg,3rdparty/cscope)
-endif
-
-dirmngr:
-# Build on CentOS >= 7
-ifneq ($(wildcard /boot/vmlinuz*.el7*),)
- $(call buildpkg,3rdparty/dirmngr)
+brp-check-trinity:
+ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw ))
+ $(call buildpkg,3rdparty/brp-check-trinity)
endif
esound:
-# Build on Mageia, Fedora >= 23, Opensuse >= 15.0
-ifneq (,$(filter $(DIST),.mga5 .mga6 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .osstw))
+ifneq (,$(filter $(DIST), .el8 .mga6 .mga7 .oss151 .oss152 .osstw ))
$(call buildpkg,3rdparty/esound)
endif
-file:
-# Build on CentOS 5
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/file)
-endif
-
-gmime:
-# Build on CentOS 6
-ifneq (,$(filter $(DIST),.el6))
- $(call buildpkg,3rdparty/gmime)
-endif
-
-intltool:
-# Build on CentOS 5
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/intltool)
-endif
-
-gnuchess:
-# Build on CentOS 5
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/gnuchess)
-endif
-
htdig:
-# build on Mageia, and CentOS >= 7
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
+ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 ))
$(call buildpkg,extras/htdig)
endif
imlib1:
-# Do NOT build on Fedora, nor CentOS, nor PCLOS
-ifeq ($(wildcard /etc/fedora-release),)
-ifeq (,$(filter $(DIST),.el5 .el6 .el7))
+ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw ))
$(call buildpkg,3rdparty/imlib1)
endif
-endif
lcms:
-# Build on EL7, OSS150, OSSTW
-ifneq (,$(filter $(DIST),.el7 .oss150 .osstw))
+ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .oss151 .oss152 .osstw ))
$(call buildpkg,3rdparty/lcms)
endif
-libcurl: automake libtool2
-# Build on CentOS 5 only
-ifneq (,$(filter $(DIST),.el4))
- $(call buildpkg,3rdparty/curl)
-endif
-
-libtool2: autoconf automake
-# Build on CentOS 5 only
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/libtool2)
-endif
-
-lilypond: mftrace
-# Build on CentOS 6 only
-ifneq (,$(filter $(DIST),.el6))
- $(call buildpkg,3rdparty/lilypond)
-endif
-
-m4:
-# Build on CentOS 5 and CentOS 6 only (vendor-provided m4 is too old)
-ifneq (,$(filter $(DIST),.el5 .el6))
- $(call buildpkg,3rdparty/m4)
-endif
-
-mftrace:
-# Build on CentOS 6 only
-ifneq (,$(filter $(DIST),.el6))
- $(call buildpkg,3rdparty/mftrace)
-endif
+libbeagle:
+ $(call buildpkg,3rdparty/libbeagle)
mp4v2:
-# Build on OpenSUSE only
-ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw))
+ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw ))
$(call buildpkg,3rdparty/mp4v2)
endif
-pcsc-perl:
-# Build on CentOS 5
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/pcsc-perl)
-endif
-
-poppler:
-# Build on CentOS 5 only (vendor-provided Poppler is too old)
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/poppler)
-endif
-
-python-qt3: tdelibs sip
- $(call buildpkg,3rdparty/python-qt3)
-
rdesktop:
-# Build on OpenSUSE >= 15.0 only
-ifneq (,$(filter $(DIST),.oss150))
+ifneq (,$(filter $(DIST), .oss150 ))
$(call buildpkg,3rdparty/rdesktop)
endif
@@ -280,46 +179,16 @@ ifneq ($(wildcard /etc/pclinuxos-release),)
endif
recode:
-# Build on OpenSUSE >= 15.0 only
-ifneq (,$(filter $(DIST),.oss150 .osstw))
+# Build on OpenSUSE >= 15.0 only (not tw)
+ifneq (,$(filter $(DIST),.oss150 .oss151))
$(call buildpkg,3rdparty/recode)
endif
-sip:
-# Build on CentOS 5 only (vendor-provided SIP is too old)
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/sip)
-endif
-
-sword:
-# Build on CentOS 5 only
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/sword)
-endif
-
-tar:
-# Build on CentOS 5 only (vendor-provided TAR is too old)
-ifneq (,$(filter $(DIST),.el5))
- $(call buildpkg,3rdparty/tar)
-endif
-
-torsocks:
-# Build on opensuse
-ifneq (,$(filter $(DIST), .oss))
- $(call buildpkg,3rdparty/torsocks)
-endif
-
wv2:
-# Do NOT build on Mageia or openSUSE or PCLINUXOS
-ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos .pclos2018))
+ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 ))
$(call buildpkg,3rdparty/wv2)
endif
-### Extra packages
-cmake-macros: cmake
-ifneq ($(wildcard /etc/SuSE-release),)
- $(call buildpkg,extras/trinity-cmake-macros)
-endif
### Trinity Libraries
kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
@@ -328,7 +197,7 @@ kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
libkdcraw: tqtinterface lcms
$(call buildpkg,libraries/libkdcraw)
-libkexiv2: tqtinterface
+libkexiv2: tqtinterface tdelibs
$(call buildpkg,libraries/libkexiv2)
libkipi: tqtinterface
@@ -359,15 +228,18 @@ abakus: tdebase
adept: tdebase
$(call buildpkg,applications/adept)
-amarok: tdebase cmake mp4v2
+amarok: tdebase mp4v2
$(call buildpkg,applications/amarok)
basket: tdebase tdepim
$(call buildpkg,applications/basket)
-bibletime: tdebase sword
+bibletime: tdebase
$(call buildpkg,applications/bibletime)
+codeine: tdebase
+ $(call buildpkg,applications/codeine)
+
compizconfig-backend-kconfig: tdebase
$(call buildpkg,applications/compizconfig-backend-kconfig)
@@ -390,13 +262,11 @@ fusion-icon: tdebase
$(call buildpkg,applications/fusion-icon)
gtk3-tqt-engine: tdebase
-# Do NOT build on CentOS 5, CentOS 6
ifeq (,$(filter $(DIST),.el5 .el6))
$(call buildpkg,applications/gtk3-tqt-engine)
endif
gtk-qt-engine: tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/gtk-qt-engine)
endif
@@ -405,16 +275,10 @@ gwenview: tdebase
$(call buildpkg,applications/gwenview)
k3b: tdebase
-# Do NOT build on CentOS 5 (No TDE HWLIB support)
-ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/k3b)
-endif
k9copy: tdebase k3b
-# Do NOT build on CentOS 5 (No K3B)
-ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/k9copy)
-endif
kaffeine: tdebase
$(call buildpkg,applications/kaffeine)
@@ -450,22 +314,13 @@ kcmautostart: tdebase
$(call buildpkg,applications/kcmautostart)
kcmldap: tdebase libtdeldap
-# Do NOT build on CentOS 5
-ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/kcmldap)
-endif
kcmldapcontroller: tdebase kcmldap
-# Do NOT build on CentOS 5
-ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/kcmldapcontroller)
-endif
kcmldapmanager: tdebase kcmldap
-# Do NOT build on CentOS 5
-ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/kcmldapmanager)
-endif
kcpuload: tdebase
$(call buildpkg,applications/kcpuload)
@@ -489,10 +344,7 @@ keep: tdebase rdiff-backup
$(call buildpkg,applications/keep)
kerberostray: tdebase
-# Do NOT build on CentOS 5
-ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/kerberostray)
-endif
keximdb: tdebase koffice
$(call buildpkg,applications/keximdb)
@@ -501,22 +353,13 @@ kftpgrabber: tdebase
$(call buildpkg,applications/kftpgrabber)
kgtk-qt3: tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
-# Do NOT build on CentOS >=7 (GTK2 is too new)
-# Do NOT build on Fedora >= 20 (GTK2 is too new)
-# Do NOT build on Mageia >= 4 (GTK2 is too new)
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc20* /boot/vmlinuz*.mga4*),)
$(call buildpkg,applications/kgtk-qt3)
-endif
kile: tdebase
$(call buildpkg,applications/kile)
kima: tdebase
-# Not on RHEL5
-ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/kima)
-endif
kiosktool: tdebase
$(call buildpkg,applications/kiosktool)
@@ -546,12 +389,11 @@ knetstats: tdebase
$(call buildpkg,applications/knetstats)
knetworkmanager8: tdebase
-# RHEL6 only
ifneq (,$(filter $(DIST),.el6))
$(call buildpkg,applications/knetworkmanager8)
endif
-knights: tdebase gnuchess
+knights: tdebase
$(call buildpkg,applications/knights)
knmap: tdebase
@@ -579,13 +421,7 @@ kpicosim: tdebase
$(call buildpkg,applications/kpicosim)
kpilot: tdebase tdepim
-# Do NOT build on CentOS 5 (pilot-link library is too old)
-ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/kpilot)
-endif
-
-kplayer: tdebase
- $(call buildpkg,applications/kplayer)
kpowersave: tdebase
$(call buildpkg,applications/kpowersave)
@@ -599,13 +435,13 @@ krename: tdebase
krusader: tdebase tdebindings
$(call buildpkg,applications/krusader)
-kscope: tdebase cscope
+kscope: tdebase
$(call buildpkg,applications/kscope)
ksensors: tdebase
$(call buildpkg,applications/ksensors)
-kshowmail: tdebase
+kshowmail: tdebase tdepim
$(call buildpkg,applications/kshowmail)
kshutdown: tdebase
@@ -629,9 +465,6 @@ ktechlab: tdebase
ktorrent: tdebase
$(call buildpkg,applications/ktorrent)
-kuickshow: tdebase imlib1
- $(call buildpkg,applications/kuickshow)
-
kvirc: tdebase
$(call buildpkg,applications/kvirc)
@@ -644,6 +477,9 @@ kvpnc: tdebase
kxmleditor: tdebase
$(call buildpkg,applications/kxmleditor)
+mathemagics: tdebase
+ $(call buildpkg,applications/mathemagics)
+
mplayerthumbs: tdebase
$(call buildpkg,applications/mplayerthumbs)
@@ -653,25 +489,20 @@ piklab: tdebase
potracegui: tdebase
$(call buildpkg,applications/potracegui)
-qalculate-tde: tdebase
-# Do NOT build on CentOS 5, CentOS 6
-ifeq (,$(filter $(DIST),.el5 .el6))
+qalculate-tde:
$(call buildpkg,applications/qalculate-tde)
-endif
qt4-tqt-theme-engine: tdebase
-# Do NOT build on CentOS 5, CentOS 6
-ifeq (,$(filter $(DIST),.el5 .el6))
+ifeq (,$(filter $(DIST),.el5 .el6 .el8 .osstw))
$(call buildpkg,applications/qt4-tqt-theme-engine)
endif
-rosegarden: tdebase lilypond
-# Do NOT build on CentOS 5, CentOS 7
-ifeq (,$(filter $(DIST),.el5 .el7))
+rosegarden: tdebase
+ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8))
$(call buildpkg,applications/rosegarden)
endif
-smartcardauth: tdebase pcsc-perl
+smartcardauth: tdebase
$(call buildpkg,applications/smartcardauth)
smb4k: tdebase
@@ -680,7 +511,7 @@ smb4k: tdebase
soundkonverter: tdebase
$(call buildpkg,applications/soundkonverter)
-tastymenu: tdebase pytdeextensions
+tastymenu:
$(call buildpkg,applications/tastymenu)
tdedocker: tdebase
@@ -695,26 +526,24 @@ tdeio-apt: tdebase
tdeio-ftps: tdebase
$(call buildpkg,applications/tdeio-ftps)
-tdeio-gopher: tdebase
- $(call buildpkg,applications/tdeio-gopher)
-
tdeio-locate: tdebase
$(call buildpkg,applications/tdeio-locate)
-tdeio-sword: tdebase sword
+tdeio-sword: tdebase
$(call buildpkg,applications/tdeio-sword)
tdeio-umountwrapper: tdebase
$(call buildpkg,applications/tdeio-umountwrapper)
tdenetworkmanager: tdebase
-# Do NOT build on CentOS 5, CentOS 6
ifeq (,$(filter $(DIST),.el5 .el6))
$(call buildpkg,applications/tdenetworkmanager)
endif
+tdepacman: tdebase
+ $(call buildpkg,applications/tdepacman)
+
tdepowersave: tdebase
-# Do NOT build on CentOS 5
ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/tdepowersave)
endif
@@ -722,13 +551,13 @@ endif
tderadio: tdebase
$(call buildpkg,applications/tderadio)
-tde-style-baghira: tdebase
+tde-style-baghira: tdebase
$(call buildpkg,applications/tde-style-baghira)
-tde-style-domino: tdebase
+tde-style-domino: tdebase
$(call buildpkg,applications/tde-style-domino)
-tde-style-ia-ora: tdebase
+tde-style-ia-ora: tdebase
$(call buildpkg,applications/tde-style-ia-ora)
tde-style-lipstik: tdebase
@@ -749,13 +578,10 @@ tde-systemsettings: tdebase
tdmtheme: tdebase
$(call buildpkg,applications/tdmtheme)
-tellico: tdebase tdemultimedia
-# Do NOT build on CentOS 5
-ifeq (,$(filter $(DIST),.el5))
+tellico: tdebase tdegraphics tdemultimedia tdepim
$(call buildpkg,applications/tellico)
-endif
-tork: tdebase torsocks
+tork: tdebase
$(call buildpkg,applications/tork)
twin-style-crystal: tdebase
@@ -772,15 +598,12 @@ gwenview-i18n: tdebase
$(call buildpkg,applications/gwenview-i18n)
k3b-i18n: tdebase
-# Do NOT build on CentOS 5
-ifeq (,$(filter $(DIST),.el5))
$(call buildpkg,applications/k3b-i18n)
-endif
koffice-i18n: tdebase
$(call buildpkg,applications/koffice-i18n)
-tde-i18n: tdebase cmake
+tde-i18n: tdebase
$(call buildpkg,tde-i18n)
### Meta packages
@@ -792,9 +615,7 @@ celestia:
$(call buildpkg,extras/celestia)
fileshareset:
-ifeq ($(wildcard /boot/vmlinuz*.mga6*),)
$(call buildpkg,extras/fileshareset)
-endif
icons-crystalsvg-updated:
$(call buildpkg,extras/icons-crystalsvg-updated)
@@ -829,11 +650,8 @@ koverartist:
kpacman:
$(call buildpkg,extras/kpacman)
-mathemagics:
- $(call buildpkg,extras/mathemagics)
-
-pan: gmime intltool
-ifeq (,$(filter $(DIST),.el5 .oss150 .osstw))
+pan: gmime
+ifeq (,$(filter $(DIST),.oss150 .osstw))
$(call buildpkg,3rdparty/pan)
endif
@@ -846,3 +664,15 @@ scribus:
trinity-filesystem:
$(call buildpkg,extras/trinity-filesystem)
+
+# Developers options
+git:
+ cd "$(TDE_GIT_DIR)" && ./scripts/switch_all_submodules_to_head_and_clean anonymous
+
+tarballs:
+ cd "$(TDE_GIT_DIR)" && COMPRESS=pigz SUFFIX=0 ./scripts/create_all_tarballs
+
+
+# External packages
+external:
+ [ -d "${HOME}/rpmbuild/RPMS" ] && cp -rfv "${HOME}/rpmbuild/RPMS/"* "$(RPMDIR)"
diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru
deleted file mode 100644
index 6ec4fa162..000000000
--- a/redhat/Makefile.v3.5.13-sru
+++ /dev/null
@@ -1,569 +0,0 @@
-SHELL := /bin/bash
-PACKAGING_DIR := $(shell cd ..; pwd)
-PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION = 3.5.13.2
-
-buildpkg = \
- @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \
- export PACKAGING_DIR=$(PACKAGING_DIR); \
- if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
- echo " Package '${1}' is not yet installed."; \
- if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
- echo " Building package."; \
- build_rpm_package.sh "$(1)" ${TDE_VERSION} || exit 1; \
- echo " Updating repository."; \
- update_repository.sh ${TDE_VERSION}; \
- fi; \
- echo "Now installing package '$(1)'"; \
- install_rpm_package.sh "$(1)" || exit 2; \
- fi; \
- echo
-
-
-all: dependencies main libraries applications i18n meta extras
-dependencies: qt3 tqtinterface arts libcaldav libcarddav tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode hal
-main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
-libraries: libkdcraw libkexiv2 libkipi libksquirrel pytdeextensions python-trinity
-applications: abakus amarok basket bibletime digikam dolphin filelight gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla katapult kbarcode kbfx kbookreader kchmviewer kcmautostart kcpuload kdbusnotification kdiff3 kdirstat kgtk-qt3 keep kile kima kiosktool kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knowit knutclient koffice konversation kopete-otr kpicosim kpilot kpowersave krename krusader ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd piklab potracegui rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-locate tdeio-umountwrapper tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico twin-style-crystal wlassistant yakuake
-i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-
-
-### Trinity Dependencies
-arts: tqtinterface trinity-filesystem esound cmake
- $(call buildpkg,dependencies/arts)
-
-avahi-tqt: tqtinterface autoconf automake libtool
- $(call buildpkg,dependencies/avahi-tqt)
-
-dbus-1-tqt: tqtinterface cmake
- $(call buildpkg,dependencies/dbus-1-tqt)
-
-dbus-tqt: tqtinterface cmake
- $(call buildpkg,dependencies/dbus-tqt)
-
-libcaldav: tqtinterface autoconf libcurl
- $(call buildpkg,dependencies/libcaldav)
-
-libcarddav: tqtinterface autoconf libcurl
- $(call buildpkg,dependencies/libcarddav)
-
-tqca: tqtinterface
- $(call buildpkg,dependencies/tqca)
-
-tqca-tls: tqtinterface tqca
- $(call buildpkg,dependencies/tqca-tls)
-
-qt3: esound
- $(call buildpkg,dependencies/qt3)
-
-tqtinterface: qt3 cmake
- $(call buildpkg,dependencies/tqtinterface)
-
-# Main packages
-tdeaccessibility: tdebase tdemultimedia
- $(call buildpkg,main/tdeaccessibility)
-
-tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim
- $(call buildpkg,main/tdeaddons)
-
-tdeadmin: tdebase
- $(call buildpkg,main/tdeadmin)
-
-tdeartwork: tdebase
- $(call buildpkg,main/tdeartwork)
-
-tdebase: tdelibs cmake htdig fileshareset hal
- $(call buildpkg,main/tdebase)
-
-tdebindings: tdebase
- $(call buildpkg,main/tdebindings)
-
-tdeedu: tdebase
- $(call buildpkg,main/tdeedu)
-
-tdegames: tdebase tdemultimedia
- $(call buildpkg,main/tdegames)
-
-tdegraphics: tdebase poppler cmake
- $(call buildpkg,main/tdegraphics)
-
-tdelibs: qt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem
- $(call buildpkg,main/tdelibs)
-
-tdemultimedia: tdebase akode
- $(call buildpkg,main/tdemultimedia)
-
-tdenetwork: tdebase
- $(call buildpkg,main/tdenetwork)
-
-tdepim: tdebase libcaldav libcarddav cmake
- $(call buildpkg,main/tdepim)
-
-tdesdk: tdebase tdebindings cmake
- $(call buildpkg,main/tdesdk)
-
-tdetoys: tdebase
- $(call buildpkg,main/tdetoys)
-
-tdeutils: tdebase
- $(call buildpkg,main/tdeutils)
-
-tdevelop: tdebase tdesdk cmake
- $(call buildpkg,main/tdevelop)
-
-tdewebdev: tdebase tdesdk
- $(call buildpkg,main/tdewebdev)
-
-### 3rd party libraries and tools
-autoconf: m4
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/autoconf)
-endif
-
-automake:
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/automake)
-endif
-
-cmake:
-# Build on CentOS 5/6 only
-ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
- $(call buildpkg,3rdparty/cmake)
-endif
-
-esound:
-# Build on Mageia and CentOS >= 7
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
- $(call buildpkg,3rdparty/esound)
-endif
-
-gnuchess:
-# Build on CentOS 5, CentOS 7
-ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),)
- $(call buildpkg,3rdparty/gnuchess)
-endif
-
-hal: hal-info
-# Do NOT build on CentOS 5, CentOS 6
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
- $(call buildpkg,3rdparty/hal)
-endif
-
-hal-info:
-# Do NOT build on CentOS 5, CentOS 6
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
- $(call buildpkg,3rdparty/hal-info)
-endif
-
-htdig:
-# build on Mageia, and CentOS >= 7
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
- $(call buildpkg,extras/htdig)
-endif
-
-imlib1:
-# Do NOT build on Fedora, nor CentOS
-ifeq ($(wildcard /etc/fedora-release),)
-ifeq ($(wildcard /etc/centos-release),)
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/imlib1)
-endif
-endif
-endif
-
-libcurl: automake libtool
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/curl)
-endif
-
-libotr3:
-# Build on Mageia, CentOS >= 7
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
- $(call buildpkg,3rdparty/libotr3)
-endif
-
-libtool: autoconf automake
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/libtool)
-endif
-
-lilypond: mftrace
-# Build on CentOS 6 only
-ifneq ($(wildcard /boot/vmlinuz*.el6*),)
- $(call buildpkg,3rdparty/lilypond)
-endif
-
-m4:
-# Build on CentOS 5 only (vendor-provided m4 is too old)
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/m4)
-endif
-
-mftrace:
-# Build on CentOS 6 only
-ifneq ($(wildcard /boot/vmlinuz*.el6*),)
- $(call buildpkg,3rdparty/mftrace)
-endif
-
-pcsc-perl:
-# Build on CentOS and openSUSE only
-ifneq ($(wildcard /etc/centos-release /etc/SuSE-release /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/pcsc-perl)
-endif
-
-poppler:
-# Build on CentOS 5 only (vendor-provided Poppler is too old)
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/poppler)
-endif
-
-python-qt3: tdelibs sip
- $(call buildpkg,3rdparty/python-qt3)
-
-sip:
-# Build on CentOS 5 only (vendor-provided SIP is too old)
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/sip)
-endif
-
-sword:
-# Build on Fedora >= 20, PCLinuxOS, CentOS >= 7
-ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release /boot/vmlinuz*.el7*),)
- $(call buildpkg,3rdparty/sword)
-endif
-
-wv2:
-# Do NOT build on Mageia or openSUSE or PCLINUXOS
-ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release /etc/pclinuxos-release),)
- $(call buildpkg,3rdparty/wv2)
-endif
-
-### Extra packages
-akode: tqtinterface
- $(call buildpkg,extras/akode)
-
-cmake-macros: cmake
-ifneq ($(wildcard /etc/SuSE-release),)
- $(call buildpkg,extras/trinity-cmake-macros)
-endif
-
-### Trinity Libraries
-kipi-plugins: tqtinterface libkipi
- $(call buildpkg,libraries/kipi-plugins)
-
-libkdcraw: tqtinterface
- $(call buildpkg,libraries/libkdcraw)
-
-libkexiv2: tqtinterface
- $(call buildpkg,libraries/libkexiv2)
-
-libkipi: tqtinterface
- $(call buildpkg,libraries/libkipi)
-
-libksquirrel: tqtinterface
- $(call buildpkg,libraries/libksquirrel)
-
-mlt: tqtinterface
- $(call buildpkg,libraries/mlt)
-
-pytdeextensions: tqtinterface python-trinity
- $(call buildpkg,libraries/pytdeextensions)
-
-python-trinity: tqtinterface python-qt3
- $(call buildpkg,libraries/python-trinity)
-
-### Trinity Applications
-abakus: tdebase
- $(call buildpkg,applications/abakus)
-
-adept: tdebase
- $(call buildpkg,applications/adept)
-
-amarok: tdebase cmake
- $(call buildpkg,applications/amarok)
-
-basket: tdebase
- $(call buildpkg,applications/basket)
-
-bibletime: tdebase sword
- $(call buildpkg,applications/bibletime)
-
-compizconfig-backend-kconfig: tdebase
- $(call buildpkg,applications/compizconfig-backend-kconfig)
-
-desktop-effects-tde: tdebase
- $(call buildpkg,applications/desktop-effects-tde)
-
-digikam: tdebase libkdcraw libkexiv2 libkipi libksquirrel
- $(call buildpkg,applications/digikam)
-
-dolphin: tdebase
- $(call buildpkg,applications/dolphin)
-
-filelight: tdebase
- $(call buildpkg,applications/filelight)
-
-filelight-l10n: tdebase
- $(call buildpkg,applications/filelight-l10n)
-
-fusion-icon: tdebase
- $(call buildpkg,applications/fusion-icon)
-
-gtk-qt-engine: tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,applications/gtk-qt-engine)
-endif
-
-gwenview: tdebase
- $(call buildpkg,applications/gwenview)
-
-k3b: tdebase
- $(call buildpkg,applications/k3b)
-
-k9copy: tdebase k3b
- $(call buildpkg,applications/k9copy)
-
-kaffeine: tdebase
- $(call buildpkg,applications/kaffeine)
-
-kaffeine-mozilla: tdebase kaffeine
- $(call buildpkg,applications/kaffeine-mozilla)
-
-katapult: tdebase
- $(call buildpkg,applications/katapult)
-
-kbarcode: tdebase
- $(call buildpkg,applications/kbarcode)
-
-kbfx: tdebase
- $(call buildpkg,applications/kbfx)
-
-kbookreader: tdebase
- $(call buildpkg,applications/kbookreader)
-
-kchmviewer: tdebase
- $(call buildpkg,applications/kchmviewer)
-
-kcmautostart: tdebase
- $(call buildpkg,applications/kcmautostart)
-
-kcpuload: tdebase
- $(call buildpkg,applications/kcpuload)
-
-kdbusnotification: tdebase
- $(call buildpkg,applications/kdbusnotification)
-
-kdiff3: tdebase
- $(call buildpkg,applications/kdiff3)
-
-kdirstat: tdebase
- $(call buildpkg,applications/kdirstat)
-
-kdpkg: tdebase
- $(call buildpkg,applications/kdpkg)
-
-keep: tdebase
- $(call buildpkg,applications/keep)
-
-kgtk-qt3: tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
-# Do NOT build on CentOS >=7 (GTK2 is too new)
-# Do NOT build on Fedora >= 20 (GTK2 is too new)
-# Do NOT build on Mageia >= 4 (GTK2 is too new)
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc20* /boot/vmlinuz*.mga4*),)
- $(call buildpkg,applications/kgtk-qt3)
-endif
-
-kile: tdebase
- $(call buildpkg,applications/kile)
-
-kima: tdebase
- $(call buildpkg,applications/kima)
-
-kiosktool: tdebase
- $(call buildpkg,applications/kiosktool)
-
-kmplayer: tdebase
- $(call buildpkg,applications/kmplayer)
-
-kmyfirewall: tdebase
- $(call buildpkg,applications/kmyfirewall)
-
-kmymoney: tdebase
- $(call buildpkg,applications/kmymoney)
-
-knemo: tdebase
- $(call buildpkg,applications/knemo)
-
-knetload: tdebase
- $(call buildpkg,applications/knetload)
-
-knetstats: tdebase
- $(call buildpkg,applications/knetstats)
-
-knetworkmanager8: tdebase
- $(call buildpkg,applications/knetworkmanager8)
-
-knights: tdebase gnuchess
- $(call buildpkg,applications/knights)
-
-knowit: tdebase
- $(call buildpkg,applications/knowit)
-
-knutclient: tdebase
- $(call buildpkg,applications/knutclient)
-
-koffice: tdebase wv2
- $(call buildpkg,applications/koffice)
-
-konversation: tdebase
- $(call buildpkg,applications/konversation)
-
-kopete-otr: tdebase libotr3
- $(call buildpkg,applications/kopete-otr)
-
-kpicosim: tdebase
- $(call buildpkg,applications/kpicosim)
-
-kpilot: tdebase
-# Do NOT build on CentOS 5 (pilot-link library is too old)
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,applications/kpilot)
-endif
-
-kpowersave: tdebase
- $(call buildpkg,applications/kpowersave)
-
-krename: tdebase
- $(call buildpkg,applications/krename)
-
-krusader: tdebase
- $(call buildpkg,applications/krusader)
-
-ksplash-engine-moodin: tdebase
- $(call buildpkg,applications/ksplash-engine-moodin)
-
-ksquirrel: tdebase libksquirrel
- $(call buildpkg,applications/ksquirrel)
-
-kstreamripper: tdebase
- $(call buildpkg,applications/kstreamripper)
-
-ksystemlog: tdebase
- $(call buildpkg,applications/ksystemlog)
-
-ktechlab: tdebase
- $(call buildpkg,applications/ktechlab)
-
-ktorrent: tdebase
- $(call buildpkg,applications/ktorrent)
-
-kuickshow: tdebase imlib1
- $(call buildpkg,applications/kuickshow)
-
-kvirc: tdebase
- $(call buildpkg,applications/kvirc)
-
-kvkbd: tdebase
- $(call buildpkg,applications/kvkbd)
-
-piklab: tdebase
- $(call buildpkg,applications/piklab)
-
-potracegui: tdebase
- $(call buildpkg,applications/potracegui)
-
-rosegarden: tdebase lilypond
-# Do NOT build on CentOS 5, CentOS 7
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),)
- $(call buildpkg,applications/rosegarden)
-endif
-
-smartcardauth: tdebase pcsc-perl
- $(call buildpkg,applications/smartcardauth)
-
-smb4k: tdebase
- $(call buildpkg,applications/smb4k)
-
-soundkonverter: tdebase
- $(call buildpkg,applications/soundkonverter)
-
-tde-guidance: tdebase pytdeextensions
- $(call buildpkg,applications/tde-guidance)
-
-tdeio-apt: tdebase
- $(call buildpkg,applications/tdeio-apt)
-
-tdeio-locate: tdebase
- $(call buildpkg,applications/tdeio-locate)
-
-tdeio-umountwrapper: tdebase
- $(call buildpkg,applications/tdeio-umountwrapper)
-
-tderadio: tdebase
-# Do NOT build on CentOS 7
-ifeq ($(wildcard /boot/vmlinuz*.el7*),)
- $(call buildpkg,applications/tderadio)
-endif
-
-tde-style-lipstik: tdebase
- $(call buildpkg,applications/tde-style-lipstik)
-
-tde-style-qtcurve: tdebase
- $(call buildpkg,applications/tde-style-qtcurve)
-
-tdesudo: tdebase
- $(call buildpkg,applications/tdesudo)
-
-tdesvn: tdebase
- $(call buildpkg,applications/tdesvn)
-
-tde-systemsettings: tdebase
- $(call buildpkg,applications/tde-systemsettings)
-
-tdmtheme: tdebase
- $(call buildpkg,applications/tdmtheme)
-
-tellico: tdebase
- $(call buildpkg,applications/tellico)
-
-twin-style-crystal: tdebase
- $(call buildpkg,applications/twin-style-crystal)
-
-wlassistant: tdebase
- $(call buildpkg,applications/wlassistant)
-
-yakuake: tdebase
- $(call buildpkg,applications/yakuake)
-
-### Trinity Translations
-gwenview-i18n: tdebase
- $(call buildpkg,applications/gwenview-i18n)
-
-k3b-i18n: tdebase
- $(call buildpkg,applications/k3b-i18n)
-
-koffice-i18n: tdebase
- $(call buildpkg,applications/koffice-i18n)
-
-tde-i18n: tdebase cmake
- $(call buildpkg,tde-i18n)
-
-### Meta packages
-meta:
- $(call buildpkg,extras/trinity-desktop)
-
-### Extra packages
-fileshareset:
- $(call buildpkg,extras/fileshareset)
-
-trinity-filesystem:
- $(call buildpkg,extras/trinity-filesystem)
-
-ksensors:
- $(call buildpkg,applications/ksensors)
diff --git a/redhat/applications/abakus/abakus-3.5.13.2.spec b/redhat/applications/abakus/abakus-3.5.13.2.spec
deleted file mode 100644
index 9200c19a4..000000000
--- a/redhat/applications/abakus/abakus-3.5.13.2.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define tde_pkg abakus
-%define tde_version 3.5.13.2
-
-# 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_tdeappdir %{tde_datadir}/applications/kde
-%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: Calculator for TDE
-Version: 0.91
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: cmake >= 2.8
-BuildRequires: bison
-
-%description
-AbaKus is a complex calculator, which provides
-many different kinds of calculations.
-Think of it as bc (the command-line calculator) with a nice GUI.
-It also gives information about mathematical variables and
-has the user-friendly menu options of a normal TDE application.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR="%{tde_prefix}"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
- export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
- %__mkdir_p build
- cd build
-fi
-
-%cmake \
- -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
- -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- \
- -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- -DBUILD_ALL=ON \
- ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/abakus
-%{tde_datadir}/apps/abakus/
-%{tde_datadir}/icons/hicolor/*/apps/abakus.png
-%{tde_tdedocdir}/HTML/en/abakus/
-%{tde_datadir}/applnk/Utilities/abakus.desktop
-
-%changelog
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec
index fe63fd198..c4077a07d 100644
--- a/redhat/applications/abakus/abakus.spec
+++ b/redhat/applications/abakus/abakus.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 abakus
%define tde_prefix /opt/trinity
@@ -28,6 +28,7 @@
%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
@@ -82,6 +83,16 @@ BuildRequires: gamin-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
AbaKus is a complex calculator, which provides
@@ -139,6 +150,11 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/abakus.desktop" Utility Calculator
+%endif
+
%clean
%__rm -rf %{buildroot}
@@ -151,7 +167,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/abakus/
%{tde_datadir}/icons/hicolor/*/apps/abakus.png
%{tde_tdedocdir}/HTML/en/abakus/
-%{tde_datadir}/applnk/Utilities/abakus.desktop
+%{tde_tdeappdir}/abakus.desktop
%changelog
diff --git a/redhat/applications/adept/adept-3.5.13.2.spec b/redhat/applications/adept/adept-3.5.13.2.spec
deleted file mode 100644
index 0939d80f0..000000000
--- a/redhat/applications/adept/adept-3.5.13.2.spec
+++ /dev/null
@@ -1,183 +0,0 @@
-# Default version for this component
-%define tde_pkg adept
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: %{?!preversion:2}%{?preversion:1_%{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-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-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; . /etc/profile.d/qt3.sh
-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} \
- --disable-rpath \
- --enable-closure
-
-%__make %{?_smp_mflags} -C adept
-
-
-%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/adept/adept-14.0.0.spec b/redhat/applications/adept/adept.spec
index 62e996ddf..ba1c416f4 100644
--- a/redhat/applications/adept/adept-14.0.0.spec
+++ b/redhat/applications/adept/adept.spec
@@ -18,7 +18,7 @@
# Default version for this component
%define tde_pkg adept
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
# TDE specific building variables
diff --git a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch b/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch
deleted file mode 100644
index 0b6d3259b..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake.ORI 2012-10-11 22:54:02.017468265 +0200
-+++ amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake 2012-10-11 22:54:52.644445209 +0200
-@@ -16,8 +16,8 @@
- endif( )
-
- # dbus-tqt
--pkg_search_module( DBUS_TQT dbus-tqt )
--if( NOT DBUS_TQT_FOUND )
-- tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
--endif( )
-+#pkg_search_module( DBUS_TQT dbus-tqt )
-+#if( NOT DBUS_TQT_FOUND )
-+# tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
-+#endif( )
-
diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec
deleted file mode 100644
index 9f6c153db..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.2.spec
+++ /dev/null
@@ -1,438 +0,0 @@
-# Basic package informations
-%define tde_pkg amarok
-%define tde_version 3.5.13.2
-
-# 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_tdeappdir %{tde_datadir}/applications/kde
-%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: Media player
-Version: 1.4.10
-Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}
-
-Group: Applications/Multimedia
-License: GPLv2+
-Url: http://amarok.kde.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: trinity-konqueror-devel >= %{tde_version}
-
-BuildRequires: alsa-lib-devel
-BuildRequires: desktop-file-utils
-BuildRequires: esound-devel
-BuildRequires: gettext
-BuildRequires: pcre-devel
-BuildRequires: taglib-devel
-
-# LIBTOOL
-BuildRequires: libtool
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libtool-ltdl-devel
-%endif
-
-BuildRequires: libusb-devel
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-BuildRequires: SDL-devel
-BuildRequires: taglib-devel
-BuildRequires: sqlite-devel
-# not used anymore, in favor of libvisual ? -- Rex
-#{?fedora:BuildRequires: xmms-devel}
-
-
-# DBUS support
-%if 0%{?suse_version}
-BuildRequires: dbus-1-devel
-%else
-BuildRequires: dbus-devel
-%endif
-
-# DBUS-(T)QT support
-%if 0%{?rhel} == 4
-BuildRequires: dbus-qt
-%else
-BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
-%endif
-
-# IFP support
-# IFP package is broken under PCLinuxOS.
-%if 0%{?pclinuxos} == 0
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_ifp 1
-BuildRequires: libifp-devel
-%endif
-%endif
-
-# KARMA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-%define with_karma 1
-BuildRequires: libkarma-devel
-BuildRequires: karma-sharp
-%endif
-%endif
-
-# GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_gpod 1
-BuildRequires: libgpod-devel >= 0.4.2
-%endif
-
-# MTP players
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_mtp 1
-BuildRequires: libmtp-devel
-BuildRequires: libmusicbrainz-devel
-%endif
-
-# Creative Nomad Jukebox
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-%define with_njb 1
-BuildRequires: libnjb-devel
-%endif
-
-# VISUAL support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_libvisual 1
-BuildRequires: libvisual-devel
-%endif
-
-# TUNEPIMP support
-%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
-BuildRequires: libtunepimp-devel
-%endif
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: libtunepimp-devel
-%endif
-
-# INOTIFY support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_inotify 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}inotifytools-devel
-%endif
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# YAUAP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_yauap 1
-%endif
-
-# AKODE support
-%if 0
-%define with_akode 1
-BuildRequires: trinity-akode-devel
-%endif
-
-# MP4V2 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_mp4v2 1
-BuildRequires: libmp4v2-devel
-%endif
-
-# ruby
-BuildRequires: ruby
-BuildRequires: ruby-devel
-
-# To open the selected browser, works with Patch2
-Requires: xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
-
-%description
-Amarok is a multimedia player with:
- - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by the various engines
- - audio effects, like reverb and compressor
- - compatible with the .m3u and .pls formats for playlists
- - nice GUI, integrates into the TDE look, but with a unique touch
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{tde_bindir}/amarok
-%{tde_bindir}/amarokapp
-%{tde_bindir}/amarokcollectionscanner
-%{tde_bindir}/amarok_proxy.rb
-%{tde_datadir}/apps/amarok/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_tdeappdir}/*.desktop
-%{tde_datadir}/servicetypes/*.desktop
-%{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_datadir}/config/amarokrc
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/services/amarokitpc.protocol
-%{tde_datadir}/services/amaroklastfm.protocol
-%{tde_datadir}/services/amarokpcast.protocol
-# -libs ? -- Rex
-%{tde_libdir}/libamarok.so.0
-%{tde_libdir}/libamarok.so.0.0.0
-# DAAP
-%{tde_bindir}/amarok_daapserver.rb
-%{tde_tdelibdir}/libamarok_daap-mediadevice.*
-%{tde_datadir}/services/amarok_daap-mediadevice.desktop
-# Mass-storage
-%{tde_datadir}/services/amarok_massstorage-device.desktop
-%{tde_tdelibdir}/libamarok_massstorage-device.*
-# NFS
-%{tde_datadir}/services/amarok_nfs-device.desktop
-%{tde_tdelibdir}/libamarok_nfs-device.*
-# SMB
-%{tde_datadir}/services/amarok_smb-device.desktop
-%{tde_tdelibdir}/libamarok_smb-device.*
-# IPod
-%if 0%{?with_gpod}
-%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
-%endif
-# VFAT
-%{tde_datadir}/services/amarok_generic-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_generic-mediadevice.*
-# iRiver
-%if 0%{?with_ifp}
-%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
-%endif
-# Creative Zen
-%if 0%{?with_njb}
-%{tde_datadir}/services/amarok_njb-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_njb-mediadevice.*
-%endif
-# MTP players
-%if 0%{?with_mtp}
-%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
-%endif
-# Rio Karma
-%if 0%{?with_karma}
-%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
-%endif
-# Void engine (noop)
-%{tde_datadir}/services/amarok_void-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_void-engine_plugin.*
-# Xine engine
-%if 0%{?with_xine}
-%{tde_datadir}/services/amarok_xine-engine.desktop
-%{tde_tdelibdir}/libamarok_xine-engine.*
-%endif
-## Gstreamer engine
-#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
-# YAUAP
-%if 0%{?with_yauap}
-%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
-%endif
-# AKODE
-%if 0%{?with_akode}
-%{tde_datadir}/services/amarok_aKode-engine.desktop
-%{tde_tdelibdir}/libamarok_aKode-engine.*
-%endif
-
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-
-##########
-
-%package ruby
-Summary: %{name} Ruby support
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-# For dir ownership and some default plugins (lyrics)
-Requires: ruby
-
-%description ruby
-%{summary}.
-
-%files ruby
-%defattr(-,root,root,-)
-%{tde_libdir}/ruby_lib/*
-
-##########
-
-%package konqueror
-Summary: Amarok konqueror (service menus, sidebar) support
-Group: Applications/Multimedia
-
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-konqueror
-
-%description konqueror
-%{summary}.
-
-%files konqueror
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
-
-
-##########
-
-%if 0%{?with_libvisual}
-
-%package visualisation
-Summary: Visualisation plugins for Amarok
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-# No plugins by default, we need libvisual-plugins
-#Requires: libvisual-plugins
-
-%description visualisation
-Amarok can use visualisation plugins from different origins.
-Right now, only xmms is supported, which means that you can
-use any of xmms' visualisation plugins with Amarok.
-
-%files visualisation
-%defattr(-,root,root,-)
-%{tde_bindir}/amarok_libvisual
-
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch3 -p1 -b .rhel4
-%endif
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
- export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
- %__mkdir_p build
- cd build
-fi
-
-%cmake \
- -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
- -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- \
- %{?with_libvisual:-DWITH_LIBVISUAL=ON} \
- -DWITH_KONQSIDEBAR=ON \
- %{?with_xine:-DWITH_XINE=ON} \
- %{?with_yauap:-DWITH_YAUAP=ON} \
- %{?with_akode:-DWITH_AKODE=ON} \
- %{?with_gpod:-DWITH_IPOD=ON} \
- %{?with_ifp:-DWITH_IFP=ON} \
- %{?with_njb:-DWITH_NJB=ON} \
- %{?with_mtp:-DWITH_MTP=ON} \
- %{?with_karma:-DWITH_RIOKARMA=ON} \
- -DWITH_DAAP=ON \
- %{?with_mp4v2:-DWITH_MP4V2=ON} \
- %{?with_inotify:-DWITH_INOTIFY=ON} \
- -DBUILD_ALL=ON \
- ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -fr $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-
-# unpackaged files
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-# Removes '.so' to avoid automatic -devel dependency
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
-
-# Locales
-%find_lang %{tde_pkg}
-
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- [ "$lang" == "en" ] && d=en/amarok || d=$lang
- echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> amarok.lang
- fi
-done
-
-
-
-%clean
-%__rm -fr $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok.spec
index a18b8f583..c483cd3ed 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok.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 amarok
%define tde_prefix /opt/trinity
@@ -133,6 +133,9 @@ BuildRequires: dbus-qt
BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
%endif
+# DAAP support
+%define with_daap 0
+
# IFP support
# IFP package is broken under PCLinuxOS.
%if 0%{?pclinuxos} == 0
@@ -207,17 +210,21 @@ BuildRequires: %{_lib}inotifytools-devel
%endif
# XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5
+%if 0%{?fedora} && 0%{?fedora} <= 31
%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xine1.2-devel
+BuildRequires: xine-lib-devel
%endif
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} <= 7
+#define with_xine 1
BuildRequires: xine-lib-devel
%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define with_xine 1
+BuildRequires: %{_lib}xine1.2-devel
%endif
+%if 0%{?sle_version} && 0%{?sle_version} <= 150000
+%define with_xine 1
+BuildRequires: libxine-devel
%endif
# YAUAP support
@@ -285,18 +292,23 @@ Amarok is a multimedia player with:
%{tde_tdeappdir}/*.desktop
%{tde_datadir}/servicetypes/*.desktop
%{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_confdir}/amarokrc
+%config(noreplace) %{tde_confdir}/amarokrc
%{tde_datadir}/config.kcfg/*.kcfg
%{tde_datadir}/services/amarokitpc.protocol
%{tde_datadir}/services/amaroklastfm.protocol
%{tde_datadir}/services/amarokpcast.protocol
+%{tde_mandir}/man1/amarok.1*
+%{tde_mandir}/man1/amarokapp.1*
+%{tde_mandir}/man1/amarokcollectionscanner.1*
# -libs ? -- Rex
%{tde_libdir}/libamarok.so.0
%{tde_libdir}/libamarok.so.0.0.0
# DAAP
+%if 0%{?with_daap}
%{tde_bindir}/amarok_daapserver.rb
%{tde_tdelibdir}/libamarok_daap-mediadevice.*
%{tde_datadir}/services/amarok_daap-mediadevice.desktop
+%endif
# Mass-storage
%{tde_datadir}/services/amarok_massstorage-device.desktop
%{tde_tdelibdir}/libamarok_massstorage-device.*
@@ -343,8 +355,8 @@ Amarok is a multimedia player with:
%{tde_tdelibdir}/libamarok_xine-engine.*
%endif
## Gstreamer engine
-#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
+#{tde_datadir}/services/amarok_gst10engine_plugin.desktop
+#{tde_tdelibdir}/libamarok_gst10engine_plugin.*
# YAUAP
%if 0%{?with_yauap}
%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
@@ -358,22 +370,6 @@ Amarok is a multimedia player with:
##########
-%package ruby
-Summary: %{name} Ruby support
-Group: Applications/Multimedia
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-# For dir ownership and some default plugins (lyrics)
-Requires: ruby
-
-%description ruby
-%{summary}.
-
-%files ruby
-%defattr(-,root,root,-)
-%{tde_libdir}/ruby_lib/
-
-##########
-
%package konqueror
Summary: Amarok konqueror (service menus, sidebar) support
Group: Applications/Multimedia
@@ -410,6 +406,7 @@ use any of xmms' visualisation plugins with Amarok.
%files visualisation
%defattr(-,root,root,-)
%{tde_bindir}/amarok_libvisual
+%{tde_mandir}/man1/amarok_libvisual.1*
%endif
@@ -431,6 +428,18 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
-e "s|Config\.|RbConfig\.|g"
fi
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+%__sed -i "amarok/src/scripts/common/Publisher.py" \
+ "amarok/src/scripts/common/Zeroconf.py" \
+ "amarok/src/scripts/playlist2html/Playlist.py" \
+ "amarok/src/scripts/playlist2html/playlist2html.py" \
+ "amarok/src/scripts/playlist2html/PlaylistServer.py" \
+ "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|"
+%endif
+
%build
unset QTDIR QTINC QTLIB
@@ -466,7 +475,7 @@ fi
\
%{?with_libvisual:-DWITH_LIBVISUAL=ON} \
-DWITH_KONQSIDEBAR=ON \
- %{?with_xine:-DWITH_XINE=ON} \
+ %{?with_xine:-DWITH_XINE=ON} %{?!with_xine:-DWITH_XINE=OFF}\
%{?with_yauap:-DWITH_YAUAP=ON} \
-DWITH_AKODE=OFF \
%{?with_gpod:-DWITH_IPOD=ON} \
@@ -474,9 +483,10 @@ fi
%{?with_njb:-DWITH_NJB=ON} \
%{?with_mtp:-DWITH_MTP=ON} \
%{?with_karma:-DWITH_RIOKARMA=ON} \
- -DWITH_DAAP=ON \
+ %{!?with_daap:-DWITH_DAAP=OFF} \
%{?with_mp4v2:-DWITH_MP4V2=ON} \
%{?with_inotify:-DWITH_INOTIFY=ON} \
+ -DWITH_SYSTEM_SQLITE=ON \
-DBUILD_ALL=ON \
..
diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec
deleted file mode 100644
index c392dea83..000000000
--- a/redhat/applications/basket/basket-3.5.13.2.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-# Default version for this component
-%define tde_pkg basket
-%define tde_version 3.5.13.2
-
-# 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_tdeappdir %{tde_datadir}/applications/kde
-%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: Taking care of your ideas.
-Version: 1.0.3.1
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-tdepim-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gpgme-devel
-
-%description
-This application is mainly an all-purpose notes taker. It provide several baskets where
-to drop every sort of items: text, rich text, links, images, sounds, files, colors,
-application launcher... Objects can be edited, copied, dragged... So, you can arrange
-them as you want ! This application can be used to quickly drop web objects (link, text,
-images...) or notes, as well as to free your clutered desktop (if any). It is also useful
-to collect informations for a report. Those data can be shared with co-workers by exporting
-baskets to HTML.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --disable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-
-%postun
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/basket
-%{tde_tdeappdir}/basket.desktop
-%{tde_datadir}/apps/basket/
-%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
-%{tde_libdir}/libbasketcommon.la
-%{tde_libdir}/libbasketcommon.so
-%{tde_tdelibdir}/basketthumbcreator.la
-%{tde_tdelibdir}/basketthumbcreator.so
-%{tde_tdelibdir}/kcm_basket.la
-%{tde_tdelibdir}/kcm_basket.so
-%{tde_tdelibdir}/libbasketpart.la
-%{tde_tdelibdir}/libbasketpart.so
-%{tde_tdelibdir}/libkontact_basket.la
-%{tde_tdelibdir}/libkontact_basket.so
-%{tde_datadir}/config/magic/basket.magic
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
-%{tde_datadir}/mimelnk/application/x-basket-template.desktop
-%{tde_datadir}/services/basket_config_apps.desktop
-%{tde_datadir}/services/basket_config_baskets.desktop
-%{tde_datadir}/services/basket_config_features.desktop
-%{tde_datadir}/services/basket_config_general.desktop
-%{tde_datadir}/services/basket_config_new_notes.desktop
-%{tde_datadir}/services/basket_config_notes.desktop
-%{tde_datadir}/services/basket_config_notes_appearance.desktop
-%{tde_datadir}/services/basket_part.desktop
-%{tde_datadir}/services/basketthumbcreator.desktop
-%{tde_datadir}/services/kontact/basket.desktop
-%{tde_datadir}/services/kontact/basket_v4.desktop
-%{tde_tdedocdir}/HTML/en/basket/
-
-
-%changelog
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket.spec
index 66138fcdb..99cc3f21b 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket.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 basket
%define tde_prefix /opt/trinity
@@ -60,11 +60,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: trinity-tdepim-devel >= %{tde_version}
+BuildRequires: trinity-kontact-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gpgme-devel
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -100,40 +101,43 @@ baskets to HTML.
%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}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
+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} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --disable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBUILD_ALL=ON \
+ -DWITH_ALL_OPTIONS="ON" \
+ ..
-%__make %{?_smp_mflags} || %__make
+%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg}
@@ -168,23 +172,21 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%{tde_tdelibdir}/libbasketpart.so
%{tde_tdelibdir}/libkontact_basket.la
%{tde_tdelibdir}/libkontact_basket.so
-%{tde_confdir}/magic/basket.magic
+%config(noreplace) %{tde_confdir}/magic/basket.magic
%{tde_datadir}/icons/crystalsvg/*/*/*
%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
%{tde_datadir}/mimelnk/application/x-basket-template.desktop
%{tde_datadir}/services/basket_config_apps.desktop
%{tde_datadir}/services/basket_config_baskets.desktop
-#%{tde_datadir}/services/basket_config_features.desktop
%{tde_datadir}/services/basket_config_general.desktop
%{tde_datadir}/services/basket_config_new_notes.desktop
-#%{tde_datadir}/services/basket_config_notes.desktop
%{tde_datadir}/services/basket_config_notes_appearance.desktop
%{tde_datadir}/services/basket_part.desktop
%{tde_datadir}/services/basketthumbcreator.desktop
%{tde_datadir}/services/kontact/basket.desktop
-%{tde_datadir}/services/kontact/basket_v4.desktop
%{tde_tdedocdir}/HTML/en/basket/
-%{tde_confdir}/magic/basket.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/basket.magic.mgc
+%{tde_mandir}/man1/basket.*
%changelog
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
deleted file mode 100644
index 8bec59af8..000000000
--- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define tde_pkg bibletime
-%define tde_version 3.5.13.2
-
-# 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_tdeappdir %{tde_datadir}/applications/kde
-%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: A bible study tool for Trinity
-Version: 1.6.6.0
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-# Requires: clucene
-%if 0%{?fedora} || 0%{?suse_version}
-BuildRequires: clucene-core-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}clucene-devel
-%endif
-
-# Requires: sword
-BuildRequires: sword-devel
-Requires: sword
-
-%description
-BibleTime is a free and easy to use bible study tool for UNIX systems.
-It requires a working TDE environment and the SWORD library.
-BibleTime provides easy handling of digitized texts (Bibles, commentaries
-and lexicons) and powerful features to work with these texts (search in
-texts, write own notes, save, print etc.).
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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
-. /etc/profile.d/qt3.sh
-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} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- \
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7
- --with-sword-dir=%{tde_prefix}
-%endif
-
-# Not SMP safe !
-%__make -C bibletime/frontend
-
-# SMP safe !
-%__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
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_datadir}/applications -q &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_datadir}/applications -q &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/bibletime
-%{tde_tdeincludedir}/bibletimeinterface.h
-%{tde_datadir}/applications/bibletime.desktop
-%{tde_datadir}/apps/bibletime/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_tdedocdir}/HTML/en/bibletime/
-
-
-%changelog
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime.spec
index c6a0991a1..2efbcfb47 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime.spec
@@ -23,7 +23,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 bibletime
%define tde_prefix /opt/trinity
@@ -124,6 +124,10 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+%if 0%{?fedora} >= 31
+CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11"
+%endif
+
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/codeine/codeine.spec
new file mode 100644
index 000000000..13a395b94
--- /dev/null
+++ b/redhat/applications/codeine/codeine.spec
@@ -0,0 +1,165 @@
+#
+# spec file for package kaffeine (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 codeine
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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.1
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: Simple TDE video player
+Group: Applications/Multimedia
+URL: http://kaffeine.sourceforge.net/
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{_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: cmake
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+
+# 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
+
+# XINE support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
+%define with_xine 1
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
+%endif
+%endif
+
+
+%description
+A video player with a different philosophy: simple, uncluttered interface
+
+Features:
+- Plays DVDs, VCDs, all video formats supported by Xine
+- Bundled with a simple web-page KPart
+- Starts quickly
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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} \
+ -DBUILD_ALL=ON \
+ ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING FAQ README TODO
+%{tde_bindir}/codeine
+%{tde_tdeappdir}/codeine.desktop
+%{tde_datadir}/apps/codeine/
+%{tde_datadir}/apps/konqueror/servicemenus/codeine_play_dvd.desktop
+%{tde_tdedocdir}/HTML/en/codeine/
+%{tde_datadir}/icons/hicolor/*/apps/codeine.png
+%{tde_mandir}/man1/codeine.1*
+%{tde_datadir}/services/codeine_part.desktop
+%{tde_tdelibdir}/libcodeine.la
+%{tde_tdelibdir}/libcodeine.so
+
+
+%changelog
diff --git a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec b/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec
deleted file mode 100644
index 85a90a849..000000000
--- a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec
+++ /dev/null
@@ -1,86 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define kdecomp compizconfig-backend-kconfig
-%define version 3.5.12
-%endif
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _docdir %{tde_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_libdir %{tde_libdir}/kde3
-
-
-Name: trinity-%{?kdecomp}
-Version: %{?version}
-Release: %{?release}%{?dist}
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-Summary: kconfig backend for compizconfig
-
-Group: System Environment/Libraries
-License: GPLv2+
-URL: http://www.opencompositing.org
-
-Prefix: %{tde_prefix}
-
-Source0: %{kdecomp}-%{version}.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires: libcompizconfig-devel intltool
-Requires: compiz
-
-
-%description
-The Compiz Fusion Project brings 3D desktop visual effects that improve
-usability of the X Window System and provide increased productivity
-through plugins and themes contributed by the community giving a
-rich desktop experience.
-
-This package contains the kconfig backend for libcompizconfig
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/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%{tde_includedir}"
-
-%configure \
- --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.GPL COPYING.LGPL
-%{_usr}/%{_lib}/compizconfig/backends/*.so
-%exclude %{_usr}/%{_lib}/compizconfig/backends/*.la
-
-%changelog
diff --git a/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch b/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch
deleted file mode 100644
index 8a5262dda..000000000
--- a/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp.ORI 2013-03-10 21:44:37.468543760 +0100
-+++ trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp 2013-03-10 21:45:23.246560198 +0100
-@@ -258,7 +258,7 @@
- #ifdef ENABLE_DEBUG_MESSAGES
- DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl;
- #endif
-- png_set_expand_gray_1_2_4_to_8(png_ptr);
-+ png_set_gray_1_2_4_to_8(png_ptr);
- png_set_gray_to_rgb(png_ptr);
-
- if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel
---- trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp.ORI 2013-03-10 21:50:56.994910746 +0100
-+++ trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp 2013-03-10 21:51:09.150668622 +0100
-@@ -465,7 +465,7 @@
- {
- png_set_gray_to_rgb(png_ptr);
- if (png_get_bit_depth(png_ptr, info_ptr) < 8)
-- png_set_expand_gray_1_2_4_to_8(png_ptr);
-+ png_set_gray_1_2_4_to_8(png_ptr);
- }
-
- int sizeOfUint = sizeof(unsigned int);
diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec
deleted file mode 100644
index 46bb635af..000000000
--- a/redhat/applications/digikam/digikam-3.5.13.2.spec
+++ /dev/null
@@ -1,311 +0,0 @@
-# Default version for this component
-%define tde_pkg digikam
-%define tde_version 3.5.13.2
-
-# 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_tdeappdir %{tde_datadir}/applications/kde
-%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: digital photo management application for TDE [Trinity]
-Version: 0.9.6
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# [Digikam] Revert PNG support to libpng12 (for RHEL4)
-Patch1: digikam-3.5.13.2-fix_png12_support.patch
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: trinity-libkexiv2-devel
-BuildRequires: trinity-libkdcraw-devel
-BuildRequires: trinity-libkipi-devel
-
-BuildRequires: libtiff-devel
-BuildRequires: gettext
-
-# GPHOTO2 support
-%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: gphoto2-devel
-%else
-BuildRequires: libgphoto2-devel
-%endif
-
-# JASPER support
-%if 0%{?suse_version}
-BuildRequires: libjasper-devel
-%else
-BuildRequires: jasper-devel
-%endif
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: exiv2-devel
-%endif
-
-Requires: trinity-libkexiv2
-Requires: trinity-libkdcraw
-Requires: trinity-libkipi
-
-%description
-An easy to use and powerful digital photo management
-application, which makes importing, organizing and manipulating
-digital photos a "snap". An interface is provided to connect to
-your digital camera, preview the images and download and/or
-delete them.
-
-The digiKam built-in image editor makes the common photo correction
-a simple task. The image editor is extensible via plugins and,
-the digikamimageplugins project has been merged to digiKam core
-since release 0.9.2, all useful image editor plugins are available
-in the base installation.
-
-digiKam can also make use of the KIPI image handling plugins to
-extend its capabilities even further for photo manipulations,
-import and export, etc. The kipi-plugins package contains many
-very useful extentions.
-
-digiKam is based in part on the work of the Independent JPEG Group.
-
-
-%package devel
-Group: Development/Libraries
-Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .png12
-%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 || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export KDEDIR="%{tde_prefix}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/digikam
-%{tde_bindir}/digikamthemedesigner
-%{tde_bindir}/digitaglinktree
-%{tde_bindir}/showfoto
-%{tde_libdir}/libdigikam.so.0
-%{tde_libdir}/libdigikam.so.0.0.0
-%{tde_tdelibdir}/kio_digikamalbums.la
-%{tde_tdelibdir}/kio_digikamalbums.so
-%{tde_tdelibdir}/kio_digikamdates.la
-%{tde_tdelibdir}/kio_digikamdates.so
-%{tde_tdelibdir}/digikamimageplugin_adjustcurves.la
-%{tde_tdelibdir}/digikamimageplugin_adjustcurves.so
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.la
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.so
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.la
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.so
-%{tde_tdelibdir}/digikamimageplugin_blurfx.la
-%{tde_tdelibdir}/digikamimageplugin_blurfx.so
-%{tde_tdelibdir}/digikamimageplugin_border.la
-%{tde_tdelibdir}/digikamimageplugin_border.so
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.la
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.so
-%{tde_tdelibdir}/digikamimageplugin_charcoal.la
-%{tde_tdelibdir}/digikamimageplugin_charcoal.so
-%{tde_tdelibdir}/digikamimageplugin_colorfx.la
-%{tde_tdelibdir}/digikamimageplugin_colorfx.so
-%{tde_tdelibdir}/digikamimageplugin_core.la
-%{tde_tdelibdir}/digikamimageplugin_core.so
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.la
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.so
-%{tde_tdelibdir}/digikamimageplugin_emboss.la
-%{tde_tdelibdir}/digikamimageplugin_emboss.so
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.la
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.so
-%{tde_tdelibdir}/digikamimageplugin_freerotation.la
-%{tde_tdelibdir}/digikamimageplugin_freerotation.so
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.la
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.so
-%{tde_tdelibdir}/digikamimageplugin_infrared.la
-%{tde_tdelibdir}/digikamimageplugin_infrared.so
-%{tde_tdelibdir}/digikamimageplugin_inpainting.la
-%{tde_tdelibdir}/digikamimageplugin_inpainting.so
-%{tde_tdelibdir}/digikamimageplugin_inserttext.la
-%{tde_tdelibdir}/digikamimageplugin_inserttext.so
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.la
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.so
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.la
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.so
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.la
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.so
-%{tde_tdelibdir}/digikamimageplugin_perspective.la
-%{tde_tdelibdir}/digikamimageplugin_perspective.so
-%{tde_tdelibdir}/digikamimageplugin_raindrop.la
-%{tde_tdelibdir}/digikamimageplugin_raindrop.so
-%{tde_tdelibdir}/digikamimageplugin_restoration.la
-%{tde_tdelibdir}/digikamimageplugin_restoration.so
-%{tde_tdelibdir}/digikamimageplugin_sheartool.la
-%{tde_tdelibdir}/digikamimageplugin_sheartool.so
-%{tde_tdelibdir}/digikamimageplugin_superimpose.la
-%{tde_tdelibdir}/digikamimageplugin_superimpose.so
-%{tde_tdelibdir}/digikamimageplugin_texture.la
-%{tde_tdelibdir}/digikamimageplugin_texture.so
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.la
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.so
-%{tde_tdelibdir}/kio_digikamsearch.la
-%{tde_tdelibdir}/kio_digikamsearch.so
-%{tde_tdelibdir}/kio_digikamtags.la
-%{tde_tdelibdir}/kio_digikamtags.so
-%{tde_tdelibdir}/kio_digikamthumbnail.la
-%{tde_tdelibdir}/kio_digikamthumbnail.so
-%{tde_tdeappdir}/digikam.desktop
-%{tde_tdeappdir}/showfoto.desktop
-%{tde_datadir}/apps/digikam/
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
-%{tde_datadir}/apps/showfoto/
-%{tde_datadir}/icons/hicolor/*/apps/digikam.png
-%{tde_datadir}/icons/hicolor/*/apps/showfoto.png
-%{tde_datadir}/services/digikamalbums.protocol
-%{tde_datadir}/services/digikamdates.protocol
-%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop
-%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop
-%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop
-%{tde_datadir}/services/digikamimageplugin_blurfx.desktop
-%{tde_datadir}/services/digikamimageplugin_border.desktop
-%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop
-%{tde_datadir}/services/digikamimageplugin_charcoal.desktop
-%{tde_datadir}/services/digikamimageplugin_colorfx.desktop
-%{tde_datadir}/services/digikamimageplugin_core.desktop
-%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop
-%{tde_datadir}/services/digikamimageplugin_emboss.desktop
-%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop
-%{tde_datadir}/services/digikamimageplugin_freerotation.desktop
-%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop
-%{tde_datadir}/services/digikamimageplugin_infrared.desktop
-%{tde_datadir}/services/digikamimageplugin_inpainting.desktop
-%{tde_datadir}/services/digikamimageplugin_inserttext.desktop
-%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop
-%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop
-%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop
-%{tde_datadir}/services/digikamimageplugin_perspective.desktop
-%{tde_datadir}/services/digikamimageplugin_raindrop.desktop
-%{tde_datadir}/services/digikamimageplugin_restoration.desktop
-%{tde_datadir}/services/digikamimageplugin_sheartool.desktop
-%{tde_datadir}/services/digikamimageplugin_superimpose.desktop
-%{tde_datadir}/services/digikamimageplugin_texture.desktop
-%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop
-%{tde_datadir}/services/digikamsearch.protocol
-%{tde_datadir}/services/digikamtags.protocol
-%{tde_datadir}/services/digikamthumbnail.protocol
-%{tde_datadir}/servicetypes/digikamimageplugin.desktop
-%{tde_mandir}/man*/*
-#%{tde_tdedocdir}/HTML/en/digikam-apidocs/
-
-
-%files devel
-%{tde_tdeincludedir}/digikam_export.h
-%{tde_tdeincludedir}/digikam/
-%{tde_libdir}/libdigikam.so
-%{tde_libdir}/libdigikam.la
-
-
-%changelog
diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam.spec
index dc95cb8c7..11ea6135a 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam.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 digikam
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec
deleted file mode 100644
index 30db977f4..000000000
--- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%define tde_pkg dolphin
-%define tde_version 3.5.13.2
-
-# 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_tdeappdir %{tde_datadir}/applications/kde
-%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: File manager for TDE focusing on usability
-Version: 0.9.2
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-Dolphin focuses on being only a file manager.
-This approach allows to optimize the user
-interface for the task of file management.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --docdir=%{tde_tdedocdir} \
- --libdir=%{tde_libdir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Makes 'media_safelyremove.desktop' an alternative
-%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
-
-# Locales
-%find_lang d3lphin
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-alternatives --install \
- %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \
- media_safelyremove.desktop_d3lphin \
- %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \
- 15
-
-%preun
-if [ $1 -eq 0 ]; then
- update-alternatives --remove \
- media_safelyremove.desktop_d3lphin \
- %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || :
-fi
-
-%postun
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f d3lphin.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_bindir}/d3lphin
-%{tde_tdeappdir}/d3lphin.desktop
-%{tde_datadir}/apps/d3lphin/
-%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
-%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/
-
-
-%changelog
diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/dolphin/dolphin.spec
index de4f5d627..6d18340c2 100644
--- a/redhat/applications/dolphin/dolphin.spec
+++ b/redhat/applications/dolphin/dolphin.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 dolphin
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec
index 5feb96b8f..1525e5eb3 100644
--- a/redhat/applications/filelight-l10n/filelight-l10n.spec
+++ b/redhat/applications/filelight-l10n/filelight-l10n.spec
@@ -5,6 +5,7 @@
# 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
@@ -40,7 +41,6 @@ BuildArch: noarch
Source0: %{kdecomp}-3.5.13.tar.gz
-BuildRequires: tqtinterface-devel
BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec
deleted file mode 100644
index f1b71ae47..000000000
--- a/redhat/applications/filelight/filelight-3.5.13.2.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define tde_pkg filelight
-%define tde_version 3.5.13.2
-
-# 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_tdeappdir %{tde_datadir}/applications/kde
-%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: Graphical disk usage display
-Version: 1.0
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-Obsoletes: filelight-l10n < %{version}-%{release}
-Provides: filelight-l10n = %{version}-%{release}
-
-%description
-Filelight creates a complex, but data-rich graphical representation of the files and
-directories on your computer.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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 || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --docdir=%{tde_tdedocdir} \
- --libdir=%{tde_libdir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/filelight
-%{tde_tdeappdir}/filelight.desktop
-%{tde_datadir}/apps/filelight/
-%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{tde_datadir}/icons/hicolor/*/apps/filelight.png
-%{tde_datadir}/config/filelightrc
-%{tde_datadir}/services/*.desktop
-%{tde_tdelibdir}/libfilelight.so
-%{tde_tdelibdir}/libfilelight.la
-%lang(da) %{tde_tdedocdir}/HTML/da/filelight/
-%lang(en) %{tde_tdedocdir}/HTML/en/filelight/
-%lang(es) %{tde_tdedocdir}/HTML/es/filelight/
-%lang(et) %{tde_tdedocdir}/HTML/et/filelight/
-%lang(it) %{tde_tdedocdir}/HTML/it/filelight/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
-
-%changelog
diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight.spec
index 674b56560..312b507fc 100644
--- a/redhat/applications/filelight/filelight-14.0.0.spec
+++ b/redhat/applications/filelight/filelight.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 filelight
%define tde_prefix /opt/trinity
@@ -155,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file filelight FileManager
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/filelight.desktop FileManager
%endif
@@ -171,7 +171,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/filelight/
%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
%{tde_datadir}/icons/hicolor/*/apps/filelight.png
-%{tde_confdir}/filelightrc
+%config(noreplace) %{tde_confdir}/filelightrc
%{tde_datadir}/services/*.desktop
%{tde_tdelibdir}/libfilelight.so
%{tde_tdelibdir}/libfilelight.la
@@ -183,6 +183,7 @@ export PATH="%{tde_bindir}:${PATH}"
%lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/
%lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/
%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
+%{tde_mandir}/man1/filelight.1*
%changelog
diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
deleted file mode 100644
index 8f2e0cd6d..000000000
--- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec
+++ /dev/null
@@ -1,92 +0,0 @@
-# Default version for this component
-%define tde_pkg fusion-icon
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
-%endif
-
-%if "%{?python2_sitelib}" == ""
-%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-%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 _docdir %{tde_docdir}
-
-
-Name: trinity-%{tde_pkg}
-Summary: tray icon to launch and manage Compiz Fusion [Trinity]
-Version: 0.0.0+git20071028
-Release: 2%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: python
-Requires: python
-Requires: trinity-compizconfig-backend-kconfig
-
-%description
-The OpenCompositing Project brings 3D desktop visual effects that
-improve the usability and eye candy of the X Window System and provide
-increased productivity.
-
-This package contains a tray icon that can launch Compiz and its
-decorators.
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install \
- DESTDIR=%{buildroot} \
- PREFIX=%{tde_prefix}
-
-# Removes 'egg-info'
-find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/fusion-icon
-%{python2_sitelib}/FusionIcon/
-%{tde_datadir}/applications/fusion-icon.desktop
-%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png
-%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg
-
-
-%changelog
diff --git a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch b/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch
deleted file mode 100644
index 6ad5c045c..000000000
--- a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- fusion-icon/Makefile.ori 2012-08-04 11:13:26.208733002 +0200
-+++ fusion-icon/Makefile 2012-08-04 11:16:13.354858961 +0200
-@@ -1,12 +1,13 @@
- PREFIX = '/usr'
- DESTDIR = '/'
-+PYTHON_SITELIB = '/usr/lib/python2.7/site-packages'
- #interfaces = 'gtk qt4'
-
- all:
- @python setup.py build
-
- install:
-- @python setup.py install --prefix=${PREFIX} --root=${DESTDIR}
-+ @python setup.py install --prefix=${PREFIX} --root=${DESTDIR} --install-lib=${PYTHON_SITELIB}
-
- uninstall:
- @python setup.py uninstall
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec
index 99f8992ff..e3f8bf5cb 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/fusion-icon/fusion-icon.spec
@@ -1,6 +1,6 @@
# Default version for this component
%define tde_pkg fusion-icon
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%if "%{?python2_sitelib}" == ""
%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
@@ -23,10 +23,10 @@
%define _docdir %{tde_docdir}
-Name: trinity-%{tde_pkg}
-Summary: tray icon to launch and manage Compiz Fusion [Trinity]
-Version: 0.0.0+git20071028
-Release: 2%{?dist}
+Name: trinity-%{tde_pkg}
+Summary: tray icon to launch and manage Compiz Fusion [Trinity]
+Version: 0.0.0+git20071028
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
License: GPLv2+
Group: Applications/Utilities
diff --git a/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff b/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff
deleted file mode 100644
index 8548d545c..000000000
--- a/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-commit f181fbbb337a75257089e64afabd04dac2e1d466
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1383169502 -0500
-
- Fix severe iceweasel/icedove tab bar corruption
- Clean up minor build warnings
-
-diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
-index 067cf24..d3e13bb 100644
---- a/src/qt_qt_wrapper.cpp
-+++ b/src/qt_qt_wrapper.cpp
-@@ -337,7 +337,7 @@ void createTQApp()
- #endif // USE_FREEBSD
- #endif // USE_SOLARIS
-
-- mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("thunderbird"));
-+ mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("iceweasel") || cmdLine.contains("thunderbird") || cmdLine.contains("icedove"));
-
- openOfficeFix = (cmdLine.endsWith("soffice.bin"))
- | (cmdLine.endsWith("swriter.bin"))
-@@ -692,10 +692,9 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- TQPushButton button(meepWidget);
- button.setBackgroundOrigin(TQWidget::ParentOrigin);
- button.setGeometry(x, y, w, h);
-- if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0)
-+ if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) {
- button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL]));
-- TQPoint p = button.backgroundOffset();
-- TQPoint pos = button.pos();
-+ }
-
- TQStyle::SFlags sflags = stateToSFlags(state);
-
-@@ -730,8 +729,6 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- button.setGeometry(x, y, w, h);
- if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0)
- button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL]));
-- TQPoint p = button.backgroundOffset();
-- TQPoint pos = button.pos();
-
- TQStyle::SFlags sflags = stateToSFlags(state);
-
-@@ -1802,6 +1799,7 @@ void drawArrow(GdkWindow* window, GtkStyle* style, GtkStateType state, GtkArrowT
- case GTK_ARROW_LEFT: element = TQStyle::PE_ArrowLeft; break;
- case GTK_ARROW_RIGHT: element = TQStyle::PE_ArrowRight; break;
- case GTK_ARROW_NONE: return;
-+ default: return;
- }
-
-
diff --git a/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff b/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff
deleted file mode 100644
index fadce37cf..000000000
--- a/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff
+++ /dev/null
@@ -1,553 +0,0 @@
-commit 6e6dbb068e03a8bb818a76ba774d6f94ade7389f
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1387752298 -0600
-
- Fix numerous drawing glitches in Firefox
-
-diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
-index d3e13bb..928aef3 100644
---- a/src/qt_qt_wrapper.cpp
-+++ b/src/qt_qt_wrapper.cpp
-@@ -640,7 +640,7 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- }
-
- if (gwidget) {
-- TQString gwLabel(gtk_button_get_label(gwidget));
-+ TQString gwLabel(gtk_button_get_label(gwidget));
- if (gtk_button_get_use_stock(gwidget)) {
- GtkStockItem stockData;
- gtk_stock_lookup(gwLabel.ascii(), &stockData);
-@@ -649,8 +649,8 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- gwLabel.replace("&", "&&");
- gwLabel.replace("_", "&");
-
-- TQPixmap buttonicon;
-- TQBitmap buttonicon_mask;
-+ TQPixmap buttonicon;
-+ TQBitmap buttonicon_mask;
-
- GtkWidget* giconwidget = gtk_button_get_image(gwidget);
- if (giconwidget) {
-@@ -735,9 +735,9 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- if (defaultButton)
- sflags |= TQStyle::Style_ButtonDefault;
- button.setDefault(defaultButton);
--
-+
- painter.fillRect(0, 0, w, h, tqApp->palette().active().background());
--
-+
- tqApp->style().drawControl(TQStyle::CE_PushButton, &painter, &button,
- TQRect(0,0,w,h), button.palette().active(), sflags);
-
-diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
-index 20d8c87..e84c4f7 100644
---- a/src/qt_theme_draw.c
-+++ b/src/qt_theme_draw.c
-@@ -676,8 +676,9 @@ draw_box(GtkStyle * style,
- int nbpages;
- sanitize_size(window, &width, &height);
-
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);
-+ }
-
- if (GTK_IS_SCROLLBAR(widget))
- {
-@@ -685,38 +686,54 @@ draw_box(GtkStyle * style,
- {
- GtkAdjustment* adj = (GtkAdjustment*)gtk_range_get_adjustment(GTK_RANGE(widget));
- int orientation = ((width>height) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
--
-+
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawScrollBar(window, style, state_type, orientation, adj, x, y, width, height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- return;
- }
- if (DETAIL("menuitem"))
- {
- /* Crude way of checking if it's a menu item, or a menubar item */
-- if (x != 0)
-+ if (x != 0) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawMenuBarItem(window,style,state_type,x,y,width,height);
-- else
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+ }
-+ else {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawMenuItem(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+ }
- return;
- }
- if (DETAIL("menubar"))
- {
-- if (openOfficeFix == 1)
-+ if (openOfficeFix == 1) {
- parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-- else if (mozillaFix == 1)
-+ }
-+ else if (mozillaFix == 1) {
- parent_class->draw_box (style, window, state_type, GTK_SHADOW_NONE, area, widget, detail, x, y, width, height);
-- else
-+ }
-+ else {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawMenubar(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+ }
- return;
- }
- if (DETAIL("menu"))
- {
-- if (openOfficeFix == 1)
-+ if (openOfficeFix == 1) {
- parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-- else
-- {
-- if ((x >= 0) && (y >= 0)) /* Work around weirdness in firefox */
-+ }
-+ else {
-+ if ((x >= 0) && (y >= 0)) { /* Work around weirdness in firefox */
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawMenu(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+ }
- }
- return;
- }
-@@ -724,16 +741,15 @@ draw_box(GtkStyle * style,
- {
- double fraction = gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(widget));
- GtkProgressBarOrientation orientation = gtk_progress_bar_get_orientation(GTK_PROGRESS_BAR(widget));
--
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawProgressBar(window,style,state_type,orientation,fraction,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
- if (GTK_IS_PROGRESS(widget) && DETAIL("bar"))
- {
- if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
--
- drawProgressChunk(window,style,state_type,x,y,width,height);
--
- if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
-@@ -742,8 +758,7 @@ draw_box(GtkStyle * style,
- GtkAdjustment* adj;
- int inverted;
- GValue *val = (GValue*)g_malloc( sizeof(GValue) );
-- if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget)))
-- {
-+ if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) {
- GdkPixbuf *gpix;
- gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget),NULL, x, y, 0, 0, width, height);
- setFillPixmap(gpix);
-@@ -758,7 +773,9 @@ draw_box(GtkStyle * style,
- g_free(val);
-
- adj = gtk_range_get_adjustment((GtkRange *) widget);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawSlider(window,style,state_type,adj,x,y,width,height, (GTK_RANGE(widget))->orientation, inverted);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
- if (DETAIL("button"))
-@@ -767,18 +784,15 @@ draw_box(GtkStyle * style,
- int toolbutton = 0;
- parent = gtk_widget_get_parent(widget);
-
-- if (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent)))
-- {
-+ if (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent))) {
- drawListHeader(window,style,state_type,x,y,width,height);
- return;
- }
-
- /* this is a very very bad hack but there seems to be no way to find if a button is on a
- * toolbar in gtk */
-- while (1)
-- {
-- if (GTK_IS_WIDGET(parent))
-- {
-+ while (1) {
-+ if (GTK_IS_WIDGET(parent)) {
- #ifdef HAVE_BONOBO
- if (GTK_IS_TOOLBAR(parent) || BONOBO_IS_UI_TOOLBAR(parent))
- #else
-@@ -789,17 +803,20 @@ draw_box(GtkStyle * style,
- break;
- }
- }
-- else
-+ else {
- break;
-+ }
- parent = gtk_widget_get_parent(parent);
- }
-
- parent = gtk_widget_get_parent(widget);
-
-- if (toolbutton)
-+ if (toolbutton) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawToolButton(window,style,state_type,x,y,width,height);
-- else
-- {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+ }
-+ else {
- /* Baghira hack -- rounded buttons really ugly when they are small like
- on a dropdown entry box -- eg. search/replace in gedit */
- /* Draw square buttons only if number of children in the hbox is 2 and
-@@ -807,31 +824,35 @@ draw_box(GtkStyle * style,
- int defaultButton = gtk_widget_has_focus(widget);
- GtkWindow* toplevel;
-
-- if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2))
-- {
-+ if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2)) {
- child_list = g_list_first((GTK_BOX(parent)->children));
- child = (GtkWidget *)child_list->data;
-- if (GTK_IS_ENTRY(child))
-- {
-+ if (GTK_IS_ENTRY(child)) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawSquareButton(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
-
- child_list = g_list_last((GTK_BOX(parent)->children));
- child = ((GtkBoxChild *)child_list->data)->widget;
-- if (GTK_IS_ENTRY(child))
-- {
-+ if (GTK_IS_ENTRY(child)) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawSquareButton(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
-
- }
-
- toplevel = GTK_WINDOW(gtk_widget_get_toplevel(widget));
-- if (toplevel && toplevel->default_widget == widget)
-+ if (toplevel && toplevel->default_widget == widget) {
- defaultButton = 1;
--
-+ }
-+
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawButton(window,style,state_type,defaultButton,x,y,width,height,GTK_BUTTON(widget));
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- return;
- }
-@@ -860,43 +881,55 @@ draw_box(GtkStyle * style,
-
- /* Now draw the tab -- tab position is also calculated in this function
- checkout drawTabFrame() for drawing tabbarbase. */
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawTabNG(window,style,state_type,x, y, width/*-2*/, height, nb );
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- else {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawTab(window,style,state_type,x,y,width/*-2*/,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- return;
- }
-- if (DETAIL("optionmenu"))
-- {
-+ if (DETAIL("optionmenu")) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawComboBox(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
-- if (DETAIL("toolbar"))
-- {
-+ if (DETAIL("toolbar")) {
- if (openOfficeFix == 1)
- parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
- else
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawToolbar(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
-- if (DETAIL("spinbutton_up"))
-- {
-+ if (DETAIL("spinbutton_up")) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawSpinButton(window, style, state_type, 0, x, y, width, height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
-- if (DETAIL("spinbutton_down"))
-- {
-+ if (DETAIL("spinbutton_down")) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawSpinButton(window, style, state_type, 1, x, y, width, height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
-- if (DETAIL("spinbutton"))
-+ if (DETAIL("spinbutton")) {
- return;
-+ }
-
-- if (DETAIL("optionmenutab") || DETAIL("buttondefault"))
-+ if (DETAIL("optionmenutab") || DETAIL("buttondefault")) {
- return;
--
-+ }
-+
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawFrame(window,style,state_type,shadow_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
-
-
-@@ -916,11 +949,11 @@ draw_flat_box(GtkStyle * style,
- {
- sanitize_size(window, &width, &height);
-
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Flat Box (%d,%d,%d,%d) Widget: %s Detail: %s %d %d\n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type, GTK_STATE_SELECTED);
-+ }
-
-- if (DETAIL("tooltip"))
-- {
-+ if (DETAIL("tooltip")) {
- GdkColor tooltipColor;
- GdkGCValues gc_values;
- GdkGCValuesMask gc_values_mask;
-@@ -940,21 +973,25 @@ draw_flat_box(GtkStyle * style,
- gtk_gc_release(tooltipGc);
- }
-
-- if ((DETAILHAS("cell_even") || DETAILHAS("cell_odd")) && (state_type == GTK_STATE_SELECTED))
-- {
-+ if ((DETAILHAS("cell_even") || DETAILHAS("cell_odd")) && (state_type == GTK_STATE_SELECTED)) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawListViewItem(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
-- else if (DETAIL("listitem"))
-- {
-+ else if (DETAIL("listitem")) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawListViewItem(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
-- else if (DETAILHAS("cell_even"))
-- {
-+ else if (DETAILHAS("cell_even")) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- gdk_draw_rectangle(window, style->base_gc[GTK_STATE_NORMAL], TRUE, x, y, width, height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
-- else if (DETAILHAS("cell_odd"))
-- {
-+ else if (DETAILHAS("cell_odd")) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- gdk_draw_rectangle(window, alternateBackgroundGc(style), TRUE, x, y, width, height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- }
-
-@@ -972,26 +1009,28 @@ draw_check(GtkStyle * style,
- gint width,
- gint height)
- {
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Check (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+ }
-
-- if (GTK_IS_MENU_ITEM(widget))
-- {
-- if (shadow_type == GTK_SHADOW_IN)
-- {
-- if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget)))
-- {
-+ if (GTK_IS_MENU_ITEM(widget)) {
-+ if (shadow_type == GTK_SHADOW_IN) {
-+ if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) {
- GdkPixbuf *gpix;
- gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget), NULL, x, y, 0, 0, width, height);
- setFillPixmap(gpix);
- g_object_unref(gpix);
- }
--
-+
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawMenuCheck(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- return;
- }
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawCheckBox(window,style,state_type,(shadow_type==GTK_SHADOW_IN),x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
-
-
-@@ -1009,11 +1048,11 @@ draw_option(GtkStyle * style,
- gint width,
- gint height)
- {
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Option (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+ }
-
-- if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget)))
-- {
-+ if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) {
- GdkPixbuf *gpix;
- gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget),NULL, x, y, 0, 0, width, height);
- setFillPixmap(gpix);
-@@ -1022,11 +1061,16 @@ draw_option(GtkStyle * style,
-
- if (GTK_IS_MENU_ITEM(widget))
- {
-- if (shadow_type == GTK_SHADOW_IN)
-+ if (shadow_type == GTK_SHADOW_IN) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawMenuCheck(window,style,state_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+ }
- return;
- }
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawRadioButton(window,style,state_type,(shadow_type==GTK_SHADOW_IN),x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
-
-
-@@ -1043,8 +1087,9 @@ draw_tab(GtkStyle * style,
- gint width,
- gint height)
- {
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Tab (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+ }
-
- gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
- }
-@@ -1218,11 +1263,15 @@ draw_box_gap(GtkStyle* style,
-
- if (width<0 || height<0) return; /* Eclipse really can be this stupid! */
-
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Box_gap (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+ }
-
-- if (DETAIL("notebook"))
-+ if (DETAIL("notebook")) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawTabFrame(window,style,state_type,x,y-2,width,height+2, gtk_notebook_get_tab_pos((GtkNotebook *)widget));
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+ }
- }
-
-
-@@ -1245,8 +1294,9 @@ draw_extension(GtkStyle * style,
-
- sanitize_size (window, &width, &height);
-
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Extension (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+ }
-
- gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail,
- x, y, width, height);
-@@ -1265,8 +1315,9 @@ draw_focus (GtkStyle *style,
- gint width,
- gint height)
- {
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Focus Rect (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+ }
-
- GtkWidget* parent = gtk_widget_get_parent(widget);
-
-@@ -1274,7 +1325,9 @@ draw_focus (GtkStyle *style,
- GTK_IS_RADIO_BUTTON(widget) ||
- (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent))))
- {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawFocusRect(window, style, x, y, width, height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- return;
- }
-@@ -1293,24 +1346,31 @@ draw_slider(GtkStyle * style,
- gint height,
- GtkOrientation orientation)
- {
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Slider (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+ }
-
-- if (DETAIL("slider"))
-- {
-+ if (DETAIL("slider")) {
- GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(widget));
- int widgetX, widgetY;
-
- GtkWidget* parent = widget;
-- while (gtk_widget_get_parent(parent) != NULL)
-+ while (gtk_widget_get_parent(parent) != NULL) {
- parent = gtk_widget_get_parent(parent);
-+ }
-
- gtk_widget_translate_coordinates(widget, parent, 0, 0, &widgetX, &widgetY);
-
-- if (orientation == GTK_ORIENTATION_VERTICAL)
-+ if (orientation == GTK_ORIENTATION_VERTICAL) {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height, y-widgetY, widget->allocation.height);
-- else
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+ }
-+ else {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2, x-widgetX, widget->allocation.width);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+ }
- return;
- }
- }
-@@ -1334,10 +1394,13 @@ draw_handle(GtkStyle * style,
-
- sanitize_size(window, &width, &height);
-
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Handle (%d,%d,%d,%d) Widget: %s Detail: %s State Type: %d\n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type);
--
-+ }
-+
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawSplitter(window,style,state_type,orientation,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
-
diff --git a/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff b/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff
deleted file mode 100644
index 2985283a6..000000000
--- a/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff
+++ /dev/null
@@ -1,435 +0,0 @@
-commit a90aa09722d47f5f4009b089d8d874354899bdb8
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1387757695 -0600
-
- Fix Firefox scrollbars
-
-diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
-index 28faded..ccd18c1 100644
---- a/kcm_gtk/kcmgtk.cpp
-+++ b/kcm_gtk/kcmgtk.cpp
-@@ -185,6 +185,5 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
- widget->styleIcon->setPixmap(iconLoader.loadIcon("style", KIcon::Desktop));
- widget->fontIcon->setPixmap(iconLoader.loadIcon("fonts", KIcon::Desktop));
-- widget->firefoxIcon->setPixmap(iconLoader.loadIcon("firefox", KIcon::Desktop));
- widget->keyboardIcon->setPixmap(iconLoader.loadIcon("keyboard", KIcon::Desktop));
-
- getInstalledThemes();
-@@ -199,5 +198,4 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
- connect(widget->emacsBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(itemChanged()));
- connect(widget->fontChange, TQT_SIGNAL(clicked()), TQT_SLOT(fontChangeClicked()));
-- connect(widget->firefoxFix, TQT_SIGNAL(clicked()), TQT_SLOT(firefoxFixClicked()));
- connect(widget->emacsDetails, TQT_SIGNAL(clicked()), TQT_SLOT(emacsDetailsClicked()));
- connect(widget->warning3, TQT_SIGNAL(clicked()), TQT_SLOT(searchPathsClicked()));
-@@ -453,190 +451,6 @@ TQString KcmGtk::quickHelp() const
- return i18n("");
- }
-
--
--void KcmGtk::firefoxFixClicked()
--{
-- profiles.clear();
-- getProfiles(TQDir::homeDirPath() + "/.mozilla/firefox/", 0);
-- getProfiles(TQDir::homeDirPath() + "/.thunderbird/", 1);
--
-- TQString profilePath;
-- if (profiles.count() == 0)
-- {
-- KMessageBox::error(this, i18n("No Mozilla profiles found"), i18n("Could not load Mozilla profiles"));
-- return;
-- }
-- else if (profiles.count() == 1)
-- {
-- fixProfile(profiles.begin().data());
-- }
-- else
-- {
-- KDialogBase* dialog = new KDialogBase(this, "", true, i18n("Mozilla profile"), KDialogBase::Ok | KDialogBase::Cancel);
-- MozillaProfileWidget* w = new MozillaProfileWidget(dialog);
-- w->profilesList->header()->hide();
-- w->profilesList->hideColumn(1);
--
-- TQPixmap icon = KGlobal::iconLoader()->loadIcon("kuser", KIcon::Small);
--
-- for ( TQMapIterator<TQString,TQString> it = profiles.begin(); it != profiles.end(); ++it )
-- {
-- KListViewItem* i = new KListViewItem(w->profilesList);
-- i->setPixmap(0, icon);
-- i->setText(0, it.key());
-- i->setText(1, it.data());
-- }
--
-- dialog->setMainWidget(w);
-- if (dialog->exec() == TQDialog::Rejected)
-- {
-- delete dialog;
-- return;
-- }
--
-- TQListViewItemIterator it2(w->profilesList, TQListViewItemIterator::Selected);
-- while (it2.current())
-- {
-- KListViewItem* i = (KListViewItem*) it2.current();
-- ++it2;
--
-- fixProfile(i->text(1));
-- }
-- delete dialog;
-- }
--
-- KMessageBox::information(this, i18n("Your Mozilla profile was updated sucessfully. You must close and restart all Firefox and Thunderbird windows for the changes to take effect"), i18n("Mozilla profile"));
--}
--
--void KcmGtk::getProfiles(const TQString& basePath, int type)
--{
-- TQString fileName = basePath + "/profiles.ini";
-- if (TQFile::exists(fileName))
-- {
-- KConfig config(fileName, true, false);
-- TQStringList groups = config.groupList();
--
-- for ( TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it )
-- {
-- if (!(*it).lower().startsWith("profile"))
-- continue;
--
-- config.setGroup(*it);
-- TQString name = (type ? i18n("Thunderbird") : i18n("Firefox")) + " - " + config.readEntry("Name");
-- TQString path = config.readEntry("Path");
-- if (!path.startsWith("/"))
-- path = basePath + path;
-- profiles.insert(name, path);
-- }
-- }
--}
--
--void KcmGtk::fixProfile(const TQString& path)
--{
-- if (!TQFile::exists(path + "/chrome"))
-- {
-- TQDir dir(path);
-- dir.mkdir("chrome");
-- }
--
-- TQString data = scrollBarCSS();
-- writeFirefoxCSS(path + "/chrome/userChrome.css", data);
-- writeFirefoxCSS(path + "/chrome/userContent.css", data);
--}
--
--TQString KcmGtk::scrollBarCSS()
--{
-- // The following code determines how many buttons are on a scrollbar
-- // It works by looking at each pixel of the scrollbar's area not taken up by the groove,
-- // and asking the style which subcontrol is at that location.
-- TQScrollBar sbar(NULL);
-- sbar.setOrientation(Qt::Horizontal);
-- sbar.setValue(1);
-- sbar.resize(200,25);
--
-- TQRect rect = tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarGroove);
--
-- bool back1 = false;
-- bool forward1 = false;
-- bool back2 = false;
-- bool forward2 = false;
--
-- TQStyle::SubControl sc = TQStyle::SC_None;
-- for (TQPoint pos(0,7) ; pos.x()<rect.x() ; pos.setX(pos.x()+1))
-- {
-- TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos);
-- if (sc != sc2)
-- {
-- if (sc2 == TQStyle::SC_ScrollBarAddLine) forward1 = true;
-- if (sc2 == TQStyle::SC_ScrollBarSubLine) back1 = true;
-- sc = sc2;
-- }
-- }
-- sc = TQStyle::SC_None;
-- for (TQPoint pos(rect.x()+rect.width(),7) ; pos.x()<200 ; pos.setX(pos.x()+1))
-- {
-- TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos);
-- if (sc != sc2)
-- {
-- if (sc2 == TQStyle::SC_ScrollBarAddLine) forward2 = true;
-- if (sc2 == TQStyle::SC_ScrollBarSubLine) back2 = true;
-- sc = sc2;
-- }
-- }
--
-- TQString upTop = (back1 ? "-moz-box" : "none");
-- TQString downTop = (forward1 ? "-moz-box" : "none");
-- TQString upBottom = (back2 ? "-moz-box" : "none");
-- TQString downBottom = (forward2 ? "-moz-box" : "none");
--
-- TQString data;
-- data += "/* The following four lines were added by KDE */\n";
-- data += "scrollbarbutton[sbattr=\"scrollbar-up-top\"] { display: " + upTop + " !important; }\n";
-- data += "scrollbarbutton[sbattr=\"scrollbar-down-top\"] { display: " + downTop + " !important; }\n";
-- data += "scrollbarbutton[sbattr=\"scrollbar-up-bottom\"] { display: " + upBottom + " !important; }\n";
-- data += "scrollbarbutton[sbattr=\"scrollbar-down-bottom\"] { display: " + downBottom + " !important; }\n";
--
-- return data;
--}
--
--void KcmGtk::writeFirefoxCSS(const TQString& path, const TQString& data)
--{
-- TQString fileData;
-- TQFile file(path);
-- if (file.open(IO_ReadOnly))
-- {
-- TQTextStream stream(&file);
-- for (;;)
-- {
-- TQString line = stream.readLine();
-- if (line.isNull())
-- break;
--
-- if ((line == "# The following four lines were added by KDE") ||
-- (line == "/* The following four lines were added by KDE */"))
-- {
-- for (int i=0 ; i<4 ; i++)
-- stream.readLine();
-- continue;
-- }
--
-- fileData += line + "\n";
-- }
-- file.close();
-- }
--
-- if (!file.open(IO_WriteOnly | IO_Truncate))
-- {
-- KMessageBox::error(this, i18n("Could not write to %1").arg(path), i18n("Mozilla profile"));
-- return;
-- }
-- TQTextStream stream(&file);
-- stream << fileData << data;
-- file.close();
--
-- return;
--}
--
- void KcmGtk::emacsDetailsClicked()
- {
- if (emacsDetailsDialog == NULL)
-diff --git a/kcm_gtk/kcmgtk.h b/kcm_gtk/kcmgtk.h
-index 542a043..2c04919 100644
---- a/kcm_gtk/kcmgtk.h
-+++ b/kcm_gtk/kcmgtk.h
-@@ -71,7 +71,6 @@ public slots:
- void styleChanged();
- void fontChangeClicked();
- void itemChanged();
-- void firefoxFixClicked();
- void emacsDetailsClicked();
- void searchPathsClicked();
- void searchPathsOk();
-@@ -82,10 +81,6 @@ public slots:
-
- private:
- void updateFontPreview();
-- void getProfiles(const TQString& basePath, int type);
-- void fixProfile(const TQString& path);
-- TQString scrollBarCSS();
-- void writeFirefoxCSS(const TQString& path, const TQString& data);
- void getInstalledThemes();
-
- TQString env(TQString key);
-diff --git a/kcm_gtk/kcmgtkwidget.ui b/kcm_gtk/kcmgtkwidget.ui
-index 512a610..705655b 100644
---- a/kcm_gtk/kcmgtkwidget.ui
-+++ b/kcm_gtk/kcmgtkwidget.ui
-@@ -481,118 +481,6 @@
- </widget>
- </hbox>
- </widget>
-- <widget class="TQGroupBox">
-- <property name="name">
-- <cstring>groupBox1</cstring>
-- </property>
-- <property name="sizePolicy">
-- <sizepolicy>
-- <hsizetype>5</hsizetype>
-- <vsizetype>4</vsizetype>
-- <horstretch>0</horstretch>
-- <verstretch>0</verstretch>
-- </sizepolicy>
-- </property>
-- <property name="title">
-- <string>Firefox and Thunderbird</string>
-- </property>
-- <hbox>
-- <property name="name">
-- <cstring>unnamed</cstring>
-- </property>
-- <widget class="TQLayoutWidget">
-- <property name="name">
-- <cstring>layout7_2_2</cstring>
-- </property>
-- <vbox>
-- <property name="name">
-- <cstring>unnamed</cstring>
-- </property>
-- <widget class="TQLabel">
-- <property name="name">
-- <cstring>firefoxIcon</cstring>
-- </property>
-- <property name="scaledContents">
-- <bool>true</bool>
-- </property>
-- </widget>
-- <spacer>
-- <property name="name">
-- <cstring>spacer3_2_2</cstring>
-- </property>
-- <property name="orientation">
-- <enum>Vertical</enum>
-- </property>
-- <property name="sizeType">
-- <enum>Expanding</enum>
-- </property>
-- <property name="sizeHint">
-- <size>
-- <width>20</width>
-- <height>31</height>
-- </size>
-- </property>
-- </spacer>
-- </vbox>
-- </widget>
-- <widget class="TQLayoutWidget">
-- <property name="name">
-- <cstring>layout12</cstring>
-- </property>
-- <vbox>
-- <property name="name">
-- <cstring>unnamed</cstring>
-- </property>
-- <widget class="TQLabel">
-- <property name="name">
-- <cstring>textLabel1</cstring>
-- </property>
-- <property name="text">
-- <string>Scrollbar buttons may sometimes be displayed incorrectly in Firefox and Thunderbird. This can be fixed by installing some files into your Mozilla profile.</string>
-- </property>
-- <property name="alignment">
-- <set>WordBreak|AlignVCenter</set>
-- </property>
-- </widget>
-- <widget class="TQLayoutWidget">
-- <property name="name">
-- <cstring>layout11</cstring>
-- </property>
-- <hbox>
-- <property name="name">
-- <cstring>unnamed</cstring>
-- </property>
-- <widget class="TQPushButton">
-- <property name="name">
-- <cstring>firefoxFix</cstring>
-- </property>
-- <property name="text">
-- <string>I&amp;nstall scrollbar fix...</string>
-- </property>
-- </widget>
-- <spacer>
-- <property name="name">
-- <cstring>spacer11</cstring>
-- </property>
-- <property name="orientation">
-- <enum>Horizontal</enum>
-- </property>
-- <property name="sizeType">
-- <enum>Expanding</enum>
-- </property>
-- <property name="sizeHint">
-- <size>
-- <width>101</width>
-- <height>21</height>
-- </size>
-- </property>
-- </spacer>
-- </hbox>
-- </widget>
-- </vbox>
-- </widget>
-- </hbox>
-- </widget>
- <widget class="TQLabel">
- <property name="name">
- <cstring>textLabel1_2</cstring>
-@@ -634,7 +522,6 @@
- <tabstop>fontChange</tabstop>
- <tabstop>emacsBox</tabstop>
- <tabstop>emacsDetails</tabstop>
-- <tabstop>firefoxFix</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
-index 928aef3..eebcc93 100644
---- a/src/qt_qt_wrapper.cpp
-+++ b/src/qt_qt_wrapper.cpp
-@@ -2085,7 +2085,7 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate)
- stream << parse_rc_string("GtkScrollbar::stepper-size = " + TQString::number(tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarSubLine).width() - 1), "*");
-
- stream << parse_rc_string("GtkScrollbar::min-slider-length = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarSliderMin)), "*");
-- stream << parse_rc_string("GtkScrollbar::slider-width = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarExtent)-2), "*");
-+ stream << parse_rc_string("GtkScrollbar::slider-width = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarExtent)), "*");
-
- stream << parse_rc_string("GtkButton::child-displacement-x = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal)), "*");
- stream << parse_rc_string("GtkButton::child-displacement-y = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ButtonShiftVertical)), "*");
-diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
-index e84c4f7..4a2ee12 100644
---- a/src/qt_theme_draw.c
-+++ b/src/qt_theme_draw.c
-@@ -506,13 +506,16 @@ draw_arrow(GtkStyle* style,
- {
- sanitize_size(window, &width, &height);
-
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
--
-- if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
-+ }
-+
-+ if (DETAIL("hscrollbar") || DETAIL("vscrollbar")) {
- return;
-- if (DETAIL("spinbutton"))
-+ }
-+ if (DETAIL("spinbutton")) {
- return;
-+ }
- if (DETAIL("notebook"))
- {
- drawArrow(window, style, state_type, arrow_type, x, y, width, height);
-@@ -688,7 +691,12 @@ draw_box(GtkStyle * style,
- int orientation = ((width>height) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
-
- if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
-- drawScrollBar(window, style, state_type, orientation, adj, x, y, width, height);
-+ if (orientation == GTK_ORIENTATION_VERTICAL) {
-+ drawScrollBar(window, style, state_type, orientation, adj, x+1, y, width, height);
-+ }
-+ else {
-+ drawScrollBar(window, style, state_type, orientation, adj, x, y+1, width, height);
-+ }
- if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- return;
-@@ -1363,12 +1371,12 @@ draw_slider(GtkStyle * style,
-
- if (orientation == GTK_ORIENTATION_VERTICAL) {
- if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
-- drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height, y-widgetY, widget->allocation.height);
-+ drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height, y-widgetY, widget->allocation.height);
- if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- else {
- if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
-- drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2, x-widgetX, widget->allocation.width);
-+ drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height, x-widgetX, widget->allocation.width);
- if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- return;
diff --git a/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff b/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff
deleted file mode 100644
index 66b206591..000000000
--- a/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-commit 0330b848db129b3dc4daa2a57272ec3b2fb7984c
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1387965535 -0600
-
- Fix Firefox text edit widget glitches
- Clean up minor build warnings
-
-diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
-index 4a2ee12..c7992d5 100644
---- a/src/qt_theme_draw.c
-+++ b/src/qt_theme_draw.c
-@@ -29,7 +29,7 @@
- extern gboolean tde_showIconsOnPushButtons;
-
- static GdkPixbuf * (*stockRenderIcon)() = NULL;
--static void * (*stockDrawString)() = NULL;
-+// static void * (*stockDrawString)() = NULL;
-
- static void qtengine_style_init (QtEngineStyle *style);
- static void qtengine_style_class_init (QtEngineStyleClass *klass);
-@@ -128,13 +128,17 @@ draw_hline(GtkStyle* style,
- gint x2,
- gint y)
- {
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("HLINE (%d,%p,%d) Widget: %s Detail: %s\n",x1,y1,y,gtk_widget_get_name(widget),detail);
-+ }
-
-- if (DETAIL("vscale"))
-+ if (DETAIL("vscale")) {
- return;
-+ }
-
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawHLine(window,style,state_type,y,x1,x2);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
-
-
-@@ -149,13 +153,17 @@ draw_vline(GtkStyle* style,
- gint yDest,
- gint x)
- {
-- if (gtkQtDebug)
-+ if (gtkQtDebug) {
- printf("VLINE (%d,%d,%d) Widget: %s Detail: %s\n",ySource ,yDest ,x,gtk_widget_get_name(widget),detail);
-+ }
-
-
-- if (DETAIL("hscale"))
-+ if (DETAIL("hscale")) {
- return;
-+ }
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawVLine(window,style,state_type,x,ySource,yDest);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
-
- static void
-@@ -192,7 +200,9 @@ draw_shadow(GtkStyle *style,
- return;
- if (DETAIL("entry"))
- {
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawLineEdit(window,style,state_type,gtk_widget_is_focus(widget),x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
- if (DETAIL("frame") || DETAIL("trough") || DETAIL("viewport"))
-@@ -200,7 +210,9 @@ draw_shadow(GtkStyle *style,
- if (!GTK_IS_SCALE(widget))
- {
- /*printf("Frame (%d,%d) %dx%d %d %d\n", x,y,width,height,state_type, shadow_type);*/
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- drawFrame(window,style,state_type,shadow_type,x,y,width,height);
-+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- return;
- }
- }
-@@ -644,20 +656,20 @@ draw_diamond(GtkStyle * style,
- {
- }
-
--static void
--draw_string(GtkStyle *style,
-- GdkWindow *window,
-- GtkStateType state_type,
-- GdkRectangle *area,
-- GtkWidget *widget,
-- const gchar *detail,
-- gint x,
-- gint y,
-- const gchar *string)
--{
-- if (gtkQtDebug)
-- printf("STRING Widget: %s Detail: %s\n",gtk_widget_get_name(widget),detail);
--}
-+// static void
-+// draw_string(GtkStyle *style,
-+// GdkWindow *window,
-+// GtkStateType state_type,
-+// GdkRectangle *area,
-+// GtkWidget *widget,
-+// const gchar *detail,
-+// gint x,
-+// gint y,
-+// const gchar *string)
-+// {
-+// if (gtkQtDebug)
-+// printf("STRING Widget: %s Detail: %s\n",gtk_widget_get_name(widget),detail);
-+// }
-
- static void
- draw_box(GtkStyle * style,
-@@ -1464,13 +1476,11 @@ void draw_layout (GtkStyle *style,
- PangoAttrList *layoutattr;
-
- const gchar *text;
-- gint text_length = 0;
- gint text_bytelen = 0;
- text = pango_layout_get_text (layout);
- if (text != 0)
- {
- PangoAttribute *textcolorattr;
-- text_length = g_utf8_strlen (text, -1);
- text_bytelen = strlen (text);
-
- textcolorattr = pango_attr_foreground_new(color.red, color.green, color.blue);
-@@ -2040,7 +2050,7 @@ qtengine_style_class_init (QtEngineStyleClass *klass)
- parent_class = g_type_class_peek_parent (klass);
-
- stockRenderIcon = style_class->render_icon;
-- stockDrawString = style_class->draw_string;
-+// stockDrawString = style_class->draw_string;
-
- style_class->render_icon = draw_icon;
-
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
deleted file mode 100644
index d6c1a5311..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define tde_pkg gtk-qt-engine
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: theme engine using Qt for GTK+ 2.x and Trinity
-Version: 0.8
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-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
-
-# Fix severe iceweasel/icedove tab bar corruption
-# Clean up minor build warnings
-Patch1: 1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff
-# Fix numerous drawing glitches in Firefox
-Patch2: 1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff
-# Fix Firefox scrollbars
-Patch3: 1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff
-# Fix Firefox text edit widget glitches
-# Clean up minor build warnings
-Patch4: 1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
-that calls Qt to do the actual drawing. This makes your GTK 2 applications
-look almost like real Qt applications and gives you a more unified desktop
-experience.
-
-Please note that this package is targeted at Trinity users and therefore provides
-a way to configure it from within KControl.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-3.5.13.2%{?preversion:~%{preversion}}
-
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-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} -DNDEBUG" \
- -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- \
- -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DDATA_INSTALL_DIR=%{tde_datadir} \
- -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} -C build
-
-%find_lang gtkqtengine
-
-# Adds TDE's specific GTKRC
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
-%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
-%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f gtkqtengine.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_tdelibdir}/kcm_kcmgtk.la
-%{tde_tdelibdir}/kcm_kcmgtk.so
-%{tde_appdir}/kcmgtk.desktop
-%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
-
-# The following files are outside TDE's directory
-%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so
-%{_datadir}/themes/Qt/gtk-2.0/gtkrc
-
-
-%changelog
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
index d22c56f35..0c82b8b5f 120000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
@@ -1 +1 @@
-../../../ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh \ No newline at end of file
+../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh \ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
index ef32736f0..6f5f6b3b7 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.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 gtk-qt-engine
%define tde_prefix /opt/trinity
@@ -141,7 +141,7 @@ fi
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DDATA_INSTALL_DIR=%{tde_datadir} \
+ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
..
@@ -157,9 +157,9 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang gtkqtengine
# Adds TDE's specific GTKRC
-%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh"
-%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4"
-%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4"
+%__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"
%clean
@@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdelibdir}/kcm_kcmgtk.la
%{tde_tdelibdir}/kcm_kcmgtk.so
%{tde_appdir}/kcmgtk.desktop
-%dir %{tde_datadir}/kgtk
-%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
+%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/
# The following files are outside TDE's directory
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
index fbb967811..f71a6795b 120000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
+++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
@@ -1 +1 @@
-../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 \ No newline at end of file
+../../../ubuntu/xenial/applications/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
index 122ae8e16..8e006a46b 120000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
+++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
@@ -1 +1 @@
-../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 \ No newline at end of file
+../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 \ No newline at end of file
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec
index be57d2f0e..e4100aaca 100644
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec
+++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.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 gtk3-tqt-engine
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec
deleted file mode 100644
index f04999d0e..000000000
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec
+++ /dev/null
@@ -1,167 +0,0 @@
-# Default version for this component
-%define tde_pkg gwenview-i18n
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: Internationalization support for Gwenview [Trinity]
-Version: 1.4.2
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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 || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export KDEDIR="%{tde_prefix}"
-
-./configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_tdedocdir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-## File lists
-%find_lang gwenview
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%postun
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%files -f gwenview.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%lang(da) %{tde_tdedocdir}/HTML/da/gwenview/
-%lang(de) %{tde_tdedocdir}/HTML/de/gwenview/
-%lang(et) %{tde_tdedocdir}/HTML/et/gwenview/
-%lang(fr) %{tde_tdedocdir}/HTML/fr/gwenview/
-%lang(it) %{tde_tdedocdir}/HTML/it/gwenview/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/gwenview/
-%lang(pl) %{tde_tdedocdir}/HTML/pl/gwenview/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/gwenview/
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/gwenview/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/gwenview/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/gwenview/
-
-
-%changelog
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/gwenview-i18n/gwenview-i18n.spec
index 59bbfaa5b..ab08edf97 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec
+++ b/redhat/applications/gwenview-i18n/gwenview-i18n.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 gwenview-i18n
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/gwenview/gwenview-3.5.13.2.spec b/redhat/applications/gwenview/gwenview-3.5.13.2.spec
deleted file mode 100644
index 55105a6c9..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13.2.spec
+++ /dev/null
@@ -1,187 +0,0 @@
-# Default version for this component
-%define tde_pkg gwenview
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: Gwenview is an image viewer for TDE.
-Version: 1.4.2
-Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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 || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_tdedocdir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%postun
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/gwenview
-%{tde_libdir}/libgwenviewcore.la
-%{tde_libdir}/libgwenviewcore.so.1
-%{tde_libdir}/libgwenviewcore.so.1.0.0
-%{tde_libdir}/libkdeinit_gwenview.la
-%{tde_libdir}/libkdeinit_gwenview.so
-%{tde_tdelibdir}/gwenview.la
-%{tde_tdelibdir}/gwenview.so
-%{tde_tdelibdir}/libgvdirpart.la
-%{tde_tdelibdir}/libgvdirpart.so
-%{tde_tdelibdir}/libgvimagepart.la
-%{tde_tdelibdir}/libgvimagepart.so
-%{tde_tdeappdir}/gwenview.desktop
-%{tde_datadir}/apps/gwenview/
-%{tde_datadir}/apps/gvdirpart/gvdirpart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.sh
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.upd
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.sh
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.upd
-%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop
-%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg
-%{tde_datadir}/config.kcfg/fileviewconfig.kcfg
-%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg
-%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg
-%{tde_datadir}/config.kcfg/imageviewconfig.kcfg
-%{tde_datadir}/config.kcfg/miscconfig.kcfg
-%{tde_datadir}/config.kcfg/slideshowconfig.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/*/apps/gwenview.png
-%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png
-%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
-%{tde_datadir}/man/man1/gwenview.1*
-%{tde_datadir}/services/gvdirpart.desktop
-%{tde_datadir}/services/gvimagepart.desktop
-%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
-
-%changelog
diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview.spec
index 8f635bf08..723996a29 100644
--- a/redhat/applications/gwenview/gwenview-14.0.0.spec
+++ b/redhat/applications/gwenview/gwenview.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 gwenview
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec
deleted file mode 100644
index 13ce2e60f..000000000
--- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec
+++ /dev/null
@@ -1,405 +0,0 @@
-# Default version for this component
-%define tde_pkg k3n-i18n
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-k3b-i18n
-Summary: Internationalization support for TDE [Trinity]
-Version: 1.0.5
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-BuildArch: noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group: Applications/Archiving
-License: GPLv2+
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires: trinity-k3b
-
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-##########
-
-%package Danish
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Danish (da) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-da < %{version}-%{release}
-Provides: trinity-k3b-i18n-da = %{version}-%{release}
-
-%description Danish
-This package contains the Danish translations for K3B.
-
-%files Danish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/da/k3b
-%{tde_datadir}/locale/da/LC_MESSAGES/*.mo
-
-##########
-
-%package German
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: German (de) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-de < %{version}-%{release}
-Provides: trinity-k3b-i18n-de = %{version}-%{release}
-
-%description German
-This package contains the German translations for K3B.
-
-%files German
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/de/k3b
-%{tde_datadir}/locale/de/LC_MESSAGES/*.mo
-
-##########
-
-%package Greek
-Group: Applications/Archiving
-Requires: trinity-k3b >= %{version}
-Summary: Greek (el) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-el < %{version}-%{release}
-Provides: trinity-k3b-i18n-el = %{version}-%{release}
-
-%description Greek
-This package contains the greek translations for K3B.
-
-%files Greek
-%defattr(-,root,root,-)
-#%{tde_tdedocdir}/HTML/el/k3b
-%{tde_datadir}/locale/el/LC_MESSAGES/*.mo
-
-##########
-
-%package Spanish
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Spanish (es) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-es < %{version}-%{release}
-Provides: trinity-k3b-i18n-es = %{version}-%{release}
-
-%description Spanish
-This package contains the Spanish translations for K3B.
-
-%files Spanish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/es/k3b
-%{tde_datadir}/locale/es/LC_MESSAGES/*.mo
-
-##########
-
-%package Estonian
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Estonian (et) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-et < %{version}-%{release}
-Provides: trinity-k3b-i18n-et = %{version}-%{release}
-
-%description Estonian
-This package contains the Estonian translations for K3B.
-
-%files Estonian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/et/k3b
-%{tde_datadir}/locale/et/LC_MESSAGES/*.mo
-
-##########
-
-%package French
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: French (fr) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-fr < %{version}-%{release}
-Provides: trinity-k3b-i18n-fr = %{version}-%{release}
-
-%description French
-This package contains the French translations for K3B.
-
-%files French
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/fr/k3b
-%{tde_datadir}/locale/fr/LC_MESSAGES/*.mo
-
-##########
-
-%package Italian
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Italian (it) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-it < %{version}-%{release}
-Provides: trinity-k3b-i18n-it = %{version}-%{release}
-
-%description Italian
-This package contains the Italian translations for K3B.
-
-%files Italian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/it/k3b
-%{tde_datadir}/locale/it/LC_MESSAGES/*.mo
-
-##########
-
-%package Dutch
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Dutch (nl) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-nl < %{version}-%{release}
-Provides: trinity-k3b-i18n-nl = %{version}-%{release}
-
-%description Dutch
-This package contains the Dutch translations for K3B.
-
-%files Dutch
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/nl/k3b
-%{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
-
-##########
-
-%package Polish
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Polish (pl) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-pl < %{version}-%{release}
-Provides: trinity-k3b-i18n-pl = %{version}-%{release}
-
-%description Polish
-This package contains the Polish translations for K3B.
-
-%files Polish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/pl/k3b
-%{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
-
-##########
-
-%package Portuguese
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Portuguese (pt) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-pt < %{version}-%{release}
-Provides: trinity-k3b-i18n-pt = %{version}-%{release}
-
-%description Portuguese
-This package contains the Portuguese translations for K3B.
-
-%files Portuguese
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/pt/k3b
-%{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
-
-##########
-
-%package Brazil
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-pt_BR < %{version}-%{release}
-Provides: trinity-k3b-i18n-pt_BR = %{version}-%{release}
-Obsoletes: trinity-k3b-i18n-ptbr < %{version}-%{release}
-Provides: trinity-k3b-i18n-ptbr = %{version}-%{release}
-
-%description Brazil
-This package contains the Brazilian Portuguese translations for K3B.
-
-%files Brazil
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/pt_BR/k3b
-%{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo
-
-##########
-
-%package Russian
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Russian (ru) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-ru < %{version}-%{release}
-Provides: trinity-k3b-i18n-ru = %{version}-%{release}
-
-%description Russian
-This package contains the Russian translations for K3B.
-
-%files Russian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/ru/k3b
-%{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
-
-##########
-
-%package Swedish
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Swedish (sv) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-sv < %{version}-%{release}
-Provides: trinity-k3b-i18n-sv = %{version}-%{release}
-
-%description Swedish
-This package contains the Swedish translations for K3B.
-
-%files Swedish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/sv/k3b
-%{tde_datadir}/locale/sv/LC_MESSAGES/*.mo
-
-##########
-
-%package Ukrainian
-Group: Applications/Archiving
-Requires: trinity-k3b
-Summary: Ukrainian (uk) translations for K3B [Trinity]
-
-Obsoletes: trinity-k3b-i18n-uk < %{version}-%{release}
-Provides: trinity-k3b-i18n-uk = %{version}-%{release}
-
-%description Ukrainian
-This package contains the Ukrainian translations for K3B.
-
-%files Ukrainian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/uk/k3b
-%{tde_datadir}/locale/uk/LC_MESSAGES/*.mo
-
-##########
-
-%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 || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-./configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_tdedocdir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__rm -rf %{buildroot}%{tde_datadir}/locale/af
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ar
-%__rm -rf %{buildroot}%{tde_datadir}/locale/bg
-%__rm -rf %{buildroot}%{tde_datadir}/locale/br
-%__rm -rf %{buildroot}%{tde_datadir}/locale/bs
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ca
-%__rm -rf %{buildroot}%{tde_datadir}/locale/cs
-%__rm -rf %{buildroot}%{tde_datadir}/locale/cy
-%__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB
-%__rm -rf %{buildroot}%{tde_datadir}/locale/eu
-%__rm -rf %{buildroot}%{tde_datadir}/locale/fa
-%__rm -rf %{buildroot}%{tde_datadir}/locale/fi
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ga
-%__rm -rf %{buildroot}%{tde_datadir}/locale/gl
-%__rm -rf %{buildroot}%{tde_datadir}/locale/he
-%__rm -rf %{buildroot}%{tde_datadir}/locale/hi
-%__rm -rf %{buildroot}%{tde_datadir}/locale/hu
-%__rm -rf %{buildroot}%{tde_datadir}/locale/is
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ja
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ka
-%__rm -rf %{buildroot}%{tde_datadir}/locale/km
-%__rm -rf %{buildroot}%{tde_datadir}/locale/lt
-%__rm -rf %{buildroot}%{tde_datadir}/locale/mk
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ms
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nb
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nds
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ne
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nn
-%__rm -rf %{buildroot}%{tde_datadir}/locale/pa
-%__rm -rf %{buildroot}%{tde_datadir}/locale/rw
-%__rm -rf %{buildroot}%{tde_datadir}/locale/se
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sk
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sr
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sr@Latn
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ta
-%__rm -rf %{buildroot}%{tde_datadir}/locale/tr
-%__rm -rf %{buildroot}%{tde_datadir}/locale/uz
-%__rm -rf %{buildroot}%{tde_datadir}/locale/uz@cyrillic
-%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_CN
-%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_TW
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n.spec
index c641a739f..37b598615 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec
+++ b/redhat/applications/k3b-i18n/k3b-i18n.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 k3b-i18n
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec
deleted file mode 100644
index 851cf978e..000000000
--- a/redhat/applications/k3b/k3b-3.5.13.2.spec
+++ /dev/null
@@ -1,468 +0,0 @@
-# Default version for this component
-%define tde_pkg k3b
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: CD/DVD burning application
-Epoch: 1
-Version: 1.0.5
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group: Applications/Archiving
-License: GPLv2+
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source2: k3brc
-
-# Fix FTBFS because AVCODEC_MAX_AUDIO_FRAME_SIZE is obsolete
-Patch1: k3b-3.5.13.2-fix_ffmpeg_support.patch
-
-# Legacy RedHat / Fedora patches
-# manual bufsize (upstream?)
-Patch4: k3b-1.0.4-manualbufsize.patch
-# RHEL6: Fix K3B icon
-Patch106: trinity-k3b-icons.patch
-
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: alsa-lib-devel
-BuildRequires: audiofile-devel
-BuildRequires: hal-devel
-BuildRequires: gettext
-BuildRequires: libmpcdec-devel
-BuildRequires: libmusicbrainz-devel
-BuildRequires: libvorbis-devel
-BuildRequires: taglib-devel
-BuildRequires: zlib-devel
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if 0%{?suse_version} >= 1310
-Requires: wodim
-REquires: genisoimage
-%else
-Requires: cdrecord
-REquires: mkisofs
-%endif
-Requires: dvd+rw-tools
-
-# CDRDAO support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5
-Requires: cdrdao
-%endif
-
-# DBUS support
-# TQT bindings not available for RHEL4
-%if 0%{?rhel} == 4
-# Dbus bindings were rebuilt with Qt support
-BuildRequires: dbus-devel >= 0.22-12.EL.9p1
-Requires: dbus-qt >= 0.22-12.EL.9p1
-%else
-BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
-Requires: trinity-dbus-tqt >= 1:0.63
-%endif
-
-# SNDFILE support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
-%define with_sndfile 1
-BuildRequires: libsndfile-devel
-%endif
-
-# SAMPLERATE support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
-%define with_samplerate 1
-BuildRequires: libsamplerate-devel
-%endif
-
-# DVDREAD support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
-%define with_dvdread 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: %{_lib}dvdread-devel
-%else
-BuildRequires: libdvdread-devel
-%endif
-%endif
-
-# FLAC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: libflac-devel
-BuildRequires: libflac++-devel
-%else
-BuildRequires: %{_lib}flac-devel
-BuildRequires: %{_lib}flac++-devel
-%endif
-%else
-BuildRequires: flac-devel
-%endif
-
-# MAD support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_libmad 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: %{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires: libmad-devel
-%endif
-%endif
-
-# LAME support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_lame 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: liblame-devel
-%else
-BuildRequires: %{_lib}lame-devel
-%endif
-%endif
-%if 0%{?suse_version}
-BuildRequires: libmp3lame-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: lame-devel
-%endif
-%endif
-
-# FFMPEG support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_ffmpeg 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: %{_lib}ffmpeg-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires: ffmpeg-devel
-%endif
-%endif
-
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING TODO ChangeLog
-%{tde_bindir}/k3b
-%{tde_tdelibdir}/kfile_k3b.la
-%{tde_tdelibdir}/kfile_k3b.so
-%{tde_tdelibdir}/kio_videodvd.la
-%{tde_tdelibdir}/kio_videodvd.so
-%{tde_tdelibdir}/libk3balsaoutputplugin.la
-%{tde_tdelibdir}/libk3balsaoutputplugin.so
-%{tde_tdelibdir}/libk3bartsoutputplugin.la
-%{tde_tdelibdir}/libk3bartsoutputplugin.so
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so
-%{tde_tdelibdir}/libk3bexternalencoder.la
-%{tde_tdelibdir}/libk3bexternalencoder.so
-%{tde_tdelibdir}/libk3bflacdecoder.la
-%{tde_tdelibdir}/libk3bflacdecoder.so
-%if 0%{?with_sndfile}
-%{tde_tdelibdir}/libk3blibsndfiledecoder.la
-%{tde_tdelibdir}/libk3blibsndfiledecoder.so
-%endif
-%{tde_tdelibdir}/libk3bmpcdecoder.la
-%{tde_tdelibdir}/libk3bmpcdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisdecoder.la
-%{tde_tdelibdir}/libk3boggvorbisdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisencoder.la
-%{tde_tdelibdir}/libk3boggvorbisencoder.so
-%{tde_tdelibdir}/libk3bsoxencoder.la
-%{tde_tdelibdir}/libk3bsoxencoder.so
-%{tde_tdelibdir}/libk3bwavedecoder.la
-%{tde_tdelibdir}/libk3bwavedecoder.so
-%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
-
-##########
-
-%package common
-Summary: Common files of %{name}
-Group: Applications/Archiving
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildArch: noarch
-%endif
-
-%description common
-%{summary}.
-
-%files common
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/k3b.desktop
-%{tde_datadir}/applnk/.hidden/k3b-cue.desktop
-%{tde_datadir}/applnk/.hidden/k3b-iso.desktop
-%{tde_datadir}/apps/k3b/
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_datadir}/config/k3brc
-%{tde_datadir}/mimelnk/application/x-k3b.desktop
-%{tde_datadir}/icons/hicolor/*/apps/k3b.png
-%{tde_datadir}/services/kfile_k3b.desktop
-%{tde_datadir}/services/videodvd.protocol
-%{tde_datadir}/sounds/k3b_error1.wav
-%{tde_datadir}/sounds/k3b_success1.wav
-%{tde_datadir}/sounds/k3b_wait_media1.wav
-
-
-%post common
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-
-%postun common
-if [ $1 -eq 0 ] ; then
- touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null
- gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
- update-desktop-database %{tde_appdir} -q &> /dev/null
-fi
-
-%posttrans common
-gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database %{tde_appdir} -q &> /dev/null
-
-##########
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/libk3b.so.3
-%{tde_libdir}/libk3b.so.3.0.0
-%{tde_libdir}/libk3bdevice.so.5
-%{tde_libdir}/libk3bdevice.so.5.0.0
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-##########
-
-%package devel
-Summary: Files for the development of applications which will use %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libk3b.so
-%{tde_libdir}/libk3bdevice.so
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?with_libmad}
-%package plugin-mad
-Summary: The MAD plugin for K3B
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-mad
-%{summary}.
-
-MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
-and the MPEG-2 extension to Lower Sampling Frequencies, as well as the
-so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
-and Layer III a.k.a. MP3) are fully implemented.
-
-%files plugin-mad
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bmaddecoder.la
-%{tde_tdelibdir}/libk3bmaddecoder.so
-%endif
-
-##########
-
-%if 0%{?with_lame}
-%package plugin-lame
-Summary: The LAME plugin for K3B
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-lame
-%{summary}.
-
-Personal and commercial use of compiled versions of LAME (or any other mp3
-encoder) requires a patent license in some countries.
-
-This package is in tainted, as MP3 encoding is covered by software patents.
-
-%files plugin-lame
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3blameencoder.la
-%{tde_tdelibdir}/libk3blameencoder.so
-%endif
-
-##########
-
-%if 0%{?with_ffmpeg}
-%package plugin-ffmpeg
-Summary: The FFMPEG plugin for K3B
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-ffmpeg
-%{summary}.
-
-ffmpeg is a hyper fast realtime audio/video encoder, a streaming server
-and a generic audio and video file converter.
-
-%files plugin-ffmpeg
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bffmpegdecoder.la
-%{tde_tdelibdir}/libk3bffmpegdecoder.so
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%patch1 -p1 -b .ffmpeg
-%patch4 -p1 -b .manualbufsize
-%patch106 -p1 -b .desktopfile
-
-%__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
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# FFMPEG trick ...
-if [ -d /usr/include/ffmpeg ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
-fi
-
-# Notice: extra-includes is required to find arts headers
-%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 \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- \
- --with-extra-includes=%{tde_includedir} \
- \
- --with-k3bsetup=no \
- --without-cdrecord-suid-root \
- --with-oggvorbis \
- --with-flac \
- %{?with_samplerate:--with-external-libsamplerate} \
- %{?with_dvdread:--with-libdvdread} %{?!with_dvdread:--without-libdvdread} \
- --with-musicbrainz \
- %{?with_sndfile:--with-sndfile} %{?!with_sndfile:--without-sndfile} \
- %{?with_ffmpeg:--with-ffmpeg} %{?!with_ffmpeg:--without-ffmpeg} \
- %{?with_lame:--with-lame} %{?!with_lame:--without-lame} \
- %{?with_libmad:--with-libmad} %{?!with_libmad:--without-libmad} \
- --with-musepack \
- --without-resmgr \
- --with-hal
-
-# Strange behaviour on RHEL4 ...
-%if 0%{?rhel} == 4
-%__sed -i "libk3b/jobs/Makefile" -e "/^am_libjobs_la_final_OBJECTS/ s/ lo//g"
-%__mkdir_p "libk3bdevice/.libs"
-%__ln_s . "libk3bdevice/.libs/.libs"
-%endif
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc
-
-# remove the .la files
-%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b.spec
index fd33e5a7a..5cddbd662 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b.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 k3b
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/k3b/k3brc
new file mode 100644
index 000000000..5d967f599
--- /dev/null
+++ b/redhat/applications/k3b/k3brc
@@ -0,0 +1,6 @@
+[General Options]
+check system config=false
+Manual buffer size=true
+
+[Notification Messages]
+Don't prompt me again.=No
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec
deleted file mode 100644
index a7a026ab9..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define tde_pkg k9copy
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: DVD backup tool for Trinity
-Version: 1.2.3
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch1: k9copy-3.5.13.2-fix_k3b_link.patch
-Patch2: k9copy-3.5.13.2-ftbfs.patch
-Patch3: k9copy-3.5.13.2-use_external_dvdread.patch
-Patch4: k9copy-3.5.13.2-avcodec.patch
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: trinity-k3b-devel
-
-# Warning: the target distribution must have ffmpeg !
-BuildRequires: ffmpeg-devel
-Requires: ffmpeg
-
-
-%description
-k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
-to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
-This is the Trinity version.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .ftbfs
-%patch2 -p1 -b .ftbfs
-%patch3 -p1 -b .dvdread
-%patch4 -p1 -b .avcodec
-
-# Removes internal dvdread headers
-%__rm -rf dvdread
-
-%__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/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# FFMPEG ...
-if [ -d /usr/include/ffmpeg ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
-fi
-
-# NOTICE: --enable-final causes FTBFS !
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --disable-final \
- --enable-new-ldflags \
- --enable-closure \
- --enable-rpath \
- \
- --enable-k3bdevices
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/k9copy
-%{tde_tdeappdir}/k9copy.desktop
-%{tde_datadir}/apps/k9copy/
-%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
-%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
-%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
-
-
-%changelog
diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy.spec
index f03137ba4..656727906 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0.spec
+++ b/redhat/applications/k9copy/k9copy.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 k9copy
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch
deleted file mode 100644
index 210fff5f1..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kaffeine-mozilla/src/jni_md.h.ORI 2012-04-26 20:44:15.080210122 +0200
-+++ kaffeine-mozilla/src/jni_md.h 2012-04-26 20:44:28.006895031 +0200
-@@ -40,7 +40,7 @@
- #ifndef JNI_MD_H
- #define JNI_MD_H
-
--#include <nspr/prtypes.h> /* needed for _declspec */
-+#include <nspr4/prtypes.h> /* needed for _declspec */
-
- /*******************************************************************************
- * WHAT'S UP WITH THIS FILE?
---- kaffeine-mozilla/src/jri_md.h.ORI 2012-04-26 20:44:20.528077329 +0200
-+++ kaffeine-mozilla/src/jri_md.h 2012-04-26 20:44:36.239694357 +0200
-@@ -43,7 +43,7 @@
- #define JRI_MD_H
-
- #include <assert.h>
--#include <nspr/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */
-+#include <nspr4/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */
-
- #ifdef __cplusplus
- extern "C" {
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
deleted file mode 100644
index e00b81a06..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
+++ /dev/null
@@ -1,120 +0,0 @@
-# Default version for this component
-%define kdecomp kaffeine-mozilla
-
-# TDE 3.5.13 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}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity]
-Version: 0.4.3.1
-Release: 3%{?dist}
-
-License: GPLv2+
-Group: Applications/Multimedia
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.1.tar.gz
-
-# Fix 'nspr' includes location
-Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires: trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-%if 0%{?suse_version}
-BuildRequires: mozilla-nspr-devel
-%else
-BuildRequires: nspr-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xaw-devel
-%else
-BuildRequires: libXaw-devel
-%endif
-
-Requires: trinity-kaffeine
-
-%description
-This mozilla plugin launches kaffeine, the xine-based media player for KDE,
-when a page containing a supported media format is loaded.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-unset QTDIR; . /etc/profile.d/qt3.sh
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1
-
-%__cp -f "/usr/share/aclocal/libtool.m4" .
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
-
-autoreconf -fiv
-
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure \
- --prefix=%{_libdir}/mozilla
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Remove useless filess
-%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-# These files are installed outside TDE prefix
-%{_libdir}/mozilla/plugins/kaffeineplugin.la
-%{_libdir}/mozilla/plugins/kaffeineplugin.so
-
-
-%changelog
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch
deleted file mode 100644
index e4a255dce..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh.ORI 2014-03-23 11:29:59.873837637 +0100
-+++ trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh 2014-03-23 11:30:39.942924217 +0100
-@@ -130,7 +130,7 @@
- fi
-
- echo "*** Creating Makefile templates"
--$AUTOMAKE || exit 1
-+$AUTOMAKE --add-missing || exit 1
-
- if test "$UNSERMAKE" = no; then
- echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
deleted file mode 100644
index b2230c6b3..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
+++ /dev/null
@@ -1,131 +0,0 @@
-# Default version for this component
-%define tde_pkg kaffeine-mozilla
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: mozilla plugin that lanches kaffeine for supported media types [Trinity]
-Version: 0.4.3.1
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Multimedia
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# Fix 'nspr' includes location
-Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch
-# Fix build with newer automake
-Patch2: kaffeine-mozilla-3.5.13.2-fix_automake.patch
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-%if 0%{?suse_version}
-BuildRequires: mozilla-nspr-devel
-%else
-BuildRequires: nspr-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xaw-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires: libXaw-devel
-%endif
-
-Requires: trinity-kaffeine
-
-%description
-This mozilla plugin launches kaffeine, the xine-based media player for TDE,
-when a page containing a supported media format is loaded.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .nspr
-%patch2 -p1 -b .automake
-
-%__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
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{_libdir}/mozilla \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Remove useless filess
-%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-# These files are installed outside TDE prefix
-%{_libdir}/mozilla/plugins/kaffeineplugin.la
-%{_libdir}/mozilla/plugins/kaffeineplugin.so
-
-
-%changelog
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
deleted file mode 100644
index fdaafa4b0..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
+++ /dev/null
@@ -1,110 +0,0 @@
-# Default version for this component
-%define kdecomp kaffeine-mozilla
-
-# TDE 3.5.13 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}/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: mozilla plugin that lanches kaffeine for supported media types [Trinity]
-Version: 0.4.3.1
-Release: 2%{?dist}
-
-License: GPLv2+
-Group: Applications/Multimedia
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-
-# Fix 'nspr' includes location
-Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: nspr-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xaw-devel
-%else
-BuildRequires: libXaw-devel
-%endif
-
-Requires: trinity-kaffeine
-
-%description
-This mozilla plugin launches kaffeine, the xine-based media player for KDE,
-when a page containing a supported media format is loaded.
-
-
-%prep
-unset QTDIR; . /etc/profile.d/qt.sh
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-%__cp -f "/usr/share/aclocal/libtool.m4" .
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
-
-autoreconf -fiv
-
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure \
- --prefix=%{_libdir}/mozilla
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Remove useless filess
-%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-# These files are installed outside TDE prefix
-%{_libdir}/mozilla/plugins/kaffeineplugin.la
-%{_libdir}/mozilla/plugins/kaffeineplugin.so
-
-
-%changelog
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
index f9d3be544..775501caa 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
@@ -17,8 +17,9 @@
# Default version for this component
%define tde_pkg kaffeine-mozilla
+%define tde_prefix /opt/trinity
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
# TDE specific building variables
@@ -37,7 +38,7 @@
%define _docdir %{tde_docdir}
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
%define debug_package %{nil}
%endif
@@ -58,8 +59,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-# Fix 'nspr' includes location
-Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -94,7 +97,6 @@ when a page containing a supported media format is loaded.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .nspr
%__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"
@@ -136,6 +138,8 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
# These files are installed outside TDE prefix
+%dir %{_libdir}/mozilla
+%dir %{_libdir}/mozilla/plugins
%{_libdir}/mozilla/plugins/kaffeineplugin.la
%{_libdir}/mozilla/plugins/kaffeineplugin.so
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
deleted file mode 100644
index e46e985cc..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ /dev/null
@@ -1,289 +0,0 @@
-# Default version for this component
-%define tde_pkg kaffeine
-%define tde_version 3.5.13.2
-
-# 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_tdeappdir %{tde_datadir}/applications/kde
-%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: Xine-based media player
-
-Version: 0.8.8
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Multimedia
-URL: http://kaffeine.sourceforge.net/
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-# VORBIS support
-BuildRequires: libvorbis-devel
-
-# CDDA support
-BuildRequires: libcdio-devel
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libcdda-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: cdparanoia
-BuildRequires: cdparanoia-devel
-%endif
-%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-BuildRequires: libcdio-paranoia-devel
-%endif
-
-# X11 stuff
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires: %{_lib}xext-devel
-BuildRequires: %{_lib}xtst-devel
-BuildRequires: %{_lib}xinerama-devel
-%else
-BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
-BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
-BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} == 4
-BuildRequires: xorg-x11-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires: libXext-devel
-BuildRequires: libXtst-devel
-BuildRequires: libXinerama-devel
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: libxcb-devel
-%endif
-
-# GSTREAMER support
-%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gstreamer 1
-%if 0%{?suse_version}
-BuildRequires: gstreamer-0_10-devel
-BuildRequires: gstreamer-0_10-plugins-base-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires: gstreamer-plugins-base-devel >= 0.10
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libgstreamer-devel >= 0.10
-BuildRequires: libgstreamer-plugins-base-devel >= 0.10
-%endif
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# LAME support
-%if 0%{?suse_version}
-BuildRequires: libmp3lame-devel
-%else
-BuildRequires: lame-devel
-%endif
-
-# WTF support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-BuildRequires: kernel-headers
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires: glibc-kernheaders
-%endif
-
-Requires: %{name}-libs = %{version}-%{release}
-
-%description
-Kaffeine is a xine-based media player for TDE. It plays back CDs,
-and VCDs, and can decode all (local or streamed) multimedia formats
-supported by xine-lib.
-Additionally, Kaffeine is fully integrated in TDE, it supports drag
-and drop and provides an editable playlist, a bookmark system, a
-Konqueror plugin, OSD and much more.
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kaffeine
-%{tde_libdir}/libkaffeinepart.so
-%{tde_tdelibdir}/lib*.*
-%{tde_datadir}/appl*/*/*.desktop
-%if 0%{?with_gstreamer}
-%{tde_datadir}/apps/gstreamerpart/
-%endif
-%{tde_datadir}/apps/kaffeine/
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_datadir}/apps/profiles/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/service*/*.desktop
-%{tde_tdedocdir}/HTML/en/kaffeine/
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: trinity-tdelibs-devel
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kaffeine/
-%{tde_libdir}/lib*.so
-%exclude %{tde_libdir}/libkaffeinepart.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%package libs
-Summary: %{name} runtime libraries
-Group: System Environment/Libraries
-
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/lib*.so.*
-
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
-##########
-
-%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
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export KDEDIR=%{tde_prefix}
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --mandir=%{tde_mandir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- \
- --with-xinerama \
- --with-gstreamer \
- --with-lame \
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
- --without-dvb \
-%endif
-
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-## File lists
-# locale's
-%find_lang %{tde_pkg}
-
-# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine.spec
index d38e6a27d..2ff080f22 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine.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 kaffeine
%define tde_prefix /opt/trinity
@@ -140,9 +140,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%endif
# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}xine1.2-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca.spec
index 3a92fd87c..7680c1cff 100644
--- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec
+++ b/redhat/applications/kasablanca/kasablanca.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 kasablanca
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -77,6 +77,12 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
# OPENSSL support
BuildRequires: openssl-devel
@@ -117,43 +123,44 @@ Kasablanca is an ftp client, among its features are currently:
%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"
-## Needed(?) for older/legacy setups, harmless otherwise
-if pkg-config openssl ; then
- export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
+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} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
- --datadir=%{tde_datadir} \
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
# locale's
%find_lang %{tde_pkg}
@@ -170,13 +177,14 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING README
%{tde_bindir}/kasablanca
%{tde_datadir}/apps/kasablanca/
%{tde_datadir}/config.kcfg/kbconfig.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kasablanca.png
%{tde_tdedocdir}/HTML/en/kasablanca/
%{tde_tdeappdir}/kasablanca.desktop
+%{tde_mandir}/man1/kasablanca.*
%changelog
diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec
deleted file mode 100644
index c26f46fbd..000000000
--- a/redhat/applications/katapult/katapult-3.5.13.2.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-# Default version for this component
-%define tde_pkg katapult
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: Faster access to applications, bookmarks, and other items.
-Version: 0.3.2.1
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-
-%description
-Katapult is an application for TDE, designed to allow faster access to
-applications, bookmarks, and other items. It is plugin-based, so it can
-launch anything that is has a plugin for. Its display is driven by
-plugins as well, so its appearance is completely customizable. It was
-inspired by Quicksilver for OS X.
-
-
-%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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/*.so
-%__rm -f %{?buildroot}%{tde_libdir}/*.la
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/katapult
-%{tde_libdir}/libkatapult.so.2
-%{tde_libdir}/libkatapult.so.2.0.0
-%{tde_tdelibdir}/katapult_amarokcatalog.la
-%{tde_tdelibdir}/katapult_amarokcatalog.so
-%{tde_tdelibdir}/katapult_bookmarkcatalog.la
-%{tde_tdelibdir}/katapult_bookmarkcatalog.so
-%{tde_tdelibdir}/katapult_calculatorcatalog.la
-%{tde_tdelibdir}/katapult_calculatorcatalog.so
-%{tde_tdelibdir}/katapult_documentcatalog.la
-%{tde_tdelibdir}/katapult_documentcatalog.so
-%{tde_tdelibdir}/katapult_execcatalog.la
-%{tde_tdelibdir}/katapult_execcatalog.so
-%{tde_tdelibdir}/katapult_glassdisplay.la
-%{tde_tdelibdir}/katapult_glassdisplay.so
-%{tde_tdelibdir}/katapult_googlecatalog.la
-%{tde_tdelibdir}/katapult_googlecatalog.so
-%{tde_tdelibdir}/katapult_o2display.la
-%{tde_tdelibdir}/katapult_o2display.so
-%{tde_tdelibdir}/katapult_programcatalog.la
-%{tde_tdelibdir}/katapult_programcatalog.so
-%{tde_tdelibdir}/katapult_puredisplay.la
-%{tde_tdelibdir}/katapult_puredisplay.so
-%{tde_tdelibdir}/katapult_spellcatalog.la
-%{tde_tdelibdir}/katapult_spellcatalog.so
-%{tde_tdeappdir}/katapult.desktop
-%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz
-%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png
-%{tde_datadir}/icons/hicolor/128x128/actions/no.png
-%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png
-%{tde_datadir}/icons/hicolor/*/apps/katapult.png
-%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz
-%{tde_datadir}/services/katapult_amarokcatalog.desktop
-%{tde_datadir}/services/katapult_bookmarkcatalog.desktop
-%{tde_datadir}/services/katapult_calculatorcatalog.desktop
-%{tde_datadir}/services/katapult_documentcatalog.desktop
-%{tde_datadir}/services/katapult_execcatalog.desktop
-%{tde_datadir}/services/katapult_glassdisplay.desktop
-%{tde_datadir}/services/katapult_googlecatalog.desktop
-%{tde_datadir}/services/katapult_o2display.desktop
-%{tde_datadir}/services/katapult_programcatalog.desktop
-%{tde_datadir}/services/katapult_puredisplay.desktop
-%{tde_datadir}/services/katapult_spellcatalog.desktop
-%{tde_datadir}/servicetypes/katapultcatalog.desktop
-%{tde_datadir}/servicetypes/katapultdisplay.desktop
-%{tde_tdedocdir}/HTML/en/katapult/
-
-
-%changelog
diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/katapult/katapult.spec
index f0e281a27..1e71f52d7 100644
--- a/redhat/applications/katapult/katapult.spec
+++ b/redhat/applications/katapult/katapult.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 katapult
%define tde_prefix /opt/trinity
@@ -153,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Fix desktop files (openSUSE only)
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%if 0%{?suse_version}
-%suse_update_desktop_file -G "Application Launcher" katapult DesktopUtility
+%suse_update_desktop_file -G "Application Launcher" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
%endif
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec
deleted file mode 100644
index 1713feaab..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-# Default version for this component
-%define tde_pkg kbarcode
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: barcode and label printing application for Trinity
-Version: 2.0.6
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.kbarcode.net
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-KBarcode is a barcode and label printing application for Trinity. It can be used
-to print everything from simple business cards up to complex labels with
-several barcodes (e.g. article descriptions).
-
-KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard,
-batch import of data for batch printing labels (directly from the delivery
-note), thousands of predefined labels, database management tools and
-translations in many languages. Even printing more than 10.000 labels in one
-go is no problem for KBarcode. Data for printing can be imported from several
-different data sources, including SQL databases, CSV files and the TDE address
-book.
-
-Additionally it is a simple barcode generator (similar to the old xbarcode you
-might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are
-supported. Even complex 2D barcodes are supported using third party tools. The
-generated barcodes can be directly printed or you can export them into images
-to use them in another application.
-
-
-%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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- \
- --with-extra-includes=%{_includedir}/pcre
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kbarcode
-%{tde_tdelibdir}/kfile_kbarcode.la
-%{tde_tdelibdir}/kfile_kbarcode.so
-%{tde_tdeappdir}/kbarcode-batch.desktop
-%{tde_tdeappdir}/kbarcode-editor.desktop
-%{tde_tdeappdir}/kbarcode-label.desktop
-%{tde_tdeappdir}/kbarcode-single.desktop
-%{tde_tdeappdir}/kbarcode.desktop
-%{tde_datadir}/apps/kbarcode/
-%{tde_datadir}/icons/hicolor/*/actions/barcode.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
-%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
-%{tde_datadir}/services/kfile_kbarcode.desktop
-
-
-%changelog
diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/kbarcode/kbarcode.spec
index a10cd0ab1..423d99ebe 100644
--- a/redhat/applications/kbarcode/kbarcode.spec
+++ b/redhat/applications/kbarcode/kbarcode.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 kbarcode
%define tde_prefix /opt/trinity
@@ -114,7 +114,7 @@ to use them in another application.
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
%{tde_bindir}/kbarcode
%{tde_tdeappdir}/kbarcode-batch.desktop
%{tde_tdeappdir}/kbarcode-editor.desktop
@@ -136,7 +136,6 @@ to use them in another application.
%package tdefile-plugin
Summary: tdefile-plugin for %{name}
Group: Applications/Utilities
-#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description tdefile-plugin
%{summary}.
@@ -207,10 +206,10 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file -r kbarcode Utility PrintingUtility
-%suse_update_desktop_file -r kbarcode-batch Utility PrintingUtility
-%suse_update_desktop_file -r kbarcode-editor Utility PrintingUtility
-%suse_update_desktop_file -r kbarcode-single Utility PrintingUtility
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" Utility PrintingUtility
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-batch.desktop" Utility PrintingUtility
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-editor.desktop" Utility PrintingUtility
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-single.desktop" Utility PrintingUtility
%endif
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec
deleted file mode 100644
index f3e9f4694..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-# Default version for this component
-%define tde_pkg kbfx
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: an alternative to K-Menu for TDE [Trinity]
-Version: 0.4.9.3.1
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-
-%description
-KBFX is an alternative to the classical K-Menu button and its menu.
-It improves the user experience by enabling him to set a bigger (and thus more
-visible) start button and by finally replacing the Win95-like K-Menu.
-If you still want the old menu, because you're used to it, it is still
-available as an option in kbfx. We recommend, however, that you give the Spinx
-bar a try.
-
-Homepage: http://www.kbfx.org
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Fix TDE executable path in 'CMakeLists.txt' ...
-%__sed -i "CMakeLists.txt" \
- -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \
- -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|"
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
- export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
- export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
- %__mkdir_p build
- cd build
-fi
-
-%cmake \
- -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
- -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- \
- -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
- -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
- -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
- -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\
- -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- \
- -DUSE_STRIGI=OFF \
- -DUSE_MENUDRAKE=OFF \
- -DBUILD_DOC=ON \
- -DBUILD_ALL=OFF \
- ..
-
-# Not SMP safe !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build VERBOSE=1
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kbfxconfigapp
-%{tde_tdeincludedir}/kbfx/
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so
-%{tde_libdir}/libkbfxcommon.la
-%{tde_libdir}/libkbfxcommon.so
-%{tde_libdir}/libkbfxdata.la
-%{tde_libdir}/libkbfxdata.so
-%{tde_tdelibdir}/kbfxspinx.la
-%{tde_tdelibdir}/kbfxspinx.so
-%{tde_tdeappdir}/kbfx_theme.desktop
-%{tde_tdeappdir}/kbfxconfigapp.desktop
-%{tde_datadir}/apps/kbfx/skins/*/*
-%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
-%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg
-#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/
-%{tde_tdedocdir}/kbfx/
-%{tde_datadir}/icons/hicolor/*/apps/kbfx.png
-%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
-#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo
-%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
-
-
-%changelog
diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec
index 50da69568..b38c55ab2 100644
--- a/redhat/applications/kbfx/kbfx.spec
+++ b/redhat/applications/kbfx/kbfx.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 kbfx
%define tde_prefix /opt/trinity
@@ -222,6 +222,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/hicolor/*/apps/kbfx.png
%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/kbfxconfigapp.mo
%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo
%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo
%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo
diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec
index 9148c5f29..2a822f934 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/kbibtex/kbibtex.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 kbibtex
%define tde_prefix /opt/trinity
@@ -152,7 +152,7 @@ fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file -G "Bibliography Manager" kbibtex TDE Office Database
+%suse_update_desktop_file -G "Bibliography Manager" "%{?buildroot}%{tde_tdeappdir}/kbibtex.desktop" TDE Office Database
%endif
@@ -162,7 +162,7 @@ fi
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS BUGS COPYING NEWS README TODO ChangeLog
+%doc AUTHORS COPYING NEWS README TODO ChangeLog
%{tde_bindir}/kbibtex
%{tde_tdelibdir}/libkbibtexpart.la
%{tde_tdelibdir}/libkbibtexpart.so
diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec
index 52a298657..10a297c6a 100644
--- a/redhat/applications/kbiff/kbiff.spec
+++ b/redhat/applications/kbiff/kbiff.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 kbiff
%define tde_prefix /opt/trinity
@@ -147,14 +147,10 @@ fi
%find_lang %{tde_pkg}
-# Fix icon location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Internet/kbiff.desktop" "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
-
# Updates applications categories for openSUSE
%if 0%{?suse_version}
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
-%suse_update_desktop_file kbiff Applet
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" Applet
%endif
diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec
deleted file mode 100644
index 61f8a726c..000000000
--- a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec
+++ /dev/null
@@ -1,118 +0,0 @@
-# Default version for this component
-%define tde_pkg kbookreader
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: eBook reader for Trinity.
-Version: 0.2.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-
-%description
-kbookreader is an application which allows you to view eBooks
-within the Trinity Desktop Environment.
-
-
-%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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/bookreader
-%{tde_bindir}/bookreader_client
-%{tde_datadir}/applnk/Utilities/bookreader.desktop
-%{tde_datadir}/apps/bookreader/
-%{tde_datadir}/config.kcfg/bookreader.kcfg
-%{tde_tdedocdir}/HTML/en/bookreader/
-%{tde_datadir}/icons/hicolor/*/apps/bookreader.png
-
-
-%changelog
diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec
index 90e316458..a0832ce80 100644
--- a/redhat/applications/kbookreader/kbookreader.spec
+++ b/redhat/applications/kbookreader/kbookreader.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 kbookreader
%define tde_prefix /opt/trinity
@@ -142,21 +142,19 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-# Fix desktop icon location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Office/bookreader.desktop" "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop"
-
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer
%endif
+%find_lang %{tde_pkg} || touch %{tde_pkg}.lang
+
%clean
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/bookreader
diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec
deleted file mode 100644
index 36012a73f..000000000
--- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define tde_pkg kchmviewer
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: CHM viewer for Trinity
-Version: 3.1.2
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-
-%description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
-Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
-library, and does not depend on TDE or GNOME. However, it may be compiled
-with full Trinity support, including Trinity widgets and KIO/KHTML.
-
-The main advantage of KchmViewer is non-English language support. Unlike
-others, KchmViewer in most cases correctly detects help file encoding,
-correctly shows tables of context of Russian, Korean, Chinese and Japanese
-help files, and correctly searches in non-English help files (search for
-MBCS languages - ja/ko/ch is still in progress).
-
-Completely safe and harmless. Does not support JavaScript in any way,
-optionally warns you before opening an external web page, or switching to
-another help file. Shows an appropriate image for every TOC entry.
-
-KchmViewer Has complete chm index support, including multiple index entries,
-cross-links and parent/child entries in index as well as Persistent bookmarks
-support. Correctly detects and shows encoding of any valid chm file.
-
-
-%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 || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# 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} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --disable-final \
- --enable-closure \
- --enable-rpath \
- \
- --with-x \
- --with-kde
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Removes useless files
-%__rm -f %{?buildroot}%{tde_libdir}/*.a
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING FAQ README
-%{tde_bindir}/kchmviewer
-%{tde_tdelibdir}/kio_msits.la
-%{tde_tdelibdir}/kio_msits.so
-%{tde_datadir}/applnk/kchmviewer.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
-%{tde_datadir}/services/msits.protocol
-
-
-%changelog
diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer.spec
index dca19c1d4..b03422fb8 100644
--- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec
+++ b/redhat/applications/kchmviewer/kchmviewer.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 kchmviewer
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -76,8 +76,21 @@ BuildRequires: brp-check-trinity
%endif
# CHMLIB support
+%if 0%{?rhel} == 8
+%define with_chmlib 0
+%else
+%define with_chmlib 1
BuildRequires: chmlib-devel
+%endif
+
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+# OPENSSL support
+BuildRequires: openssl-devel
%description
KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
@@ -112,47 +125,47 @@ support. Correctly detects and shows encoding of any valid chm file.
%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"
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
- export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
fi
-# 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} \
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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}" \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --disable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ -DWITH_CHMLIB=%{?with_chmlib} \
\
- --with-x \
- --with-kde
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=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}
@@ -160,8 +173,11 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -f %{?buildroot}%{tde_libdir}/*.a
# Fix desktop icon location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+ %__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
# Updates applications categories for openSUSE
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
@@ -185,6 +201,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
%{tde_datadir}/services/msits.protocol
%{tde_tdedocdir}/HTML/en/kchmviewer/
%{tde_tdedocdir}/HTML/en/tdeioslave/msits/
+%{tde_mandir}/man1/kchmviewer.*
%changelog
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec
deleted file mode 100644
index 0ccd9d6d5..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-# Default version for this component
-%define tde_pkg kchmviewer
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-kcmautostart
-Summary: Manage applications automatic startup.
-Version: 1.0
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: kcmautostart-3.5.13.tar.gz
-
-# [kcmautostart] Fix FTBFS with TDE 3.5.13
-Patch1: kcmautostart-3.5.13-ftbfs.patch
-# [kcmautostart] Add French support
-Patch2: kcmautostart-3.5.13-add_french.patch
-# [kcmautostart] kcmautostart crash on exit
-Patch3: kcmautostart-3.5.13-fix_crash_on_exit.patch
-# [kcmautostart] Fix french translation
-Patch4: kcmautostart-3.5.13-fix_fr_translation.patch
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gcc-c++
-
-Requires: trinity-tdebase >= %{tde_version}
-
-%description
-%{summary}
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n applications/kcmautostart
-%patch1 -p1 -b .ftbfs
-%patch2 -p1
-%patch3 -p1 -b .crash_on_exit
-%patch4 -p1 -b .fr_translation
-
-%__sed -i admin/acinclude.m4.in \
- -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/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang autostart
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f autostart.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%{tde_tdelibdir}/kcm_autostart.la
-%{tde_tdelibdir}/kcm_autostart.so
-%{tde_tdeappdir}/autostart.desktop
-%{tde_tdedocdir}/HTML/en/autostart/
-
-
-%changelog
diff --git a/redhat/applications/kcmautostart/kcmautostart-fr.po b/redhat/applications/kcmautostart/kcmautostart-fr.po
deleted file mode 100644
index 6d898bc97..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-fr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2012-05-10 12:01+0100\n"
-"Project-Id-Version: autostart_ca\n"
-"Language-Team: <ca@li.org>\n"
-"X-Generator: KBabel 1.11.4\n"
-"MIME-Version: 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Last-Translator: Josep Febrer <josep@extens.info>\n"
-
-#: ../src/autostart.cpp:61
-msgid "Startup"
-msgstr "Démarrage"
-
-#: ../src/autostart.cpp:62
-msgid "Shutdown"
-msgstr "Arrêt"
-
-#: ../src/autostart.cpp:63
-msgid "ENV"
-msgstr "ENV"
-
-#: ../src/autostart.cpp:102
-msgid "Name"
-msgstr "Nom"
-
-#: ../src/autostart.cpp:103
-msgid "Command"
-msgstr "Comande"
-
-#: ../src/autostart.cpp:104
-msgid "Run on"
-msgstr "Executer"
-
-#: ../src/autostart.cpp:129
-msgid "&Add"
-msgstr "&Ajouter"
-
-#: ../src/autostart.cpp:131
-msgid "&Remove"
-msgstr "&Supprimer"
-
-#: ../src/autostart.cpp:133
-msgid "&Properties"
-msgstr "&Propiétés"
-
-#: ../src/autostart.cpp:317
-msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
-msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE."
-
diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/kcmautostart/kcmautostart.spec
index 0006b6f31..76ab3145d 100644
--- a/redhat/applications/kcmautostart/kcmautostart.spec
+++ b/redhat/applications/kcmautostart/kcmautostart.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 kcmautostart
%define tde_prefix /opt/trinity
@@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f autostart.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+%doc AUTHORS ChangeLog COPYING INSTALL README
%{tde_tdelibdir}/kcm_autostart.la
%{tde_tdelibdir}/kcm_autostart.so
%{tde_tdeappdir}/autostart.desktop
diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec
index 5fcf25a9b..5fd5cef1e 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/kcmldap/kcmldap.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 kcmldap
%define tde_prefix /opt/trinity
@@ -101,13 +101,16 @@ BuildRequires: openldap2-devel
BuildRequires: openldap24-libs-devel
%endif
+# KRB5 support
+#BuildRequires: krb5-devel
+
# HEIMDAL support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: heimdal-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libheimdal-devel
-%endif
+#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+#BuildRequires: heimdal-devel
+#%endif
+#%if 0%{?suse_version}
+#BuildRequires: libheimdal-devel
+#%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -141,7 +144,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms
%files -n trinity-kcontrol-ldap-bonding
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
+%doc AUTHORS COPYING
%{tde_bindir}/tdeldapbonding
%{tde_tdelibdir}/kcm_ldapbonding.la
%{tde_tdelibdir}/kcm_ldapbonding.so
@@ -162,7 +165,7 @@ This is a small daemon which keeps the LDAP root certificate up to date with the
%files -n trinity-tde-ldap-cert-updater
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
+%doc AUTHORS COPYING
%{tde_bindir}/tdeldapcertupdater
##########
@@ -208,11 +211,6 @@ fi
-DBUILD_DOC=ON \
-DBUILD_TRANSLATIONS=ON \
\
-%if 0%{?suse_version}
- -DKRB5_FOUND=1 \
- -DKRB5_LIBRARIES="-lkrb5" \
- -DKRB5_INCLUDE_DIRS="/usr/include" \
-%endif
..
%__make %{?_smp_mflags} || %__make
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
index 88a889e4e..b84e6d939 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
+++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.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 kcmldapcontroller
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-libtdeldap-devel >= 0.5
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -91,13 +91,16 @@ BuildRequires: openldap2-devel
BuildRequires: openldap24-libs-devel
%endif
+# KRB5 support
+#BuildRequires: krb5-devel
+
# HEIMDAL support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: heimdal-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libheimdal-devel
-%endif
+#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+#BuildRequires: heimdal-devel
+#%endif
+#%if 0%{?suse_version}
+#BuildRequires: libheimdal-devel
+#%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -113,6 +116,15 @@ BuildRequires: libcom_err-devel
BuildRequires: %{_lib}ext2fs-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -132,9 +144,9 @@ This is a TDE control center module to manage users, groups, and machines in Ker
%files -n trinity-kcontrol-ldap-controller
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
+%doc AUTHORS COPYING
%{tde_bindir}/primaryrccertupdater
-%if 0%{?pclinuxos} == 0
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7
%{tde_libdir}/slapi-acl-manager.la
%{tde_libdir}/slapi-acl-manager.so
%endif
@@ -161,55 +173,48 @@ This is a TDE control center module to manage users, groups, and machines in Ker
%__rm -rf acl-updater
%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"
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
- extra_includes="%{_includedir}/openldap24:${extra_includes}"
- extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
- extra_includes="%{_includedir}/heimdal:${extra_includes}"
- extra_libs="%{_libdir}/heimdal:${extra_libs}"
+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} \
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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}" \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
\
- --with-extra-includes=${extra_includes} \
- --with-extra-libs=${extra_libs} \
+ ..
-%__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
%clean
diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec
index 008da620d..86c7b27d3 100644
--- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec
+++ b/redhat/applications/kcmldapmanager/kcmldapmanager.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 kcmldapmanager
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-libtdeldap-devel >= 0.5
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -88,13 +88,16 @@ BuildRequires: openldap2-devel
BuildRequires: openldap24-libs-devel
%endif
+# KRB5 support
+#BuildRequires: krb5-devel
+
# HEIMDAL support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: heimdal-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libheimdal-devel
-%endif
+#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+#BuildRequires: heimdal-devel
+#%endif
+#%if 0%{?suse_version}
+#BuildRequires: libheimdal-devel
+#%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -110,6 +113,15 @@ BuildRequires: libcom_err-devel
BuildRequires: %{_lib}ext2fs-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -127,9 +139,9 @@ Group: Applications/Utilities
%description -n trinity-kcontrol-ldap-manager
This is a TDE control center module to manage users, groups, and machines in Kerberos realms.
-%files -n trinity-kcontrol-ldap-manager
+%files -n trinity-kcontrol-ldap-manager -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
+%doc AUTHORS COPYING
%{tde_bindir}/tdeldapmanager
%{tde_tdelibdir}/kcm_ldapmanager.la
%{tde_tdelibdir}/kcm_ldapmanager.so
@@ -146,55 +158,49 @@ This is a TDE control center module to manage users, groups, and machines in Ker
%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"
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
- extra_includes="%{_includedir}/openldap24:${extra_includes}"
- extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
- extra_includes="%{_includedir}/heimdal:${extra_includes}"
- extra_libs="%{_libdir}/heimdal:${extra_libs}"
+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} \
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
\
- --with-extra-includes=${extra_includes} \
- --with-extra-libs=${extra_libs} \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=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} || touch %{tde_pkg}.lang
%clean
diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
deleted file mode 100644
index df8ec2705..000000000
--- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# Default version for this component
-%define tde_pkg kcpuload
-%define tde_version 3.5.13.2
-
-# 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: a CPU meter for Kicker [Trinity]
-Version: 2.00
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-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)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-KCPULoad is a small program for Kicker (the TDE panel). It shows a
-recent history of CPU usage in the form of one or two configurable
-diagrams in the system tray. These diagrams have settings for colours
-and various different styles.
-
-KCPULoad has support for SMP and separate user/system loads.
-
-
-%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 || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in crystalsvg locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kcpuload
-%{tde_datadir}/applnk/System/kcpuload.desktop
-%{tde_datadir}/apps/kcpuload/icons/*/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png
-%{tde_datadir}/icons/locolor/*/apps/kcpuload.png
-%{tde_tdedocdir}/HTML/en/kcpuload/
-
-
-%changelog
diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec
index cda688320..437b8b9dd 100644
--- a/redhat/applications/kcpuload/kcpuload.spec
+++ b/redhat/applications/kcpuload/kcpuload.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 kcpuload
%define tde_prefix /opt/trinity
@@ -144,14 +144,12 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-# Fix desktop icon location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/System/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+%find_lang %{tde_pkg} || touch %{tde_pkg}.lang
# Fix desktop files (openSUSE only)
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%if 0%{?suse_version}
-%suse_update_desktop_file kcpuload System Monitor
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor
%endif
@@ -159,7 +157,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/kcpuload
%{tde_tdeappdir}/kcpuload.desktop
diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg.spec
index 0728d9ad7..b37eef30f 100644
--- a/redhat/applications/kdbg/kdbg-14.0.0.spec
+++ b/redhat/applications/kdbg/kdbg.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 kdbg
%define tde_prefix /opt/trinity
@@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_bindir}/kdbg
%{tde_tdeappdir}/kdbg.desktop
%{tde_datadir}/apps/kdbg/
-%{tde_confdir}/kdbgrc
+%config(noreplace) %{tde_confdir}/kdbgrc
%lang(de) %{tde_tdedocdir}/HTML/de/kdbg/
%lang(en) %{tde_tdedocdir}/HTML/en/kdbg/
%lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch
deleted file mode 100644
index 4ed8c1c52..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp.ORI 2013-07-20 11:16:18.010011618 +0200
-+++ trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp 2013-07-20 11:27:19.135889426 +0200
-@@ -231,9 +231,10 @@
- }
-
- // Send a notification request to KDE here...
-- TQString messageText = TQString(body);
-+ TQString messageCaption = TQString::fromLocal8Bit(summary);
-+ TQString messageText = TQString::fromLocal8Bit(body);
-
-- GTKNotifierContainer->displayMessage(TQString(summary), TQString(body), TQString(icon), x, y);
-+ GTKNotifierContainer->displayMessage(messageCaption, messageText, TQString(icon), x, y);
-
- return_id = 0;
-
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
deleted file mode 100644
index 36202497b..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
+++ /dev/null
@@ -1,117 +0,0 @@
-# Default version for this component
-%define tde_pkg kdbusnotification
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: a DBUS notification service [Trinity]
-
-Version: 0.1
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch1: kdbusnotification-3.5.13.2-fix_utf8.patch
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gtk2-devel
-
-%if 0%{?suse_version}
-BuildRequires: dbus-1-glib-devel
-%else
-BuildRequires: dbus-glib-devel
-%endif
-
-%description
-kdbusnotification is a small program for Trinity that displays
-DBUS notifications via unobtrusive, easily dismissed passive popups.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .utf8
-
-%__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/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/notification-daemon-tde
-%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
-
-
-
-%changelog
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification.spec
index 25fbabe11..28fb3058d 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification.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 kdbusnotification
%define tde_prefix /opt/trinity
@@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -84,6 +84,15 @@ BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-glib-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
%description
kdbusnotification is a small program for Trinity that displays
@@ -102,38 +111,53 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
%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} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Fix for Fedora 31
+if [ -r "/usr/include/harfbuzz/hb.h" ]; then
+ #export CMAKE_INCLUDE_PATH="/usr/include/harfbuzz"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz"
+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} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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}" \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
\
- --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
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
deleted file mode 100644
index e4099e05b..000000000
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
+++ /dev/null
@@ -1,138 +0,0 @@
-# Default version for this component
-%define tde_pkg kdiff3
-%define tde_version 3.5.13.2
-
-# 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: KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Version: 0.9.91
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-
-%description
-Shows the differences line by line and character by character (!).
-Provides an automatic merge-facility and
-an integrated editor for comfortable solving of merge-conflicts.
-Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
-Unicode & UTF-8 support
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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; . /etc/profile.d/qt3.sh
-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} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-# These are not HTML files but weird files in wrong place ??
-%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || :
-done
-
-%postun
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/kdiff3
-%{tde_datadir}/apps/kdiff3/
-%{tde_datadir}/apps/kdiff3part/
-%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png
-%{tde_datadir}/icons/locolor/*/apps/kdiff3.png
-%{tde_tdedocdir}/HTML/*/kdiff3/
-%{tde_datadir}/services/kdiff3_plugin.desktop
-%{tde_datadir}/services/kdiff3part.desktop
-%{tde_datadir}/applnk/Development/*.desktop
-%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
-%{tde_mandir}/man*/*
-%{tde_tdelibdir}/libkdiff3part.la
-%{tde_tdelibdir}/libkdiff3part.so
-%{tde_tdelibdir}/libkdiff3plugin.la
-%{tde_tdelibdir}/libkdiff3plugin.so
-
-%changelog
diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3.spec
index 50a13a04c..964ca2151 100644
--- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec
+++ b/redhat/applications/kdiff3/kdiff3.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 kdiff3
%define tde_prefix /opt/trinity
@@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -70,6 +70,15 @@ BuildRequires: libtool
BuildRequires: update-desktop-files
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
%description
Shows the differences line by line and character by character (!).
@@ -91,52 +100,66 @@ Unicode & UTF-8 support
%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"
+
+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} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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}" \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=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
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kdiff3.desktop" Development RevisionControl
+%endif
# Unwanted files
# These are not HTML files but weird files in wrong place ??
%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
%find_lang %{tde_pkg}
+%find_lang %{tde_pkg}_plugin
%clean
%__rm -rf %{buildroot}
-%files -f %{tde_pkg}.lang
+%files -f %{tde_pkg}.lang -f %{tde_pkg}_plugin.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/kdiff3
@@ -144,10 +167,11 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/kdiff3part/
%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png
%{tde_datadir}/icons/locolor/*/apps/kdiff3.png
+%{tde_docdir}/kdiff3/
%{tde_tdedocdir}/HTML/*/kdiff3/
%{tde_datadir}/services/kdiff3_plugin.desktop
%{tde_datadir}/services/kdiff3part.desktop
-%{tde_datadir}/applnk/Development/*.desktop
+%{tde_tdeappdir}/kdiff3.desktop
%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
%{tde_mandir}/man*/*
%{tde_tdelibdir}/libkdiff3part.la
diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec
deleted file mode 100644
index 7eae449e0..000000000
--- a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec
+++ /dev/null
@@ -1,133 +0,0 @@
-# Default version for this component
-%define tde_pkg kdirstat
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: graphical disk usage display with cleanup facilities [Trinity]
-Version: 2.4.4
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-KDirStat (TDE Directory Statistics) is a small utility program that sums
-up disk usage for directory trees, very much like the Unix 'du' command.
-It displays the disk space used up by a directory tree, both numerically
-and graphically. It is network transparent (i.e., you can use it to sum
-up FTP servers), and comes with predefined and user configurable cleanup
-actions. You can directly open a directory branch in Konqueror or the
-shell of your choice, compress it to a .tar.bz2 archive, or define your
-own cleanup actions.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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; . /etc/profile.d/qt3.sh
-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} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kdirstat
-%{tde_datadir}/applnk/Utilities/kdirstat.desktop
-%{tde_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl
-%{tde_datadir}/apps/kconf_update/kdirstat.upd
-%{tde_datadir}/apps/kdirstat/
-%{tde_tdedocdir}/HTML/en/kdirstat/
-%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png
-%{tde_datadir}/icons/locolor/*/apps/kdirstat.png
-
-
-%changelog
diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/kdirstat/kdirstat.spec
index bdb19ef5d..cd63cfcc3 100644
--- a/redhat/applications/kdirstat/kdirstat.spec
+++ b/redhat/applications/kdirstat/kdirstat.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 kdirstat
%define tde_prefix /opt/trinity
@@ -151,13 +151,9 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
-# Fix desktop file location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/kdirstat.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" kdirstat Filesystem
+%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" Filesystem
%endif
diff --git a/redhat/applications/keep/keep-3.5.13.2.spec b/redhat/applications/keep/keep-3.5.13.2.spec
deleted file mode 100644
index 7dba42000..000000000
--- a/redhat/applications/keep/keep-3.5.13.2.spec
+++ /dev/null
@@ -1,128 +0,0 @@
-# Default version for this component
-%define tde_pkg keep
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: backup system for TDE [Trinity]
-Version: 0.4.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-Requires: rdiff-backup
-
-%description
-Keep is an automatic backup program that allows users to set the parameters of
-the backup, including the frequency and the number of backups.
-
-Homepage: http://jr.falleri.free.fr/keep
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/keep
-%{tde_tdelibdir}/kded_keep.la
-%{tde_tdelibdir}/kded_keep.so
-%{tde_tdeappdir}/keep.desktop
-%{tde_datadir}/icons/hicolor/scalable/apps/keep.svgz
-%{tde_datadir}/apps/keep/
-%{tde_datadir}/config.kcfg/keepsettings.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/keep.png
-%{tde_datadir}/services/kded/keep.desktop
-
-
-%changelog
diff --git a/redhat/applications/keep/keep-14.0.0.spec b/redhat/applications/keep/keep.spec
index 56557f0e5..93e9627ee 100644
--- a/redhat/applications/keep/keep-14.0.0.spec
+++ b/redhat/applications/keep/keep.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 keep
%define tde_prefix /opt/trinity
@@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -77,6 +77,15 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
Requires: rdiff-backup
@@ -99,39 +108,47 @@ Homepage: http://jr.falleri.free.fr/keep
%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"
+
+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} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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}" \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
\
- --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
%find_lang %{tde_pkg}
@@ -156,6 +173,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/config.kcfg/keepsettings.kcfg
%{tde_datadir}/icons/hicolor/*/apps/keep.png
%{tde_datadir}/services/kded/keep.desktop
+%{tde_mandir}/man1/keep.*
%changelog
diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray.spec
index de55e48e7..4bd5a4c85 100644
--- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec
+++ b/redhat/applications/kerberostray/kerberostray.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 kerberostray
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-libtdeldap-devel >= 0.5
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -88,13 +88,16 @@ BuildRequires: openldap2-devel
BuildRequires: openldap24-libs-devel
%endif
+# KRB5 support
+#BuildRequires: krb5-devel
+
# HEIMDAL support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: heimdal-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libheimdal-devel
-%endif
+#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+#BuildRequires: heimdal-devel
+#%endif
+#%if 0%{?suse_version}
+#BuildRequires: libheimdal-devel
+#%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -110,6 +113,15 @@ BuildRequires: libcom_err-devel
BuildRequires: %{_lib}ext2fs-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
%description
Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets
@@ -125,55 +137,49 @@ Kerberos ticket manager which sits in the system tray and allows viewing/control
%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"
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
- extra_includes="%{_includedir}/openldap24:${extra_includes}"
- extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
- extra_includes="%{_includedir}/heimdal:${extra_includes}"
- extra_libs="%{_libdir}/heimdal:${extra_libs}"
+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} \
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
\
- --with-extra-includes=${extra_includes} \
- --with-extra-libs=${extra_libs} \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=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}
# Apps that should stay in TDE
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
@@ -183,7 +189,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%{tde_bindir}/kerberostray
%{tde_tdeappdir}/kerberostray.desktop
%{tde_datadir}/apps/kerberostray/
diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec
index 6627c48ec..cfdef0f13 100644
--- a/redhat/applications/keximdb/keximdb.spec
+++ b/redhat/applications/keximdb/keximdb.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 keximdb
%define tde_prefix /opt/trinity
@@ -61,12 +61,22 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: trinity-koffice-devel
+BuildRequires: trinity-koffice-kexi
+
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
-BuildRequires: trinity-koffice-devel
+# IDN support
+BuildRequires: libidn-devel
+
+# ACL support
+BuildRequires: libacl-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
# SUSE desktop files utility
%if 0%{?suse_version}
diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch
deleted file mode 100644
index f8e019e63..000000000
--- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/kftpgrabber/src/engine/ftpdirectoryparser.cpp b/kftpgrabber/src/engine/ftpdirectoryparser.cpp
-index 981d0b6..71e2cd2 100644
---- a/kftpgrabber/src/engine/ftpdirectoryparser.cpp
-+++ b/kftpgrabber/src/engine/ftpdirectoryparser.cpp
-@@ -421,6 +421,8 @@ bool FtpDirectoryParser::parseUnixPermissions(const TQString &permissions, Direc
- if (permissions[9] == 't' || permissions[9] == 'T') p |= S_ISVTX;
-
- entry.setPermissions(p);
-+
-+ return(p);
- }
-
- bool FtpDirectoryParser::parseLine(const TQString &line, DirectoryEntry &entry)
-diff --git a/kftpgrabber/src/misc/desencryptor.cpp b/kftpgrabber/src/misc/desencryptor.cpp
-index 126fad7..fac681f 100644
---- a/kftpgrabber/src/misc/desencryptor.cpp
-+++ b/kftpgrabber/src/misc/desencryptor.cpp
-@@ -65,8 +65,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode)
- char *o_message = (char*) malloc(8);
- char *o_output = (char*) malloc(8);
-
-- memset(o_message, 0, 9);
-- memset(o_output, 0, 9);
-+ memset(o_message, 0, sizeof o_message);
-+ memset(o_output, 0, sizeof o_output);
- //out.resize(in.size() * 2);
-
- while (i < in.size()) {
-@@ -79,8 +79,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode)
- i += 8;
-
- // Clear everything
-- memset(o_message, 0, 9);
-- memset(o_output, 0, 9);
-+ memset(o_message, 0, sizeof o_message);
-+ memset(o_output, 0, sizeof o_output);
- }
-
- free(o_message);
diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber.spec
index 75cb03836..07c03d26e 100644
--- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec
+++ b/redhat/applications/kftpgrabber/kftpgrabber.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 kftpgrabber
%define tde_prefix /opt/trinity
@@ -55,7 +55,6 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -124,7 +123,6 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .orig
%__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"
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec
deleted file mode 100644
index 6bde2ebd1..000000000
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define tde_pkg kgtk-qt3
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: Use TDE dialogs in Gtk apps
-Version: 0.10.2
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-This is an LD_PRELOAD hack that allows most GTK
-applications to use Trinity's file dialogs when run under Trinity.
-
-The Gtk file chooser functions have been overridden to communicate
-with this TDE module/application.
-
-This package includes the kqt3-wrapper
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-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} -DNDEBUG" \
- -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- \
- -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} \
- \
- -DBUILD_ALL=ON \
- ..
-
-# SMP safe !
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# The "preload" file is used by "startkde" script
-%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
-echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
-
-%find_lang kgtk
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kgtk.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kdialogd-wrapper
-%{tde_bindir}/kdialogd3
-%{tde_bindir}/kgtk-wrapper
-%{tde_bindir}/kgtk2-wrapper
-%{tde_bindir}/kqt3-wrapper
-%{tde_libdir}/kgtk/libkgtk2.so
-%{tde_libdir}/kgtk/libkqt3.so
-%{tde_datadir}/kgtk/preload
-
-%changelog
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
index c78610f1c..0f5e282f7 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3.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 kgtk-qt3
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec
deleted file mode 100644
index 9967337e3..000000000
--- a/redhat/applications/kile/kile-3.5.13.2.spec
+++ /dev/null
@@ -1,194 +0,0 @@
-# Default version for this component
-%define tde_pkg kile
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: TDE Integrated LaTeX Environment [Trinity]
-Version: 2.0.2
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Publishing
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-Obsoletes: %{name}-i18n-ar
-Obsoletes: %{name}-i18n-bg
-Obsoletes: %{name}-i18n-br
-Obsoletes: %{name}-i18n-ca
-Obsoletes: %{name}-i18n-cs
-Obsoletes: %{name}-i18n-cy
-Obsoletes: %{name}-i18n-da
-Obsoletes: %{name}-i18n-de
-Obsoletes: %{name}-i18n-el
-Obsoletes: %{name}-i18n-engb
-Obsoletes: %{name}-i18n-es
-Obsoletes: %{name}-i18n-et
-Obsoletes: %{name}-i18n-eu
-Obsoletes: %{name}-i18n-fi
-Obsoletes: %{name}-i18n-fr
-Obsoletes: %{name}-i18n-ga
-Obsoletes: %{name}-i18n-gl
-Obsoletes: %{name}-i18n-hi
-Obsoletes: %{name}-i18n-hu
-Obsoletes: %{name}-i18n-is
-Obsoletes: %{name}-i18n-it
-Obsoletes: %{name}-i18n-ja
-Obsoletes: %{name}-i18n-lt
-Obsoletes: %{name}-i18n-ms
-Obsoletes: %{name}-i18n-mt
-Obsoletes: %{name}-i18n-nb
-Obsoletes: %{name}-i18n-nds
-Obsoletes: %{name}-i18n-nl
-Obsoletes: %{name}-i18n-nn
-Obsoletes: %{name}-i18n-pa
-Obsoletes: %{name}-i18n-pl
-Obsoletes: %{name}-i18n-pt
-Obsoletes: %{name}-i18n-ptbr
-Obsoletes: %{name}-i18n-ro
-Obsoletes: %{name}-i18n-ru
-Obsoletes: %{name}-i18n-rw
-Obsoletes: %{name}-i18n-sk
-Obsoletes: %{name}-i18n-sr
-Obsoletes: %{name}-i18n-srlatin
-Obsoletes: %{name}-i18n-sv
-Obsoletes: %{name}-i18n-ta
-Obsoletes: %{name}-i18n-th
-Obsoletes: %{name}-i18n-tr
-Obsoletes: %{name}-i18n-uk
-Obsoletes: %{name}-i18n-zhcn
-
-
-%description
-Kile is a user-friendly LaTeX source editor and TeX shell for TDE.
-
-The source editor is a multi-document editor designed for .tex and .bib
-files. Menus, wizards and auto-completion are provided to assist with
-tag insertion and code generation. A structural view of the document
-assists with navigation within source files.
-
-The TeX shell integrates the various tools required for TeX processing.
-It assists with LaTeX compilation, DVI and postscript document viewing,
-generation of bibliographies and indices and other common tasks.
-
-Kile can support large projects consisting of several smaller files.
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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; . /etc/profile.d/qt3.sh
-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} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__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
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kile
-%{tde_tdeappdir}/kile.desktop
-%{tde_datadir}/apps/kconf_update
-%{tde_datadir}/apps/kile
-%{tde_datadir}/config.kcfg/kile.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kile.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kile.svgz
-%{tde_tdedocdir}/HTML/en/kile
-%{tde_datadir}/mimelnk/text/x-kilepr.desktop
-
-%lang(da) %{tde_tdedocdir}/HTML/da/kile/
-%lang(es) %{tde_tdedocdir}/HTML/es/kile/
-%lang(et) %{tde_tdedocdir}/HTML/et/kile/
-%lang(it) %{tde_tdedocdir}/HTML/it/kile/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/kile/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/kile/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/kile/
-
-
-
-%changelog
diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile.spec
index 33bc88722..75d27dd5c 100644
--- a/redhat/applications/kile/kile-14.0.0.spec
+++ b/redhat/applications/kile/kile.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 kile
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec
deleted file mode 100644
index aad28627b..000000000
--- a/redhat/applications/kima/kima-3.5.13.2.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-# Default version for this component
-%define tde_pkg kima
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: kicker monitoring applet [Trinity]
-Version: 0.7.3.2
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.elliptique.net/~ken/kima/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-# HAL support
-# On RHEL4, we do not use HAL (too old)
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_hal 1
-BuildRequires: hal-devel >= 0.4.8
-%endif
-
-
-%description
-This applet monitors various temperature,
-frequency and fan sources in your kicker
-panel.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%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; . /etc/profile.d/qt3.sh
-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} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_tdelibdir}/libkima.la
-%{tde_tdelibdir}/libkima.so
-%{tde_datadir}/apps/kicker/applets/kima.desktop
-%{tde_tdedocdir}/HTML/en/kima/
-
-
-%changelog
diff --git a/redhat/applications/kima/kima-14.0.0.spec b/redhat/applications/kima/kima.spec
index 8cbd7bce1..99765d364 100644
--- a/redhat/applications/kima/kima-14.0.0.spec
+++ b/redhat/applications/kima/kima.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 kima
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -83,6 +83,12 @@ BuildRequires: brp-check-trinity
BuildRequires: libudev-devel
%endif
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
%description
This applet monitors various temperature,
@@ -102,40 +108,48 @@ panel.
%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"
+
+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} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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}" \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ -DWITH_NVCONTROL=OFF \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ ..
-# SMP safe !
-%__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}
@@ -148,7 +162,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
%{tde_tdelibdir}/libkima.la
%{tde_tdelibdir}/libkima.so
%{tde_datadir}/apps/kicker/applets/kima.desktop
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
deleted file mode 100644
index 68c088ba5..000000000
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# Default version for this component
-%define tde_pkg kiosktool
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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}
-Version: 1.0
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-Summary: tool to configure the TDE kiosk framework
-
-License: GPLv2+
-Group: Applications/Multimedia
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-A Point&Click tool for system administrators to enable
-TDE's KIOSK features or otherwise preconfigure TDE for
-groups of users.
-
-
-%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 || : ; source /etc/profile.d/qt3.sh
-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} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-%{tde_bindir}/kiosktool
-%{tde_bindir}/kiosktool-kdedirs
-%{tde_tdeappdir}/kiosktool.desktop
-%{tde_datadir}/apps/kiosktool/*.png
-%{tde_tdedocdir}/HTML/en/kiosktool/
-%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_datadir}/apps/kiosktool/kiosk_data.xml
-%{tde_datadir}/apps/kiosktool/kiosktoolui.rc
-
-%changelog
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec
index 3112132a4..083103000 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/kiosktool/kiosktool.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 kiosktool
%define tde_prefix /opt/trinity
@@ -157,7 +157,7 @@ EOF
# Updates applications categories for openSUSE
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%if 0%{?suse_version}
-%suse_update_desktop_file %{tde_pkg} System SystemSetup
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System SystemSetup
%endif
@@ -179,7 +179,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%lang(pt) %{tde_tdedocdir}/HTML/pt/kiosktool/
%lang(sv) %{tde_tdedocdir}/HTML/sv/kiosktool/
%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_confdir}/kiosktoolrc
+%config(noreplace) %{tde_confdir}/kiosktoolrc
%{tde_mandir}/man1/*.1*
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec
index b4ef8ddb4..d83aa58af 100644
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/kkbswitch/kkbswitch.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 kkbswitch
%define tde_prefix /opt/trinity
@@ -156,12 +156,15 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
# Fix desktop icon location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+ %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file -r %{tde_pkg} System TrayIcon
+%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System TrayIcon
%endif
diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec
index b50b36d10..73dd98e28 100644
--- a/redhat/applications/klcddimmer/klcddimmer.spec
+++ b/redhat/applications/klcddimmer/klcddimmer.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 klcddimmer
%define tde_prefix /opt/trinity
@@ -138,16 +138,18 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+%find_lang %{tde_pkg} || touch %{tde_pkg}.lang
+
%clean
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING LICENSE NEWS README
-%{tde_libdir}/libklcddimmer_panelapplet.la
-%{tde_libdir}/libklcddimmer_panelapplet.so
+%{tde_libdir}/klcddimmer_panelapplet.la
+%{tde_libdir}/klcddimmer_panelapplet.so
%{tde_datadir}/apps/kicker/applets/klcddimmer.desktop
%{tde_tdedocdir}/HTML/en/klcddimmer/
%{tde_datadir}/icons/hicolor/*/apps/klcddimmer.png
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
deleted file mode 100644
index ef8bb091c..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
+++ /dev/null
@@ -1,275 +0,0 @@
-# Default version for this component
-%define tde_pkg kmplayer
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: media player for Trinity
-Version: 0.10.0c
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Multimedia
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://kmplayer.kde.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-# DBUS support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
-%endif
-
-# GSTREAMER support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: libgstreamer0.10-devel
-%else
-BuildRequires: %{_lib}gstreamer0.10-devel
-%endif
-BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires: gstreamer-devel
-#BuildRequires: gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-base-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: gstreamer-0_10-devel
-BuildRequires: gstreamer-0_10-plugins-base-devel
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# X11 stuff
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libxt-devel
-BuildRequires: libxv-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires: libXv-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires: xorg-x11-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires: xorg-x11-libXv-devel
-%endif
-
-# GTK2 stuff
-BuildRequires: gtk2-devel
-
-# DBUS stuff
-%if 0%{?suse_version}
-BuildRequires: dbus-1-glib-devel
-%else
-BuildRequires: dbus-glib-devel
-%endif
-
-Requires: %{name}-base = %{version}-%{release}
-
-%description
-A basic audio/video viewer application for Trinity.
-
-KMPlayer can:
-* play DVD (DVDNav only with the Xine player)
-* play VCD
-* let the backend players play from a pipe (read from stdin)
-* play from a TV device (experimental)
-* show backend player's console output
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
-* DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
- shortcut configure window
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
- (if you have VDR) and volume increase/decrease
-
-
-%package base
-Group: Applications/Multimedia
-Summary: Base files for KMPlayer [Trinity]
-
-%description base
-Core files needed for KMPlayer.
-
-
-%package konq-plugins
-Group: Applications/Multimedia
-Requires: %{name}-base = %{version}-%{release}
-Requires: trinity-tdebase >= %{tde_version}
-Summary: KMPlayer plugin for KHTML/Konqueror [Trinity]
-
-%description konq-plugins
-This plugin enables audio/video playback inside konqueror, using Xine (with
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
-browser plugins.
-
-
-%package doc
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-Summary: Handbook for KMPlayer [Trinity]
-
-%description doc
-Documention for KMPlayer, a basic audio/video viewer application for TDE.
-
-
-%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; . /etc/profile.d/qt3.sh
-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} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Removes unwanted files
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
-%{tde_bindir}/kmplayer
-%{tde_bindir}/knpplayer
-%{tde_bindir}/kxvplayer
-%{tde_libdir}/libkdeinit_kmplayer.la
-%{tde_libdir}/libkdeinit_kmplayer.so
-%{tde_tdelibdir}/kmplayer.la
-%{tde_tdelibdir}/kmplayer.so
-%{tde_tdeappdir}/kmplayer.desktop
-%{tde_datadir}/apps/kmplayer
-%{tde_datadir}/services/kmplayer_part.desktop
-
-%files base
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
-%{tde_bindir}/kgstplayer
-%{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
-%{tde_datadir}/apps/kmplayer/noise.gif
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/*/kmplayer
-
-%files konq-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkmplayerpart.la
-%{tde_tdelibdir}/libkmplayerpart.so
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/services/kmplayer_part.desktop
-
-
-%changelog
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer.spec
index f68698644..2dd05dd51 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer.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 kmplayer
%define tde_prefix /opt/trinity
@@ -101,9 +101,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0
%endif
# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}xine1.2-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
@@ -160,7 +160,7 @@ KMPlayer can:
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
+%doc AUTHORS COPYING ChangeLog INSTALL README TODO
%{tde_bindir}/kmplayer
%{tde_bindir}/knpplayer
%{tde_bindir}/kxvplayer
@@ -190,7 +190,7 @@ Core files needed for KMPlayer.
%{tde_libdir}/libkmplayercommon.so
%{tde_bindir}/kgstplayer
%{tde_bindir}/kxineplayer
-%{tde_confdir}/kmplayerrc
+%config(noreplace) %{tde_confdir}/kmplayerrc
%{tde_datadir}/apps/kmplayer/bookmarks.xml
%{tde_datadir}/apps/kmplayer/noise.gif
%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
deleted file mode 100644
index ffea0e925..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
+++ /dev/null
@@ -1,193 +0,0 @@
-# Default version for this component
-%define tde_pkg kmyfirewall
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: iptables based firewall configuration tool for TDE [Trinity]
-Version: 1.1.1
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-
-%description
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
-Linux systems. It will be the right tool if you like to have a so called
-"Personal Firewall" running on your Linux box, but don't have the time and/or
-the interest to spend hours in front of the iptables manual just to setup a
-Firewall that keeps the "bad" people out.
-
-There is also the possibility to save entire rule sets, so you only have to
-configure your rule set one time and then you can use it on several computers
-giving each of them a similar configuration (p.e. school networks, office,
-university etc.)
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%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; . /etc/profile.d/qt3.sh
-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-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
-%{tde_bindir}/kmyfirewall
-%{tde_libdir}/libkmfcore.so.*
-%{tde_libdir}/libkmfwidgets.so.*
-%{tde_tdelibdir}/libkmfcompiler_ipt.la
-%{tde_tdelibdir}/libkmfcompiler_ipt.so
-%{tde_tdelibdir}/libkmfgenericinterfacepart.la
-%{tde_tdelibdir}/libkmfgenericinterfacepart.so
-%{tde_tdelibdir}/libkmfinstaller_linux.la
-%{tde_tdelibdir}/libkmfinstaller_linux.so
-%{tde_tdelibdir}/libkmfinstallerplugin.la
-%{tde_tdelibdir}/libkmfinstallerplugin.so
-%{tde_tdelibdir}/libkmfipteditorpart.la
-%{tde_tdelibdir}/libkmfipteditorpart.so
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
-%{tde_tdelibdir}/libkmfruleoptionedit_state.la
-%{tde_tdelibdir}/libkmfruleoptionedit_state.so
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
-%{tde_tdeappdir}/kmyfirewall.desktop
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
-%{tde_datadir}/apps/kmfsystray
-%{tde_datadir}/apps/kmyfirewall
-%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_datadir}/config/kmyfirewallrc
-%{tde_tdedocdir}/HTML/en/kmyfirewall/
-%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
-%{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
-%{tde_datadir}/mimelnk/application/kmfgrs.desktop
-%{tde_datadir}/mimelnk/application/kmfnet.desktop
-%{tde_datadir}/mimelnk/application/kmfpkg.desktop
-%{tde_datadir}/mimelnk/application/kmfrs.desktop
-%{tde_datadir}/services/kmf*.desktop
-%{tde_datadir}/servicetypes/kmf*.desktop
-
-%files devel
-%{tde_tdeincludedir}/kmyfirewall
-%{tde_libdir}/libkmfcore.la
-%{tde_libdir}/libkmfcore.so
-%{tde_libdir}/libkmfwidgets.la
-%{tde_libdir}/libkmfwidgets.so
-
-%changelog
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall.spec
index a24777758..7998140e5 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall.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 kmyfirewall
%define tde_prefix /opt/trinity
@@ -136,7 +136,7 @@ university etc.)
%{tde_datadir}/apps/kmfsystray/
%{tde_datadir}/apps/kmyfirewall/
%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_confdir}/kmyfirewallrc
+%config(noreplace) %{tde_confdir}/kmyfirewallrc
%{tde_tdedocdir}/HTML/en/kmyfirewall/
%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
%{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
deleted file mode 100644
index ce17fff0b..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
+++ /dev/null
@@ -1,268 +0,0 @@
-# Default version for this component
-%define tde_pkg kmymoney
-%define tde_version 3.5.13.2
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define qt3pluginsdir %{_libdir}/qt3/plugins
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-%define qt3pluginsdir %{_libdir}/qt-3.3/plugins
-%endif
-%if 0%{?suse_version}
-%define qt3pluginsdir /usr/lib/qt3/plugins
-%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}/kde
-%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: personal finance manager for TDE
-
-Version: 1.0.5
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1: kmymoneytitlelabel.png
-
-# [kmymoney] Fix FTBFS
-Patch1: kmymoney-3.5.13.2-ftbfs.patch
-
-# [admin] Fix automake 1.13 build issue
-Patch2: admin-fix-parallel-test.diff
-
-# [kmymoney] Missing LDFLAGS causing FTBFS
-Patch4: kmymoney-3.5.13-missing_ldflags.patch
-
-# [kmymoney] Fix QT3 plugins directory location
-Patch5: kmymoney-3.5.13-fix_qt3_plugins_location.patch
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: recode
-BuildRequires: libofx-devel
-
-# OPENSP support
-%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion}
-%if 0%{?mgaversion} || 0%{?pclinuxos}
-%if 0%{?mgaversion} >= 4
-BuildRequires: %{_lib}osp-devel
-%else
-BuildRequires: %{_lib}OpenSP5-devel
-%endif
-%else
-BuildRequires: opensp-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: opensp-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires: openjade-devel
-%endif
-
-Requires: %{name}-common == %{version}-%{release}
-
-%description
-KMyMoney is the Personal Finance Manager for TDE. It operates similar to
-MS-Money and Quicken, supports different account types, categorisation of
-expenses, QIF import/export, multiple currencies and initial online banking
-support.
-
-
-%package common
-Summary: KMyMoney architecture independent files
-Group: Applications/Utilities
-Requires: %{name} == %{version}
-
-%description common
-This package contains architecture independent files needed for KMyMoney to
-run properly. It also provides KMyMoney documentation. Therefore, unless you
-have '%{name}' package installed, you will hardly find this package useful.
-
-
-%package devel
-Summary: KMyMoney development files
-Group: Development/Libraries
-Requires: %{name} == %{version}
-
-%description devel
-This package contains development files needed for KMyMoney plugins.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .ftbfs
-%patch2 -p1 -b .automake113
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%patch5 -p1 -b .qtpluginsdir
-%endif
-
-%__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
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export KDEDIR="%{tde_prefix}"
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS="%{_libdir}/qt3/plugins"
-%endif
-
-# Fix strange FTBFS on RHEL4
-%if 0%{?rhel} == 4
-grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
-%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} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --disable-final \
- --enable-closure \
- --enable-rpath \
- \
- --disable-pdf-docs \
- --enable-ofxplugin \
- --enable-ofxbanking \
- --enable-qtdesigner \
- --enable-sqlite3
-
-# Fix FTBFS inside sqlite3 archive
-patch -p1 < %{PATCH4}
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%__make install DESTDIR=%{buildroot}
-
-%find_lang kmymoney2
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kmymoney
-%{tde_bindir}/kmymoney2
-%{tde_tdeappdir}/kmymoney2.desktop
-%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
-%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
-%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
-%{tde_libdir}/*.so.*
-%{tde_tdelibdir}/kmm_ofximport.la
-%{tde_tdelibdir}/kmm_ofximport.so
-
-%files common -f kmymoney2.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmymoney2/html/
-%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png
-%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc
-%{tde_datadir}/apps/kmymoney2/misc/financequote.pl
-%{tde_datadir}/apps/kmymoney2/pics/*.png
-%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt
-%{tde_datadir}/apps/kmymoney2/tips
-%{tde_datadir}/config.kcfg/kmymoney2.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
-%{tde_datadir}/icons/locolor/*/*/*.png
-%{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/kmm_ofximport.rc
-%{tde_datadir}/services/kmm_ofximport.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmymoney/*.h
-%{tde_libdir}/libkmm_kdchart.la
-%{tde_libdir}/libkmm_mymoney.la
-%{tde_libdir}/libkmm_plugin.la
-%{tde_libdir}/*.so
-%{qt3pluginsdir}/sqldrivers/libsqlite3*.so
-%{qt3pluginsdir}/designer/libkmymoney.so
-
-%changelog
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney.spec
index 7ad17a36b..bbe79ffb4 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 23
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8
%define _configure_libtool_hardening_hack 0
%endif
@@ -22,7 +22,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 kmymoney
%define tde_prefix /opt/trinity
@@ -181,7 +181,7 @@ 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.so
##########
@@ -207,7 +207,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-%if 0%{?fedora} >= 29
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
LDFLAGS="-Wl,--allow-shlib-undefined"
%endif
diff --git a/redhat/applications/knemo/knemo-3.5.13.2.spec b/redhat/applications/knemo/knemo-3.5.13.2.spec
deleted file mode 100644
index efdd7ccfc..000000000
--- a/redhat/applications/knemo/knemo-3.5.13.2.spec
+++ /dev/null
@@ -1,136 +0,0 @@
-# Default version for this component
-%define tde_pkg knemo
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: network interfaces monitor for the Trinity systray
-Version: 0.4.8
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://beta.smileaf.org/projects
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-%if 0%{?fedora} >= 18
-BuildRequires: net-tools
-%endif
-
-
-%description
-KNemo displays an icon in the systray for every network interface.
-Tooltips and an info dialog provide further information about the
-interface. Passive popups inform about interface changes.
-A traffic plotter is also integrated.
-
-knemo polls the network interface status every second using the
-ifconfig, route and iwconfig tools.
-
-Homepage: http://extragear.kde.org/apps/knemo/
-
-
-
-%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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%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 \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_knemo.la
-%{tde_tdelibdir}/kcm_knemo.so
-%{tde_tdelibdir}/kded_knemod.la
-%{tde_tdelibdir}/kded_knemod.so
-%{tde_tdeappdir}/kcm_knemo.desktop
-%{tde_datadir}/apps/knemo/eventsrc
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
-%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
-%{tde_datadir}/services/kded/knemod.desktop
-
-
-%changelog
diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo.spec
index 8ccd55fda..793129a92 100644
--- a/redhat/applications/knemo/knemo-14.0.0.spec
+++ b/redhat/applications/knemo/knemo.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 knemo
%define tde_prefix /opt/trinity
@@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -88,6 +88,29 @@ BuildRequires: net-tools-deprecated
Requires: net-tools-deprecated
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+# Wireless support
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+BuildRequires: wireless-tools-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
+BuildRequires: %{_lib}iw29-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?suse_version}
+BuildRequires: wireless-tools
+%endif
+%if 0%{?suse_version} || 0%{?mgaversion} >= 3
+BuildRequires: libiw-devel
+%endif
+
%description
KNemo displays an icon in the systray for every network interface.
@@ -111,40 +134,45 @@ Homepage: http://extragear.kde.org/apps/knemo/
%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
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_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 \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=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
%clean
diff --git a/redhat/applications/knetload/knetload-3.5.13.2.spec b/redhat/applications/knetload/knetload-3.5.13.2.spec
deleted file mode 100644
index f61799be5..000000000
--- a/redhat/applications/knetload/knetload-3.5.13.2.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-# Default version for this component
-%define tde_pkg knetload
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: a network meter for Kicker [Trinity]
-Version: 2.3
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-KNetLoad is a small network meter for Kicker (the TDE panel). It shows
-a recent history of network usage in the form of two configurable
-diagrams in the system tray, one for incoming and one for outgoing
-data. These diagrams have settings for colours and various different
-styles.
-
-KNetLoad can monitor just about any network device.
-
-
-%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; . /etc/profile.d/qt3.sh
-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-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetload
-%{tde_tdeappdir}/knetload.desktop
-%{tde_datadir}/apps/knetload
-%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
-%{tde_datadir}/icons/locolor/*/apps/knetload.png
-
-
-%changelog
diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/knetload/knetload.spec
index 13e71be7f..b4830fbf0 100644
--- a/redhat/applications/knetload/knetload.spec
+++ b/redhat/applications/knetload/knetload.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 knetload
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/knetstats/knetstats-3.5.13.2.spec b/redhat/applications/knetstats/knetstats-3.5.13.2.spec
deleted file mode 100644
index d38b4db5c..000000000
--- a/redhat/applications/knetstats/knetstats-3.5.13.2.spec
+++ /dev/null
@@ -1,123 +0,0 @@
-# Default version for this component
-%define tde_pkg knetstats
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: network interfaces monitor for the Trinity systray
-Version: 1.6.1
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-A simple TDE network monitor that show rx/tx LEDs of any
-network interface on a system tray icon
-
-
-%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; . /etc/profile.d/qt3.sh
-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-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetstats
-%{tde_tdeappdir}/knetstats.desktop
-%{tde_datadir}/apps/knetstats
-%{tde_tdedocdir}/HTML/en/knetstats/
-%{tde_datadir}/icons/hicolor/*/apps/knetstats.png
-
-
-%changelog
diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/knetstats/knetstats.spec
index d519f2224..d94faebc6 100644
--- a/redhat/applications/knetstats/knetstats.spec
+++ b/redhat/applications/knetstats/knetstats.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 knetstats
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch
deleted file mode 100644
index 175d299e7..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt.ORI 2011-11-11 15:06:49.854247242 -0500
-+++ knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt 2011-11-11 15:06:58.662060747 -0500
-@@ -18,6 +18,7 @@
- ${CMAKE_BINARY_DIR}
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-+ ${DBUS_INCLUDE_DIRS}
- ${DBUS_TQT_INCLUDE_DIRS}
- ${NM_UTIL_INCLUDE_DIRS}
- )
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch
deleted file mode 100644
index 9db3ab5de..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- knetworkmanager9/CMakeLists.txt.ORI 2011-11-11 13:36:01.462536187 -0500
-+++ knetworkmanager9/CMakeLists.txt 2011-11-11 13:36:10.762446937 -0500
-@@ -63,7 +63,7 @@
-
- ##### source directories ########################
-
--add_subdirectory( knetworkmanager-0.8 )
-+add_subdirectory( knetworkmanager-0.9 )
-
-
- ##### write configure files #####################
---- knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt.ORI 2011-11-11 13:39:32.866229477 -0500
-+++ knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt 2011-11-11 13:39:48.169042904 -0500
-@@ -18,7 +18,7 @@
-
- ##### knm_dbus (static) #########################
-
--set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.8/introspection" )
-+set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.9/introspection" )
-
- # options:
- # p - generate proxy files
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
deleted file mode 100644
index 0ada2aed4..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
+++ /dev/null
@@ -1,179 +0,0 @@
-# Default version for this component
-%define tde_pkg knetworkmanager8
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name: trinity-%{tde_pkg}
-Version: 0.8
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-Summary: Trinity applet for Network Manager
-
-Group: Applications/Internet
-License: GPLv2+
-URL: http://en.opensuse.org/Projects/KNetworkManager
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch0: knetworkmanager-3.5.13-missing_includes.patch
-
-# For knetworkmanager 0.9 only !
-Patch10: knetworkmanager-3.5.13-subdir_version.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: desktop-file-utils
-
-# NETWORKMANAGER support
-%if 0%{?rhel} || 0%{?fedora}
-Requires: NetworkManager-gnome
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires: networkmanager
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: NetworkManager-glib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: NetworkManager-devel
-Requires: NetworkManager
-%endif
-
-BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
-
-Obsoletes: trinity-knetworkmanager < %{version}-%{release}
-Provides: trinity-knetworkmanager = %{version}-%{release}
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-
-%package devel
-Summary: Common data shared among the MySQL GUI Suites
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-Obsoletes: trinity-knetworkmanager-devel < %{version}-%{release}
-Provides: trinity-knetworkmanager-devel = %{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
-
-cd knetworkmanager-0.*/src
-%patch0 -p3
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Missing TDE macros
-%__mkdir_p cmake
-%__ln_s %{tde_datadir}/cmake cmake/modules
-
-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} -DNDEBUG" \
- -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- \
- -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} \
- ..
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%post devel
-/sbin/ldconfig
-
-
-%postun devel
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.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
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-%changelog
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec
index f1434e905..334a82076 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8.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 knetworkmanager
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/knights/knights-3.5.13.2.spec b/redhat/applications/knights/knights-3.5.13.2.spec
deleted file mode 100644
index 523111ac8..000000000
--- a/redhat/applications/knights/knights-3.5.13.2.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-# Default version for this component
-%define tde_pkg knights
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: A chess interface for the K Desktop Environment [Trinity]
-Version: 0.6
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Amusements/Games
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-Requires: gnuchess
-
-%description
-Knights aims to be the ultimate chess resource on your computer.
-Written for the K Desktop Environment, it's designed to be both friendly
-to new chess players and functional for Grand Masters.
-
-Here's a quick list of Knights' key features:
-* Play against yourself, against computer opponents,
- or against others over the Internet.
-* Customize your board and pieces with over 30 different themes,
- or make your own!
-* Audio cues help alert you to important events.
-* Novice players can preview potential moves.
-* Save your unfinished matches and play them again later.
-
-
-%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; . /etc/profile.d/qt3.sh
-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
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knights
-%{tde_datadir}/applnk/Games/Board/knights.desktop
-%{tde_datadir}/apps/knights
-%{tde_tdedocdir}/HTML/*/knights
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/pgn.desktop
-
-
-%changelog
diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/knights/knights.spec
index eb75677b9..9684594d8 100644
--- a/redhat/applications/knights/knights.spec
+++ b/redhat/applications/knights/knights.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 knights
%define tde_prefix /opt/trinity
@@ -157,6 +157,18 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+# Fix desktop icon location
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+ %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Games/Board/knights.desktop" "%{?buildroot}%{tde_tdeappdir}"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/knights.desktop" Game BoardGame
+%endif
+
%clean
%__rm -rf %{buildroot}
@@ -165,7 +177,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/knights
-%{tde_datadir}/applnk/Games/Board/knights.desktop
+%{tde_tdeappdir}/knights.desktop
%{tde_datadir}/apps/knights
%{tde_tdedocdir}/HTML/*/knights
%{tde_datadir}/icons/hicolor/*/*/*.png
diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec
index 76ac8c8c7..eb52e123d 100644
--- a/redhat/applications/knmap/knmap.spec
+++ b/redhat/applications/knmap/knmap.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 knmap
%define tde_prefix /opt/trinity
@@ -156,10 +156,14 @@ fi
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+%find_lang %{tde_pkg}
+
# Move desktop icon to XDG directory
-%__mkdir_p %{buildroot}%{tde_tdeappdir}
-%__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-%__rm -r "%{buildroot}%{tde_datadir}/applnk"
+if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p %{buildroot}%{tde_tdeappdir}
+ %__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
@@ -171,7 +175,7 @@ fi
%__rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README ChangeLog
%{tde_bindir}/knmap
diff --git a/redhat/applications/knowit/knowit-3.5.13.2.spec b/redhat/applications/knowit/knowit-3.5.13.2.spec
deleted file mode 100644
index 00791f091..000000000
--- a/redhat/applications/knowit/knowit-3.5.13.2.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# Default version for this component
-%define tde_pkg knowit
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: Tool for managing notes [Trinity]
-Version: 0.10
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: gettext
-
-
-%description
-KnowIt is a tool for managing notes which are organized in
-tree-like hierarchy. It is similar to TuxCards,
-but TDE-based, and requires Trinity.
-
-
-%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; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# 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
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__mkdir_p %{buildroot}%{tde_tdeappdir}
-%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop
-%__rm -r %{buildroot}%{tde_datadir}/applnk
-
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knowit
-%{tde_tdeappdir}/knowit.desktop
-%{tde_datadir}/apps/knowit/knowitui.rc
-%{tde_datadir}/apps/knowit/tips
-%{tde_tdedocdir}/HTML/en/knowit/common
-%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/knowit/index.docbook
-%{tde_tdedocdir}/HTML/en/knowit/screenshot.png
-%{tde_datadir}/icons/hicolor/*/apps/knowit.png
-
-
-%changelog
diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/knowit/knowit.spec
index 67cac8595..0c04143fc 100644
--- a/redhat/applications/knowit/knowit.spec
+++ b/redhat/applications/knowit/knowit.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 knowit
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/knutclient/knutclient-3.5.13.2.spec b/redhat/applications/knutclient/knutclient-3.5.13.2.spec
deleted file mode 100644
index 016bb891e..000000000
--- a/redhat/applications/knutclient/knutclient-3.5.13.2.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define tde_pkg knutclient
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%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: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-Version: 0.9.5
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.knut.noveradsl.cz/knutclient/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-
-%description
-KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
-http://www.networkupstools.org/) framework on Linux and other systems. This
-information, presented in a nice visual format, can be invaluable on
-stations using an UPS.
-
-
-%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; . /etc/profile.d/qt3.sh
-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-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
- touch --no-create %{tde_datadir}/icons/${f} || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/knutclient
-%{tde_datadir}/applnk/Utilities/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
-%{tde_tdedocdir}/HTML/cs/knutclient
-%{tde_tdedocdir}/HTML/en/knutclient
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-
-%changelog
diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec
index 2c729fb71..588addd4e 100644
--- a/redhat/applications/knutclient/knutclient.spec
+++ b/redhat/applications/knutclient/knutclient.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 knutclient
%define tde_prefix /opt/trinity
@@ -106,7 +106,7 @@ stations using an UPS.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Fix permissions
-chmod 644 AUTHORS README TODO COPYING ChangeLog
+chmod 644 AUTHORS README COPYING ChangeLog
%build
@@ -150,6 +150,13 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+# Move desktop icon to XDG directory
+if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p %{buildroot}%{tde_tdeappdir}
+ %__mv "%{buildroot}%{tde_datadir}/applnk/Utilities/knutclient.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
# Links duplicate files
%fdupes "%{?buildroot}%{tde_datadir}"
@@ -162,7 +169,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{tde_bindir}/knutclient
-%{tde_datadir}/applnk/Utilities/knutclient.desktop
+%{tde_tdeappdir}/knutclient.desktop
%{tde_datadir}/apps/knutclient/knutclientui.rc
%{tde_datadir}/apps/knutclient
%{tde_tdedocdir}/HTML/cs/knutclient
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec
deleted file mode 100644
index 88a4619fb..000000000
--- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec
+++ /dev/null
@@ -1,1045 +0,0 @@
-# Default version for this component
-%define tde_pkg koffice-i18n
-%define tde_version 3.5.13.2
-
-# 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}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?TDE_LANGS}" == ""
-%define TDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW
-%endif
-
-
-Name: trinity-%{tde_pkg}
-Summary: Internationalization support for Koffice [Trinity]
-Version: 1.6.3
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-License: GFDL
-Group: User Interface/Desktops
-BuildArch: noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: findutils
-BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
-
-%description
-%{summary}.
-
-%package Bulgarian
-Summary: Bulgarian(bg) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
-%description Bulgarian
-%{summary}.
-
-%package Bengali
-Summary: Bengali(bn) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
-%description Bengali
-%{summary}.
-
-%package Tibetan
-Summary: Tibetan(bo) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
-%description Tibetan
-%{summary}.
-
-%package Breton
-Summary: Breton(br) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
-%description Breton
-%{summary}.
-
-%package Bosnian
-Summary: Bosnian(bs) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
-%description Bosnian
-%{summary}.
-
-%package Catalan
-Summary: Catalan(ca) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
-%description Catalan
-%{summary}.
-
-%package Czech
-Summary: Czech(cs) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
-%description Czech
-%{summary}.
-
-%package Cymraeg
-Summary: Cymraeg language support for Koffice [Trinity]
-Group: User Interface/Desktops
-%description Cymraeg
-%{summary}.
-
-%package Welsh
-Summary: Welsh(cy) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
-%description Welsh
-%{summary}.
-
-%package Danish
-Summary: Danish(da) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
-%description Danish
-%{summary}.
-
-%package German
-Summary: German(de) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
-%description German
-%{summary}.
-
-%package Greek
-Summary: Greek(el) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
-%description Greek
-%{summary}.
-
-%package British
-Summary: British(en_GB) English support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
-%description British
-%{summary}.
-
-%package Esperanto
-Summary: Esperanto(eo) support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
-%description Esperanto
-%{summary}.
-
-%package Spanish
-Summary: Spanish(es) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
-%description Spanish
-%{summary}.
-
-%package Estonian
-Summary: Estonian(et) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
-%description Estonian
-%{summary}.
-
-%package Basque
-Summary: Basque(eu) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
-%description Basque
-%{summary}.
-
-%package Finnish
-Summary: Finnish(fi) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
-%description Finnish
-%{summary}.
-
-%package Faroese
-Summary: Faroese(fo) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
-%description Faroese
-%{summary}.
-
-%package French
-Summary: French(fr) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
-%description French
-%{summary}.
-
-%package Frisian
-Summary: Frisian(fy) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
-%description Frisian
-%{summary}.
-
-%package Irish
-Summary: Irish(ga) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Obsoletes: kde-i18n-Gaeilge < %{version}
-Provides: %{name}-ga = %{version}-%{release}
-%description Irish
-%{summary}.
-
-%package Galician
-Summary: Galician(gl) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
-%description Galician
-%{summary}.
-
-%package Hebrew
-Summary: Hebrew(he) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
-%description Hebrew
-%{summary}.
-
-%package Hindi
-Summary: Hindi(hi) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
-%description Hindi
-%{summary}.
-
-%package Croatian
-Summary: Croatian(hr) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
-%description Croatian
-%{summary}.
-
-%package Hungarian
-Summary: Hungarian(hu) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
-%description Hungarian
-%{summary}.
-
-%package Indonesian
-Summary: Indonesian(id) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
-%description Indonesian
-%{summary}.
-
-%package Icelandic
-Summary: Icelandic(is) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
-%description Icelandic
-%{summary}.
-
-%package Italian
-Summary: Italian(it) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
-%description Italian
-%{summary}.
-
-%package Japanese
-Summary: Japanese(ja) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
-%description Japanese
-%{summary}.
-
-%package Khmer
-Summary: Khmer(km) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-km = %{version}-%{release}
-%description Khmer
-%{summary}.
-
-%package Korean
-Summary: Korean(ko) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
-%description Korean
-%{summary}.
-
-%package Kurdish
-Summary: Kurdish(ku) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
-%description Kurdish
-%{summary}.
-
-%package Lao
-Summary: Lao(lo) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
-%description Lao
-%{summary}.
-
-%package Lithuanian
-Summary: Lithuanian(lt) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
-%description Lithuanian
-%{summary}.
-
-%package Latvian
-Summary: Latvian(lv) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
-%description Latvian
-%{summary}.
-
-%package Maori
-Summary: Maori(mi) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
-%description Maori
-%{summary}.
-
-%package Macedonian
-Summary: Macedonian(mk) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
-%description Macedonian
-%{summary}.
-
-%package Malay
-Summary: Malay(ms) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ms = %{version}-%{release}
-%description Malay
-%{summary}.
-
-%package Maltese
-Summary: Maltese(mt) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
-%description Maltese
-%{summary}.
-
-%package LowSaxon
-Summary: Low Saxon (nds) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-nds = %{version}-%{release}
-%description LowSaxon
-%{summary}.
-
-%package Nepali
-Summary: Nepali(ne) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ne = %{version}-%{release}
-%description Nepali
-%{summary}.
-
-%package Dutch
-Summary: Dutch(nl) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
-%description Dutch
-%{summary}.
-
-%package Norwegian
-Summary: Norwegian(no) (Bokmaal) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
-%description Norwegian
-%{summary}.
-
-%package Norwegian-Nynorsk
-Summary: Norwegian(nn) (Nynorsk) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
-%description Norwegian-Nynorsk
-%{summary}.
-
-%package Occitan
-Summary: Occitan(oc) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
-%description Occitan
-%{summary}.
-
-%package Polish
-Summary: Polish(pl) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
-%description Polish
-%{summary}.
-
-%package Portuguese
-Summary: Portuguese(pt) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
-%description Portuguese
-%{summary}.
-
-%package Punjabi
-Summary: Punjabi(pa) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
-%description Punjabi
-%{summary}.
-
-%package Brazil
-Summary: Brazil(pt_BR) Portuguese language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
-%description Brazil
-%{summary}.
-
-%package Romanian
-Summary: Romanian(ro) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
-%description Romanian
-%{summary}.
-
-%package Russian
-Summary: Russian(ru) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
-%description Russian
-%{summary}.
-
-%package Slovak
-Summary: Slovak(sk) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
-%description Slovak
-%{summary}.
-
-%package Slovenian
-Summary: Slovenian(sl) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
-%description Slovenian
-%{summary}.
-
-%package Serbian
-Summary: Serbian(sr) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
-%description Serbian
-%{summary}.
-
-%package Swedish
-Summary: Swedish(sv) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
-%description Swedish
-%{summary}.
-
-%package Tamil
-Summary: Tamil(ta) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
-%description Tamil
-%{summary}.
-
-%package Tajik
-Summary: Tajik(tg) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
-%description Tajik
-%{summary}.
-
-%package Thai
-Summary: Thai(th) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
-%description Thai
-%{summary}.
-
-%package Turkish
-Summary: Turkish(tr) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
-%description Turkish
-%{summary}.
-
-%package Ukrainian
-Summary: Ukrainian(uk) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
-%description Ukrainian
-%{summary}.
-
-%package Venda
-Summary: Venda(ven) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
-%description Venda
-%{summary}.
-
-%package Vietnamese
-Summary: Vietnamese(vi) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
-%description Vietnamese
-%{summary}.
-
-%package Walloon
-Summary: Walloon(wa) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
-%description Walloon
-%{summary}.
-
-%package Xhosa
-Summary: Xhosa(xh) (a Bantu language) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
-%description Xhosa
-%{summary}.
-
-%package Chinese
-Summary: Chinese(zh_CN) (Simplified Chinese) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
-%description Chinese
-%{summary}.
-
-%package Chinese-Big5
-Summary: Chinese(zh_TW) (Big5) language support for Koffice [Trinity]
-Group: User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
-%description Chinese-Big5
-%{summary}.
-
-
-
-%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
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-export kde_htmldir="%{tde_tdedocdir}/HTML"
-
-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
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{tde_bindir}:${PATH}"
-
-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
-done
-
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
-
-%clean
-%__rm -rf %{buildroot}
-
-%if "%( grep -w af <<< '%{TDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/af/*
-%endif
-
-%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != ""
-%files Arabic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{TDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{TDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{TDE_LANG