summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2019-11-03 11:03:22 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2019-11-03 11:16:56 +0100
commitcd8eb9fd74fafb2435bc1f878cbb2bc91f52d859 (patch)
tree51c7e8b06b5c920736585ff8dbead62834875859 /redhat/main
parent411aad4790a5b19fe3f927c4dffd18116fe4db16 (diff)
downloadtde-packaging-cd8eb9fd74fafb2435bc1f878cbb2bc91f52d859.tar.gz
tde-packaging-cd8eb9fd74fafb2435bc1f878cbb2bc91f52d859.zip
RPM: update spec files for TDE 14.0.7
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tde-i18n/tde-i18n.spec (renamed from redhat/main/tde-i18n/tde-i18n-14.0.0.spec)2
-rw-r--r--redhat/main/tdeaccessibility/tdeaccessibility.spec (renamed from redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec)2
-rw-r--r--redhat/main/tdeaddons/tdeaddons.spec (renamed from redhat/main/tdeaddons/tdeaddons-14.0.0.spec)25
-rw-r--r--redhat/main/tdeadmin/tdeadmin.spec2
-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.fc315
l---------redhat/main/tdebase/pamd.kcheckpass-trinity.pclos1
l---------redhat/main/tdebase/pamd.kdm-trinity-np.el81
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc3116
l---------redhat/main/tdebase/pamd.kdm-trinity-np.pclos1
l---------redhat/main/tdebase/pamd.kdm-trinity.el81
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc3123
l---------redhat/main/tdebase/pamd.kdm-trinity.pclos1
l---------redhat/main/tdebase/pamd.kscreensaver-trinity.el81
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc315
l---------redhat/main/tdebase/pamd.kscreensaver-trinity.pclos1
-rw-r--r--redhat/main/tdebase/tdebase.spec112
l---------redhat/main/tdebase/tdm.el8.pp1
-rw-r--r--redhat/main/tdebase/tdm.fc31.ppbin0 -> 932 bytes
l---------redhat/main/tdebase/tdm.service.el81
-rw-r--r--redhat/main/tdebase/tdm.service.fc3112
-rw-r--r--redhat/main/tdebase/tdm.service.mga612
-rw-r--r--redhat/main/tdebase/tdm.service.mga712
-rw-r--r--redhat/main/tdebindings/tdebindings.spec (renamed from redhat/main/tdebindings/tdebindings-14.0.0.spec)65
-rw-r--r--redhat/main/tdeedu/tdeedu.spec (renamed from redhat/main/tdeedu/tdeedu-14.0.0.spec)121
-rw-r--r--redhat/main/tdegames/tdegames.spec (renamed from redhat/main/tdegames/tdegames-14.0.0.spec)2
-rw-r--r--redhat/main/tdegraphics/tdegraphics.spec (renamed from redhat/main/tdegraphics/tdegraphics-14.0.0.spec)6
-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.spec7
-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.spec (renamed from redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec)2
-rw-r--r--redhat/main/tdenetwork/tdenetwork.spec (renamed from redhat/main/tdenetwork/tdenetwork-14.0.0.spec)13
-rw-r--r--redhat/main/tdepim/tdepim-14.0.0.patch90
-rw-r--r--redhat/main/tdepim/tdepim.spec2
-rw-r--r--redhat/main/tdesdk/tdesdk.spec (renamed from redhat/main/tdesdk/tdesdk-14.0.0.spec)23
-rw-r--r--redhat/main/tdetoys/tdetoys.spec2
-rw-r--r--redhat/main/tdeutils/tdeutils.spec2
-rw-r--r--redhat/main/tdevelop/tdevelop.spec (renamed from redhat/main/tdevelop/tdevelop-14.0.0.spec)8
-rw-r--r--redhat/main/tdewebdev/tdewebdev.spec (renamed from redhat/main/tdewebdev/tdewebdev-14.0.0.spec)2
42 files changed, 355 insertions, 1422 deletions
diff --git a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec b/redhat/main/tde-i18n/tde-i18n.spec
index bad847a91..6cf838bc5 100644
--- a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/main/tde-i18n/tde-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.0.7
%endif
%define tde_pkg tde-i18n
%define tde_prefix /opt/trinity
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility.spec
index 3e8d02cf6..96ee80e2d 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdeaccessibility
%define tde_prefix /opt/trinity
diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons.spec
index 90ddfe3e6..8a048cf08 100644
--- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/main/tdeaddons/tdeaddons.spec
@@ -21,7 +21,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdeaddons
%define tde_prefix /opt/trinity
@@ -116,13 +116,9 @@ BuildRequires: libacl-devel
# DB4/DB5 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
%define with_db 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: db4-devel
-%else
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: db5-devel
%endif
-%endif
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
BuildRequires: libdb-devel
BuildRequires: libdb-cxx-devel
@@ -141,6 +137,13 @@ BuildRequires: db4-devel
#BuildRequires: xmms-devel
#%endif
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+%define python python3
+%else
+%define python python
+%endif
+
Requires: trinity-atlantikdesigner = %{version}-%{release}
Requires: trinity-kaddressbook-plugins = %{version}-%{release}
Requires: trinity-kate-plugins = %{version}-%{release}
@@ -391,7 +394,7 @@ controls XMMS, install the xmms-kde-trinity package.
Summary: scripts for KNewsTicker, the Trinity news ticker
Group: Applications/Utilities
Requires: perl
-Requires: python
+Requires: %{python}
#Requires: libfinance-quote-perl
#Requires: libmime-perl
#Requires: libnews-nntpclient-perl
@@ -432,12 +435,12 @@ Requires: %{_lib}jpeg62
%if 0%{?suse_version} == 1230
Requires: libjpeg8
%endif
-Requires: python
+Requires: %{python}
Requires: rsync
#Requires: unison
Requires: trinity-konqueror
%if 0%{?fedora}
-Requires: python-exif
+Requires: %{python}-exif
%endif
%description -n trinity-konq-plugins
@@ -664,12 +667,12 @@ of user interfaces, playlists and visualisation plugins.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
# Fix shebangs
sed -i "knewsticker-scripts/sportscores.py" \
"konq-plugins/imagerotation/orient.py" \
"konq-plugins/imagerotation/exif.py" \
- -e "s|env python|env python3|"
+ -e "s|env python|env %{python}|"
%endif
diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/main/tdeadmin/tdeadmin.spec
index 3e7a33ef6..11420b963 100644
--- a/redhat/main/tdeadmin/tdeadmin.spec
+++ b/redhat/main/tdeadmin/tdeadmin.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdeadmin
%define tde_prefix /opt/trinity
diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork.spec
index 3d31f7233..7c47950a3 100644
--- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/main/tdeartwork/tdeartwork.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdeartwork
%define tde_prefix /opt/trinity
@@ -103,7 +103,7 @@ BuildRequires: libart_lgpl-devel
# RHEL 4: disabled
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el8
new file mode 120000
index 000000000..dab729b22
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.el8
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos
new file mode 120000
index 000000000..ad0fc6da6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.pclos2018 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el8 b/redhat/main/tdebase/pamd.kdm-trinity-np.el8
new file mode 120000
index 000000000..3415e7d55
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.el8
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc31 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc31
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc31
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+session include postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos
new file mode 120000
index 000000000..5cde6e2c5
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.pclos2018 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el8 b/redhat/main/tdebase/pamd.kdm-trinity.el8
new file mode 120000
index 000000000..f85413ec6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.el8
@@ -0,0 +1 @@
+pamd.kdm-trinity.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc31 b/redhat/main/tdebase/pamd.kdm-trinity.fc31
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc31
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth required pam_env.so
+auth substack system-auth
+-auth optional pam_gnome_keyring.so
+-auth optional pam_kwallet.so
+-auth optional pam_kwallet5.so
+auth include postlogin
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_selinux.so close
+session required pam_loginuid.so
+session optional pam_console.so
+-session optional pam_ck_connector.so
+session required pam_selinux.so open
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet.so
+-session optional pam_kwallet5.so
+session include postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos b/redhat/main/tdebase/pamd.kdm-trinity.pclos
new file mode 120000
index 000000000..fcc6957f7
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos
@@ -0,0 +1 @@
+pamd.kdm-trinity.pclos2018 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el8
new file mode 120000
index 000000000..a5fab9e3e
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.el8
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos
new file mode 120000
index 000000000..31d43e302
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.pclos2018 \ No newline at end of file
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index e8e3dbe50..a4c5fe6a0 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdebase
%define tde_prefix /opt/trinity
@@ -74,7 +74,7 @@ Source6: suse-displaymanagers-tdm
%endif
# Fedora 18: use SYSTEMD for TDM startup
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
Source7: tdm.service%{?dist}
%endif
@@ -229,7 +229,31 @@ Requires: fedora-logos
# Fedora 28 Theme
%if 0%{?fedora} == 28
Requires: f28-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png
+%define tde_bg /usr/share/backgrounds/f28/default/standard/f28.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 29 Theme
+%if 0%{?fedora} == 29
+Requires: f29-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f29/default/standard/f29.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 30 Theme
+%if 0%{?fedora} == 30
+Requires: f30-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f30/default/standard/f30.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 31 Theme
+%if 0%{?fedora} == 31
+Requires: f28-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f31/default/standard/f31.png
Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
@@ -263,6 +287,13 @@ Requires: redhat-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
%endif
+# RHEL 8 Theme
+%if 0%{?rhel} == 8
+Requires: redhat-logos
+%define tde_bg /usr/share/backgrounds/day.jpg
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+%endif
+
# Mageia 2 Theme
%if 0%{?mgaversion} == 2
Requires: mageia-theme-Default
@@ -298,6 +329,13 @@ Requires: mageia-theme-Default
%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
%endif
+# Mageia 7 Theme
+%if 0%{?mgaversion} == 7
+Requires: mageia-theme-Default
+%define tde_bg /usr/share/mga/backgrounds/default.jpg
+%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
+%endif
+
# Mandriva 2011 Theme: "rosa"
%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
Requires: mandriva-theme
@@ -381,6 +419,22 @@ Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
+# OpenSuse 15.1 Theme
+%if "%{?suse_version}" == "1510"
+Requires: wallpaper-branding
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires: hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
+# OpenSuse TW Theme
+%if "%{?suse_version}" == "1550"
+Requires: wallpaper-branding
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires: hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -956,7 +1010,7 @@ Some random features:
%{tde_tdeappdir}/kate.desktop
%{tde_datadir}/apps/kate/
%{tde_datadir}/apps/tdeconf_update/kate-2.4.upd
-%config(noreplace) %{_sysconfdir}/trinity/katerc
+%config(noreplace) %{tde_confdir}/katerc
%{tde_datadir}/icons/hicolor/*/apps/kate.png
%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
%{tde_datadir}/servicetypes/kateplugin.desktop
@@ -1357,7 +1411,7 @@ TDE applications, particularly those in the TDE base module.
%{tde_bindir}/kreadconfig
%{tde_bindir}/kwriteconfig
%{tde_bindir}/kstart
-%config(noreplace) %{_sysconfdir}/trinity/kxkb_groups
+%config(noreplace) %{tde_confdir}/kxkb_groups
%{tde_bindir}/drkonqi
%{tde_bindir}/crashtest
%{tde_bindir}/kapplymousetheme
@@ -1497,7 +1551,7 @@ needed for a basic TDE desktop installation.
%files data
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/tdeshorturifilterrc
+%config(noreplace) %{tde_confdir}/tdeshorturifilterrc
%{tde_datadir}/applnk/.hidden/battery.desktop
%{tde_datadir}/applnk/.hidden/bwarning.desktop
%{tde_datadir}/applnk/.hidden/cwarning.desktop
@@ -1755,7 +1809,6 @@ needed for a basic TDE desktop installation.
# XDG directories information
%dir %{_sysconfdir}/xdg/menus/applications-merged
%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu
%config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
%config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu
@@ -2087,8 +2140,8 @@ the TDE desktop.
%files -n trinity-kdesktop
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu1
-%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2
+%config(noreplace) %{tde_confdir}/kdesktop_custom_menu1
+%config(noreplace) %{tde_confdir}/kdesktop_custom_menu2
%{tde_bindir}/kcheckrunning
%{tde_bindir}/kxdglauncher
%{tde_bindir}/tdeeject
@@ -2192,6 +2245,9 @@ already. Most users won't need this.
%{tdm_datadir}/sessions/*.desktop
%{tdm_datadir}/themes/
%{tde_confdir}/%{tdm}
+%if 0%{?with_selinux_policy}
+%exclude %{tde_confdir}/%{tdm}/tdm.pp
+%endif
%{tde_tdedocdir}/HTML/en/%{tdm}/
%if 0%{?suse_version} == 0
%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
@@ -2232,7 +2288,7 @@ already. Most users won't need this.
# SELINUX policy
%if 0%{?with_selinux_policy}
-%{?_sysconfdir}/trinity/%{tdm}/tdm.pp
+%{tde_confdir}/%{tdm}/tdm.pp
%endif
# Logrotate configuration
@@ -2241,17 +2297,17 @@ already. Most users won't need this.
%pre -n trinity-tdm
# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
- if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
+ if [ -d "%{tde_confdir}/%{tdm}" ]; then
# If there is already something under '/etc/trinity/tdm', simply delete old configuration
echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
rm -rf "%{tde_datadir}/config/%{tdm}"
else
# Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
- if [ ! -d "%{_sysconfdir}/trinity" ]; then
- mkdir -p "%{_sysconfdir}/trinity"
+ if [ ! -d "%{tde_confdir}" ]; then
+ mkdir -p "%{tde_confdir}"
fi
- echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'"
- mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr"
+ echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{tde_confdir}/%{tdm}'"
+ mv -f "%{tde_datadir}/config/%{tdm}" "%{tde_confdir}/%{tdm}.migr"
fi
fi
@@ -2269,7 +2325,7 @@ fi
# SELINUX context for tdm
%if 0%{?with_selinux_policy}
-/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
+/usr/sbin/semodule -i "%{tde_confdir}/%{tdm}/tdm.pp"
%endif
%if 0%{?fedora} == 21 || 0%{?rhel} >= 7
@@ -2288,7 +2344,7 @@ fi
# Sets default language for TDM
if [ "$1" = "1" ]; then
if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
- sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
+ sed -i "%{tde_confdir}/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
fi
fi
@@ -2304,9 +2360,9 @@ update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanage
%posttrans -n trinity-tdm
# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
- mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/"
- rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/"
+if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then
+ mv -f "%{tde_confdir}/%{tdm}.migr/"* "%{tde_confdir}/%{tdm}/"
+ rmdir "%{tde_confdir}/%{tdm}.migr/"
fi
%postun -n trinity-tdm
@@ -2549,7 +2605,7 @@ web browser if the clipboard contains a URL.
%files -n trinity-klipper
%defattr(-,root,root,-)
%{tde_bindir}/klipper
-%config(noreplace) %{_sysconfdir}/trinity/klipperrc
+%config(noreplace) %{tde_confdir}/klipperrc
%{tde_tdelibdir}/klipper.la
%{tde_tdelibdir}/klipper.so
%{tde_tdelibdir}/klipper_panelapplet.la
@@ -2628,7 +2684,7 @@ ever launching another application.
%files -n trinity-konqueror
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/konqsidebartng.rc
+%config(noreplace) %{tde_confdir}/konqsidebartng.rc
%{tde_bindir}/kbookmarkmerger
%{tde_bindir}/keditbookmarks
%{tde_bindir}/kfmclient
@@ -3040,7 +3096,7 @@ to monitor it through the daemon running there.
%files -n trinity-ksysguardd
%defattr(-,root,root,-)
%{tde_bindir}/ksysguardd
-%config(noreplace) %{_sysconfdir}/trinity/ksysguarddrc
+%config(noreplace) %{tde_confdir}/ksysguarddrc
##########
@@ -3179,7 +3235,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
%files libtqt3-integration
%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/integration/
+%{_libdir}/tqt3/plugins/integration/
%{tde_tdelibdir}/kded_kdeintegration.la
%{tde_tdelibdir}/kded_kdeintegration.so
%{tde_datadir}/services/kded/kdeintegration.desktop
@@ -3357,8 +3413,8 @@ fi
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
- -DCONFIG_INSTALL_DIR="%{_sysconfdir}/trinity" \
- -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
-DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
\
-DWITH_ALL_OPTIONS=ON \
@@ -3470,7 +3526,7 @@ EOF
%endif
# TDM configuration
-%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \
+%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else
@@ -3507,7 +3563,7 @@ fi
# SELINUX policy for RHEL / Fedora
%if 0%{?with_selinux_policy}
-%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
+%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp"
%endif
# Mageia icon for TDE menu
diff --git a/redhat/main/tdebase/tdm.el8.pp b/redhat/main/tdebase/tdm.el8.pp
new file mode 120000
index 000000000..3d25dc4f0
--- /dev/null
+++ b/redhat/main/tdebase/tdm.el8.pp
@@ -0,0 +1 @@
+tdm.el7.pp \ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.fc31.pp b/redhat/main/tdebase/tdm.fc31.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc31.pp
Binary files differ
diff --git a/redhat/main/tdebase/tdm.service.el8 b/redhat/main/tdebase/tdm.service.el8
new file mode 120000
index 000000000..87f56ea08
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.el8
@@ -0,0 +1 @@
+tdm.service.el7 \ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.service.fc31 b/redhat/main/tdebase/tdm.service.fc31
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc31
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/kdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga6 b/redhat/main/tdebase/tdm.service.mga6
new file mode 100644
index 000000000..eda2906e2
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.mga6
@@ -0,0 +1,12 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm(1)
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga7 b/redhat/main/tdebase/tdm.service.mga7
new file mode 100644
index 000000000..eda2906e2
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.mga7
@@ -0,0 +1,12 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm(1)
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings.spec
index 4b9de5a75..141c1d8aa 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings.spec
@@ -27,7 +27,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdebindings
%define tde_prefix /opt/trinity
@@ -122,7 +122,7 @@ BuildRequires: mozilla-xulrunner20-devel
BuildRequires: openssl-devel
# GTK1 support
-%if 0%{?fedora} || 0%{?rhel} >= 5
+%if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7)
%define with_gtk1 1
BuildRequires: glib-devel
BuildRequires: gtk+-devel
@@ -170,7 +170,14 @@ BuildRequires: Mesa-libGLU-devel
## Python
-BuildRequires: python-devel
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
## ruby
@@ -234,10 +241,10 @@ BuildRequires: java-devel >= 1.4.2
%if 0%{?suse_version} >= 1320
BuildRequires: java-1_8_0-openjdk-devel
%endif
-%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5
+%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8
BuildRequires: java-1.8.0-openjdk-devel
%endif
-%if 0%{?fedora} == 17 || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} >= 7
+%if 0%{?fedora} == 17 || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7
BuildRequires: java-1.7.0-openjdk-devel
%endif
%if 0%{?rhel} == 5 || 0%{?rhel} == 6
@@ -256,7 +263,9 @@ BuildRequires: java-1.6.0-openjdk-devel
%define java_home %{_usr}/lib/jvm/java
%endif
%endif
+%if 0%{?pclinuxos} == 0
%define _with_java --with-java=%{java_home}
+%endif
## Perl
# There is no 'perl-devel' package on RHEL5
@@ -273,14 +282,18 @@ Obsoletes: trinity-kdebindings < %{version}-%{release}
Provides: trinity-kdebindings = %{version}-%{release}
# Metapackage requires
+%if "%{?_with_java}" != ""
Requires: trinity-tdebindings-java = %{version}-%{release}
+%endif
Requires: trinity-libsmoketqt = %{version}-%{release}
Requires: trinity-libsmoketde = %{version}-%{release}
Requires: perl-dcop = %{version}-%{release}
Requires: python-dcop = %{version}-%{release}
Requires: trinity-libkjsembed1 = %{version}-%{release}
Requires: trinity-kjscmd = %{version}-%{release}
+%if "%{?_with_java}" != ""
Requires: trinity-juic = %{version}-%{release}
+%endif
Requires: trinity-libkorundum0-ruby = %{version}-%{release}
Requires: trinity-libqt0-ruby = %{version}-%{release}
@@ -314,6 +327,7 @@ This package is part of the official TDE bindings module.
##########
+%if "%{?_with_java}" != ""
%package -n trinity-libdcop3-java
Summary: DCOP bindings for Java [Trinity]
Group: System/Libraries
@@ -330,9 +344,11 @@ This package is part of the official TDE bindings module.
%files -n trinity-libdcop3-java
%defattr(-,root,root,-)
%{tde_libdir}/java/org/
+%endif
##########
+%if "%{?_with_java}" != ""
%package -n trinity-libdcop3-java-devel
Summary: DCOP bindings for Java (dcopidl2java program) [Trinity]
Group: Development/Languages/Java
@@ -349,9 +365,11 @@ This package is part of the official TDE bindings module.
%files -n trinity-libdcop3-java-devel
%defattr(-,root,root,-)
%{tde_bindir}/dcopidl2java
+%endif
##########
+%if "%{?_with_java}" != ""
%package -n trinity-libdcop3-jni
Summary: DCOP bindings for Java ( Native libraries ) [Trinity]
Group: System/Libraries
@@ -368,9 +386,11 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{tde_libdir}/libjavadcop.la
%{tde_libdir}/libjavadcop.so
+%endif
##########
+%if "%{?_with_java}" != ""
%package -n trinity-libqt3-java
Summary: Java bindings for Qt [Trinity]
Group: System/Libraries
@@ -392,9 +412,11 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{tde_libdir}/java/qtjava*.jar
%{tde_tdedocdir}/HTML/en/javalib/
+%endif
##########
+%if "%{?_with_java}" != ""
%package -n trinity-libtqt3-jni
Summary: Java bindings for TQt ( Native libraries ) [Trinity]
Group: System/Libraries
@@ -416,9 +438,11 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/jni/lib*qtjava.la
%{tde_libdir}/jni/lib*qtjava.so.*
%doc qtjava/ChangeLog
+%endif
##########
+%if "%{?_with_java}" != ""
%package -n trinity-libtqt3-jni-devel
Summary: Development files fo Java bindings for TQt ( Native libraries ) [Trinity]
Group: Development/Languages/Java
@@ -436,9 +460,11 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{tde_libdir}/lib*qtjavasupport.so
%{tde_libdir}/jni/lib*qtjava.so
+%endif
##########
+%if "%{?_with_java}" != ""
%package -n trinity-libtrinity-java
Summary: Tdelibs bindings for Java [Trinity]
Group: System/Libraries
@@ -458,9 +484,11 @@ This package is part of the official TDE bindings module.
%files -n trinity-libtrinity-java
%defattr(-,root,root,-)
%{tde_libdir}/java/koala*.jar
+%endif
##########
+%if "%{?_with_java}" != ""
%package -n trinity-libtrinity-jni
Summary: Tdelibs bindings for java ( Native libraries ) [Trinity]
Group: System/Libraries
@@ -477,9 +505,11 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/jni/libtdejava.la
%{tde_libdir}/jni/libtdejava.so.*
%doc tdejava/ChangeLog
+%endif
##########
+%if "%{?_with_java}" != ""
%package -n trinity-libtrinity-jni-devel
Summary: Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
Group: Development/Languages/Java
@@ -493,6 +523,7 @@ This package is part of the official TDE bindings module.
%files -n trinity-libtrinity-jni-devel
%defattr(-,root,root,-)
%{tde_libdir}/jni/libtdejava.so
+%endif
##########
@@ -620,7 +651,7 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
%package -n python-dcop
Summary: DCOP bindings for Python
Group: System/Libraries
-Requires: python
+Requires: %{python}
Obsoletes: trinity-python-dcop < %{version}-%{release}
Provides: trinity-python-dcop = %{version}-%{release}
@@ -729,6 +760,7 @@ This package is part of the official TDE bindings module.
##########
+%if "%{?_with_java}" != ""
%package -n trinity-juic
Summary: The Qt Java UI Compiler
Group: Development/Languages/Java
@@ -747,6 +779,7 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{tde_bindir}/juic
%{tde_datadir}/juic/
+%endif
##########
@@ -967,13 +1000,17 @@ Provides: trinity-kdebindings-devel = %{version}-%{release}
# Metapackage
Requires: trinity-libsmoketqt-devel = %{version}-%{release}
+%if "%{?_with_java}" != ""
Requires: trinity-libdcop3-java-devel = %{version}-%{release}
+%endif
Requires: trinity-libsmoketde-devel = %{version}-%{release}
Requires: trinity-libkjsembed-devel = %{version}-%{release}
Requires: trinity-libxparts-devel = %{version}-%{release}
Requires: trinity-libdcop-c-devel = %{version}-%{release}
+%if "%{?_with_java}" != ""
Requires: trinity-libtqt3-jni-devel = %{version}-%{release}
Requires: trinity-libtrinity-jni-devel = %{version}-%{release}
+%endif
%description devel
This package contains the development files for the TDE bindings.
@@ -1023,7 +1060,7 @@ exit 3
-e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
# Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd'
-%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7
+%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
%__sed -i "kjsembed/tdescript/swaptabs.js" \
-i "kjsembed/stdlib/cmdline.js" \
-e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|"
@@ -1095,11 +1132,7 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_targe
# Build dcopperl with specific options
pushd dcopperl
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
-
-# [Bug #348] Ugly hack to modify the man pages directory
-sed -i "Makefile" -e "s|/usr/share/man|%{tde_mandir}|g"
-
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3
%__make OPTIMIZE="$RPM_OPT_FLAGS" ||:
popd
@@ -1121,6 +1154,7 @@ export PATH="%{tde_bindir}:${PATH}"
find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+%if "%{?_with_java}" != ""
# Installs juic
%__install -D -m 755 qtjava/designer/juic/bin/juic %{?buildroot}%{tde_bindir}/juic
%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common
@@ -1130,6 +1164,7 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
%__install -m 644 qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java
%__install -m 644 qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java
%__install -m 644 qtjava/designer/juic/juic.xsl %{?buildroot}%{tde_datadir}/juic
+%endif
# kjsembed sample files
%__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
@@ -1140,12 +1175,6 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
%__install -m 644 kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
%__install -m 644 kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-# Man installation location is wrong on RHEL4...
-if [ -d "%{buildroot}%{_mandir}/man3" ]; then
- mv -f %{buildroot}%{_mandir}/man3 %{buildroot}%{tde_mandir}/man3/
- rm -rf %{buildroot}%{_mandir}
-fi
-
# Move 'embedjs.desktop' to correct location
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop"
%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu.spec
index af7343097..aaf41572f 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdeedu
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ Source1: %{name}-rpmlintrc
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: desktop-file-utils
# SUSE desktop files utility
@@ -80,8 +80,14 @@ BuildRequires: gcc-c++
BuildRequires: fdupes
# PYTHON support
-BuildRequires: python-devel
-BuildRequires: python
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500
+%define python python3
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
# BOOST support
BuildRequires: boost-devel
@@ -89,18 +95,14 @@ BuildRequires: boost-devel
# OCAML support
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: ocaml(compiler)
+#BuildRequires: ocaml-facile-devel
%else
BuildRequires: ocaml
+#BuildRequires: ocaml-facile-devel
%endif
# KIG python scripting support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?fedora} >= 29
-%define with_kig 0
-%else
%define with_kig 1
-%endif
-%endif
Obsoletes: trinity-kdeedu < %{version}-%{release}
Provides: trinity-kdeedu = %{version}-%{release}
@@ -212,6 +214,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/blinken.png
%{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz
%{tde_tdedocdir}/HTML/en/blinken/
+%{tde_mandir}/man1/blinken*
##########
@@ -248,6 +251,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/kalzium.png
%{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz
%{tde_tdedocdir}/HTML/en/kalzium/
+%{tde_mandir}/man1/kalzium*
##########
@@ -300,6 +304,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/kanagram.png
%{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz
%{tde_tdedocdir}/HTML/en/kanagram/
+%{tde_mandir}/man1/kanagram*
##########
@@ -325,6 +330,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/kbruch.svgz
%{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png
%{tde_tdedocdir}/HTML/en/kbruch/
+%{tde_mandir}/man1/kbruch*
##########
@@ -343,6 +349,7 @@ This package is part of Trinity, as a component of the TDE education module.
%defattr(-,root,root,-)
%{tde_bindir}/keduca
%{tde_bindir}/keducabuilder
+%{tde_bindir}/keduca-shrinker
%{tde_tdelibdir}/libkeducapart.la
%{tde_tdelibdir}/libkeducapart.so
%{tde_tdeappdir}/keduca.desktop
@@ -354,6 +361,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/mimelnk/application/x-edugallery.desktop
%{tde_datadir}/services/keduca_part.desktop
%{tde_tdedocdir}/HTML/en/keduca/
+%{tde_mandir}/man1/keduca*
##########
@@ -374,12 +382,14 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-kgeography
%defattr(-,root,root,-)
%{tde_bindir}/kgeography
+%{tde_bindir}/kgeography_gen_map.pl
%{tde_tdeappdir}/kgeography.desktop
%{tde_datadir}/config.kcfg/kgeography.kcfg
%{tde_datadir}/icons/crystalsvg/*/apps/kgeography.png
%{tde_datadir}/icons/crystalsvg/scalable/apps/kgeography.svgz
%{tde_datadir}/icons/hicolor/*/apps/kgeography.png
%{tde_tdedocdir}/HTML/en/kgeography
+%{tde_mandir}/man1/kgeography*
##########
@@ -430,6 +440,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/khangman.png
%{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz
%{tde_tdedocdir}/HTML/en/khangman/
+%{tde_mandir}/man1/khangman*
##########
@@ -490,6 +501,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_tdedocdir}/HTML/en/kig/
%{tde_confdir}/magic/cabri.magic.mgc
%{tde_confdir}/magic/drgeo.magic.mgc
+%{tde_mandir}/man1/kig*
##########
@@ -516,6 +528,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_tdedocdir}/HTML/en/kiten/
%{tde_datadir}/icons/hicolor/*/apps/kiten.png
%{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz
+%{tde_mandir}/man1/kiten*
##########
@@ -550,6 +563,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/klatin.png
%{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz
%{tde_tdedocdir}/HTML/en/klatin/
+%{tde_mandir}/man1/klatin*
##########
@@ -579,6 +593,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/klettres.png
%{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz
%{tde_tdedocdir}/HTML/en/klettres/
+%{tde_mandir}/man1/klettres*
##########
@@ -635,6 +650,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/mimelnk/application/x-kmplot.desktop
%{tde_datadir}/services/kmplot_part.desktop
%{tde_tdedocdir}/HTML/en/kmplot/
+%{tde_mandir}/man1/kmplot*
##########
@@ -661,6 +677,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/kpercentage.png
%{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz
%{tde_tdedocdir}/HTML/en/kpercentage/
+%{tde_mandir}/man1/kpercentage*
##########
@@ -695,6 +712,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/kstars.png
%{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz
%{tde_tdedocdir}/HTML/en/kstars/
+%{tde_mandir}/man1/kstars*
##########
@@ -743,6 +761,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/ktouch.png
%{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz
%{tde_tdedocdir}/HTML/en/ktouch/
+%{tde_mandir}/man1/ktouch*
##########
@@ -780,6 +799,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/config.kcfg/kturtle.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kturtle.png
%{tde_tdedocdir}/HTML/en/kturtle/
+%{tde_mandir}/man1/kturtle*
##########
@@ -809,6 +829,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/kverbos.png
%{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz
%{tde_tdedocdir}/HTML/en/kverbos/
+%{tde_mandir}/man1/kverbos*
##########
@@ -851,6 +872,8 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/config.kcfg/presettings.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png
%{tde_tdedocdir}/HTML/en/kvoctrain/
+%{tde_mandir}/man1/kvoctrain*
+%{tde_mandir}/man1/spotlight2kvtml*
##########
@@ -883,6 +906,8 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
%{tde_datadir}/mimelnk/application/x-kwordquiz.desktop
%{tde_tdedocdir}/HTML/en/kwordquiz/
+%{tde_mandir}/man1/kwordquiz*
+%{tde_mandir}/man1/langen*
##########
@@ -1024,6 +1049,12 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_bindir}/temma
%{tde_bindir}/v4ldriver
%{tde_bindir}/v4lphilips
+%{tde_mandir}/man1/celestrongps*
+%{tde_mandir}/man1/fliccd*
+%{tde_mandir}/man1/indi*
+%{tde_mandir}/man1/lx200*
+%{tde_mandir}/man1/temma*
+%{tde_mandir}/man1/v4l*
##########
@@ -1062,66 +1093,52 @@ This package contains the development files for tdeedu.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
# Fix shebangs
sed -i "kig/pykig/pykig.py" \
- -e "s|env python|env python3|"
+ -e "s|env python|env %{python}|"
%endif
-# RHEL5 strange FTBFS on V4L stuff
-%if 0%{?rhel} == 5
-%__sed -i "admin/acinclude.m4.in" -e "s|-ansi||"
-%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 kde_confdir="%{tde_confdir}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
- export CFLAGS="${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: GCC visibility causes FTBFS [Bug #1285]
-%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_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DBIN_INSTALL_DIR="%{tde_bindir}" \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
+ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
\
-%if 0%{?with_kig}
- --enable-kig-python-scripting \
-%else
- --disable-kig-python-scripting \
-%endif
- --enable-ocamlsolver
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_OCAML_SOLVER=OFF \
+ ..
-%__make %{_smp_mflags} \
- OCAMLLIB=$(ocamlc -where) \
- FACILELIB=$(ocamlc -where)
+%__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}
diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames.spec
index 993f41a18..f1d8a06ee 100644
--- a/redhat/main/tdegames/tdegames-14.0.0.spec
+++ b/redhat/main/tdegames/tdegames.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdegames
%define tde_prefix /opt/trinity
diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics.spec
index 5206a11b8..2905481b3 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdegraphics
%define tde_prefix /opt/trinity
@@ -101,7 +101,7 @@ BuildRequires: pcre-devel
BuildRequires: libacl-devel
# GIF support
-%if 0%{?suse_version} || 0%{?fedora} >= 28
+%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
BuildRequires: giflib-devel
%else
BuildRequires: libungif-devel
@@ -130,7 +130,7 @@ BuildRequires: libpaper-devel
%define with_t1lib 1
BuildRequires: t1lib-devel
%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora}
+%if 0%{?mgaversion} || 0%{?mdkversion} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) || 0%{?fedora}
%define with_t1lib 1
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}t1lib-devel
diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.patch b/redhat/main/tdelibs/tdelibs-14.0.1.patch
deleted file mode 100644
index ab309f841..000000000
--- a/redhat/main/tdelibs/tdelibs-14.0.1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h
-index b5fddb8..1269c36 100644
---- a/tdecore/tdeglobal.h
-+++ b/tdecore/tdeglobal.h
-@@ -25,8 +25,10 @@ class KCharsets;
- class TDEConfig;
- class TDESharedConfig;
- class TDEIconLoader;
-+#ifdef __TDE_HAVE_TDEHWLIB
- class TDEHardwareDevices;
- class TDEGlobalNetworkManager;
-+#endif
- class TDELocale;
- class TDEStandardDirs;
- class KStaticDeleterBase;
-@@ -79,6 +81,7 @@ public:
- */
- static TDEIconLoader *iconLoader();
-
-+#ifdef __TDE_HAVE_TDEHWLIB
- /**
- * Returns a TDEHardwareDevices object.
- * @return the global hardware devices object
-@@ -90,6 +93,7 @@ public:
- * @return the global network manager object
- */
- static TDEGlobalNetworkManager *networkManager();
-+#endif
-
- /**
- * Returns the global locale object.
diff --git a/redhat/main/tdelibs/tdelibs-14.1.0.patch b/redhat/main/tdelibs/tdelibs-14.1.0.patch
deleted file mode 100644
index c4812b447..000000000
--- a/redhat/main/tdelibs/tdelibs-14.1.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
-index 4d9c4a4..fed951b 100644
---- a/tdecore/CMakeLists.txt
-+++ b/tdecore/CMakeLists.txt
-@@ -137,7 +137,7 @@ tde_add_library( ${target} SHARED AUTOMOC
- EMBED tdecorenetwork-static ${TDEHW_LIB}
- LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
- ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}
-- ${LIBBFD_LIBRARIES} ${LIB_UTIL}
-+ ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${SSL_LIBRARIES}
- DEPENDENCIES dcopidl dcopidl2cpp
- DESTINATION ${LIB_INSTALL_DIR}
- )
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec
index 0afe618fe..f38c171de 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/main/tdelibs/tdelibs.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdelibs
%define tde_prefix /opt/trinity
@@ -60,9 +60,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: %{name}-rpmlintrc
-Patch0: tdelibs-14.0.1.patch
-Patch1: tdelibs-14.1.0.patch
-
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
Obsoletes: trinity-kdelibs < %{version}-%{release}
@@ -622,8 +619,6 @@ applications for TDE.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
-%patch1 -p1 -b .ftbfs
# RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings
%if 0%{?rhel} == 5
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
deleted file mode 100644
index 44fd60fab..000000000
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
+++ /dev/null
@@ -1,1145 +0,0 @@
-#
-# spec file for package tdemultimedia (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/
-#
-
-# BUILD WARNING:
-# Remove qt-devel and qt3-devel and any kde*-devel on your system !
-# Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
-%endif
-%define tde_pkg tdemultimedia
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_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}
-Summary: Multimedia applications for the Trinity Desktop Environment
-Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group: Productivity/Multimedia/Sound/Utilities
-URL: http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License: GPL-2.0+
-%else
-License: GPLv2+
-%endif
-
-#Vendor: Trinity Project
-#Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-Obsoletes: trinity-kdemultimedia < %{version}-%{release}
-Provides: trinity-kdemultimedia = %{version}-%{release}
-Obsoletes: trinity-kdemultimedia-libs < %{version}-%{release}
-Provides: trinity-kdemultimedia-libs = %{version}-%{release}
-Obsoletes: trinity-kdemultimedia-extras < %{version}-%{release}
-Provides: trinity-kdemultimedia-extras = %{version}-%{release}
-Obsoletes: trinity-kdemultimedia-extras-libs < %{version}-%{release}
-Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release}
-
-BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires: autoconf automake libtool m4
-BuildRequires: gcc-c++
-BuildRequires: fdupes
-BuildRequires: desktop-file-utils
-
-# 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
-
-# TAGLIB support
-%define with_taglib 1
-BuildRequires: taglib-devel
-
-# AKODE support
-%define with_akode 1
-BuildRequires: trinity-akode-devel
-
-# MAD support
-%ifarch %{ix86} x86_64
-%define with_libmad 1
-%{?with_libmad:BuildRequires: libakode_mpeg_decoder}
-%endif
-
-# ZLIB support
-BuildRequires: zlib-devel
-
-# MUSICBRAINZ support
-## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define with_musicbrainz 1
-#BuildRequires: libmusicbrainz-devel libtunepimp-devel
-
-# Audio libraries
-BuildRequires: libvorbis-devel
-BuildRequires: audiofile-devel
-BuildRequires: libtheora-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: cdparanoia
-#BuildRequires: libmpg123-devel
-
-# CDDA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libcdda-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: cdparanoia-devel
-%endif
-
-# FLAC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: libflac-devel
-%else
-BuildRequires: %{_lib}flac-devel
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: flac-devel
-%endif
-
-# GSTREAMER support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}gstreamer1.0-devel
-BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version}
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-base-devel
-%endif
-%if 0%{?rhel} >= 7 || 0%{?fedora}
-BuildRequires: gstreamer1-devel >= 1.0
-BuildRequires: gstreamer1-plugins-base-devel >= 1.0
-%endif
-
-# X11 Libraries
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xxf86dga-devel
-BuildRequires: %{_lib}xxf86vm-devel
-%if 0%{?mgaversion} >= 4
-BuildRequires: %{_lib}xtst-devel
-%else
-BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} == 4
-BuildRequires: xorg-x11-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires: libXxf86dga-devel
-BuildRequires: libXxf86vm-devel
-%endif
-
-# XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-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
-
-# LAME support
-%define with_lame 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: liblame-devel
-%else
-%if 0%{?mgaversion} >= 6
-BuildRequires: %{_lib}mp3lame-devel
-%else
-BuildRequires: %{_lib}lame-devel
-%endif
-%endif
-%endif
-
-%if 0%{?suse_version}
-BuildRequires: libmp3lame-devel
-%endif
-
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: lame-devel
-%endif
-
-
-Requires: trinity-artsbuilder = %{version}-%{release}
-Requires: trinity-juk = %{version}-%{release}
-Requires: trinity-kaboodle = %{version}-%{release}
-Requires: trinity-kaudiocreator = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-kappfinder-data = %{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: trinity-tdemid = %{version}-%{release}
-Requires: trinity-kmix = %{version}-%{release}
-Requires: trinity-krec = %{version}-%{release}
-Requires: trinity-kscd = %{version}-%{release}
-%{?with_akode:Requires: trinity-libarts-akode = %{version}-%{release}}
-Requires: trinity-libarts-audiofile = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}}
-%{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}}
-Requires: trinity-libkcddb = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}}
-Requires: trinity-noatun = %{version}-%{release}
-
-
-%description
-The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window
-System. The tdemultimedia package contains multimedia applications for
-TDE, including:
- artsbuilder, Synthesizer designer for aRts
- juk, a media player
- tdemid, a midi player
- kmix, an audio mixer
- arts, additional functionality for the aRts sound system
- krec, a recording tool
- kscd, an Audio-CD player
- kaudiocreator, a graphical frontend for audio file creation
- kaboodle, a media player
- noatun, a media player
-
-%files
-
-##########
-
-%package -n trinity-artsbuilder
-Summary: Synthesizer designer for aRts
-Group: Productivity/Multimedia/Sound/Mixers
-Requires: trinity-kicker >= %{tde_version}
-
-%description -n trinity-artsbuilder
-This is the analog Realtime synthesizer's graphical design tool.
-
-%files -n trinity-artsbuilder
-%defattr(-,root,root,-)
-%{tde_bindir}/artsbuilder
-%{tde_bindir}/artscontrol
-%{tde_bindir}/midisend
-%{tde_libdir}/libartsbuilder.la
-%{tde_libdir}/libartsbuilder.so.*
-%{tde_libdir}/libartscontrolapplet.la
-%{tde_libdir}/libartscontrolapplet.so.*
-%{tde_libdir}/libartscontrolsupport.la
-%{tde_libdir}/libartscontrolsupport.so.*
-%{tde_libdir}/libartsgui_idl.la
-%{tde_libdir}/libartsgui_idl.so.*
-%{tde_libdir}/libartsgui_kde.la
-%{tde_libdir}/libartsgui_kde.so.*
-%{tde_libdir}/libartsgui.la
-%{tde_libdir}/libartsgui.so.*
-%{tde_libdir}/libartsmidi_idl.la
-%{tde_libdir}/libartsmidi_idl.so.*
-%{tde_libdir}/libartsmidi.la
-%{tde_libdir}/libartsmidi.so.*
-%{tde_libdir}/libartsmodulescommon.la
-%{tde_libdir}/libartsmodulescommon.so.*
-%{tde_libdir}/libartsmoduleseffects.la
-%{tde_libdir}/libartsmoduleseffects.so.*
-%{tde_libdir}/libartsmodulesmixers.la
-%{tde_libdir}/libartsmodulesmixers.so.*
-%{tde_libdir}/libartsmodules.la
-%{tde_libdir}/libartsmodules.so.*
-%{tde_libdir}/libartsmodulessynth.la
-%{tde_libdir}/libartsmodulessynth.so.*
-%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcoptype
-%{tde_libdir}/mcop/Arts/Button.mcopclass
-%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
-%{tde_libdir}/mcop/Arts/Fader.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
-%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GraphLine.mcopclass
-%{tde_libdir}/mcop/artsgui.mcopclass
-%{tde_libdir}/mcop/artsgui.mcoptype
-%{tde_libdir}/mcop/Arts/HBox.mcopclass
-%{tde_libdir}/mcop/Arts/Label.mcopclass
-%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass
-%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass
-%{tde_libdir}/mcop/Arts/LineEdit.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MidiManager.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcoptype
-%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcoptype
-%{tde_libdir}/mcop/artsmoduleseffects.mcopclass
-%{tde_libdir}/mcop/artsmoduleseffects.mcoptype
-%{tde_libdir}/mcop/artsmodules.mcopclass
-%{tde_libdir}/mcop/artsmodules.mcoptype
-%{tde_libdir}/mcop/artsmodulesmixers.mcopclass
-%{tde_libdir}/mcop/artsmodulesmixers.mcoptype
-%{tde_libdir}/mcop/artsmodulessynth.mcopclass
-%{tde_libdir}/mcop/artsmodulessynth.mcoptype
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass
-%{tde_libdir}/mcop/Arts/PopupBox.mcopclass
-%{tde_libdir}/mcop/Arts/Poti.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/SpinBox.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass
-%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
-%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass
-%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass
-%{tde_libdir}/mcop/Arts/VBox.mcopclass
-%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Widget.mcopclass
-%{tde_tdeappdir}/artsbuilder.desktop
-%{tde_tdeappdir}/artscontrol.desktop
-%{tde_datadir}/apps/artsbuilder/
-%{tde_datadir}/apps/artscontrol/
-%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
-%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png
-%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png
-%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
-%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop
-%{tde_tdedocdir}/HTML/en/artsbuilder/
-
-##########
-
-%package -n trinity-juk
-Summary: Music organizer and player for Trinity
-Group: Productivity/Multimedia/Sound/Players
-
-%description -n trinity-juk
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-Some of JuK's features include:
-* Support for Ogg Vorbis and MP3 formats
-* Tag editing support for both formats, including ID3v2 for MP3 files.
- Multitagging or editing a selection of multiple files at once is also
- supported
-* Output to either the aRts, default KDE sound system, or GStreamer
-* Management of your "collection" and multiple playlists
-* Import and export to m3u playlists
-* Binary caching of audio meta-data and playlist information for faster
- load times (starting with the second time you run JuK)
-* Integration into TDE that allows drag-and-drop and clipboard usage
- with other TDE and X apps
-
-%files -n trinity-juk
-%defattr(-,root,root,-)
-%{tde_bindir}/juk
-%{tde_tdeappdir}/juk.desktop
-%{tde_datadir}/apps/juk/
-%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
-%{tde_datadir}/icons/hicolor/*/apps/juk.png
-%{tde_tdedocdir}/HTML/en/juk/
-
-##########
-
-%package -n trinity-kaboodle
-Summary: Light, embedded media player for Trinity
-Group: System/GUI/Other
-
-%if 0%{?with_xine}
-Requires: trinity-libarts-xine = %{version}-%{release}
-%endif
-
-%description -n trinity-kaboodle
-Kaboodle is a light, embedded media player, supporting both video and audio,
-for TDE. It uses the aRts framework for playing media files.
-
-%files -n trinity-kaboodle
-%defattr(-,root,root,-)
-%{tde_bindir}/kaboodle
-%{tde_tdelibdir}/libkaboodlepart.la
-%{tde_tdelibdir}/libkaboodlepart.so
-%{tde_tdeappdir}/kaboodle.desktop
-%{tde_datadir}/apps/kaboodle/
-%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png
-%{tde_datadir}/services/kaboodle_component.desktop
-%{tde_datadir}/services/kaboodleengine.desktop
-%{tde_tdedocdir}/HTML/en/kaboodle/
-
-##########
-
-%package -n trinity-kaudiocreator
-Summary: CD ripper and audio encoder frontend for Trinity
-Group: Productivity/Multimedia/CD/Grabbers
-
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: vorbis-tools
-Requires: flac
-
-%description -n trinity-kaudiocreator
-KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
-keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
-searches CDDB to retrieve the information of the disk.
-
-%files -n trinity-kaudiocreator
-%defattr(-,root,root,-)
-%{tde_bindir}/kaudiocreator
-%{tde_tdeappdir}/kaudiocreator.desktop
-%{tde_datadir}/apps/kaudiocreator/
-%{tde_datadir}/apps/tdeconf_update/kaudiocreator-libkcddb.upd
-%{tde_datadir}/apps/tdeconf_update/kaudiocreator-meta.upd
-%{tde_datadir}/apps/tdeconf_update/upgrade-kaudiocreator-metadata.sh
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
-%{tde_datadir}/config.kcfg/kaudiocreator.kcfg
-%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
-%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
-%{tde_tdedocdir}/HTML/en/kaudiocreator/
-
-##########
-
-%package kfile-plugins
-Summary: An au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group: Productivity/Multimedia/Sound/Utilities
-
-%description kfile-plugins
-au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdefile_au.la
-%{tde_tdelibdir}/tdefile_au.so
-%{tde_tdelibdir}/tdefile_avi.la
-%{tde_tdelibdir}/tdefile_avi.so
-%{tde_tdelibdir}/tdefile_flac.la
-%{tde_tdelibdir}/tdefile_flac.so
-%{tde_tdelibdir}/tdefile_m3u.la
-%{tde_tdelibdir}/tdefile_m3u.so
-%{tde_tdelibdir}/tdefile_mp3.la
-%{tde_tdelibdir}/tdefile_mp3.so
-%{tde_tdelibdir}/tdefile_mpc.la
-%{tde_tdelibdir}/tdefile_mpc.so
-%{tde_tdelibdir}/tdefile_mpeg.la
-%{tde_tdelibdir}/tdefile_mpeg.so
-%{tde_tdelibdir}/tdefile_ogg.la
-%{tde_tdelibdir}/tdefile_ogg.so
-%{tde_tdelibdir}/tdefile_sid.la
-%{tde_tdelibdir}/tdefile_sid.so
-%{tde_tdelibdir}/tdefile_theora.la
-%{tde_tdelibdir}/tdefile_theora.so
-%{tde_tdelibdir}/tdefile_wav.la
-%{tde_tdelibdir}/tdefile_wav.so
-%{tde_datadir}/services/tdefile_au.desktop
-%{tde_datadir}/services/tdefile_avi.desktop
-%{tde_datadir}/services/tdefile_flac.desktop
-%{tde_datadir}/services/tdefile_m3u.desktop
-%{tde_datadir}/services/tdefile_mp3.desktop
-%{tde_datadir}/services/tdefile_mpc.desktop
-%{tde_datadir}/services/tdefile_mpeg.desktop
-%{tde_datadir}/services/tdefile_ogg.desktop
-%{tde_datadir}/services/tdefile_sid.desktop
-%{tde_datadir}/services/tdefile_theora.desktop
-%{tde_datadir}/services/tdefile_wav.desktop
-
-##########
-
-%package kappfinder-data
-Summary: Multimedia data for kappfinder
-Group: Productivity/Multimedia/Sound/Utilities
-
-Requires: trinity-kappfinder >= %{tde_version}
-Requires: trinity-tdebase-runtime-data-common >= %{tde_version}
-
-%description kappfinder-data
-This package provides data on multimedia applications for kappfinder.
-
-%files kappfinder-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kappfinder/
-%{tde_datadir}/desktop-directories/tde-multimedia-music.directory
-%config %{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
-
-##########
-
-%package tdeio-plugins
-Summary: Enables the browsing of audio CDs under Konqueror
-Group: Productivity/Multimedia/Sound/Utilities
-Requires: trinity-tdebase-tdeio-plugins >= %{tde_version}
-
-Obsoletes: trinity-tdemultimedia-kio-plugins < %{version}-%{release}
-Provides: trinity-tdemultimedia-kio-plugins = %{version}-%{release}
-
-%description tdeio-plugins
-This package allow audio CDs to be browsed like a file system using
-Konqueror and the audiocd:/ URL.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_audiocd.la
-%{tde_tdelibdir}/kcm_audiocd.so
-%{tde_tdelibdir}/tdeio_audiocd.la
-%{tde_tdelibdir}/tdeio_audiocd.so
-%{tde_tdelibdir}/libaudiocd_encoder_flac.la
-%{tde_tdelibdir}/libaudiocd_encoder_flac.so
-%{tde_tdelibdir}/libaudiocd_encoder_lame.la
-%{tde_tdelibdir}/libaudiocd_encoder_lame.so
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so
-%{tde_tdelibdir}/libaudiocd_encoder_wav.la
-%{tde_tdelibdir}/libaudiocd_encoder_wav.so
-%{tde_libdir}/libaudiocdplugins.so.*
-%{tde_tdeappdir}/audiocd.desktop
-%{tde_datadir}/apps/tdeconf_update/audiocd.upd
-%{tde_datadir}/apps/tdeconf_update/upgrade-metadata.sh
-%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
-%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
-%{tde_datadir}/services/audiocd.protocol
-%{tde_tdedocdir}/HTML/en/tdeioslave/audiocd/
-%{tde_tdedocdir}/HTML/en/kcontrol/audiocd/
-%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png
-
-##########
-
-%package -n trinity-tdemid
-Summary: MIDI/karaoke player for Trinity
-Group: Productivity/Multimedia/Sound/Midi
-
-Obsoletes: trinity-kmid < %{version}-%{release}
-Provides: trinity-kmid = %{version}-%{release}
-
-%description -n trinity-tdemid
-This package provides a MIDI and karaoke player for TDE.
-
-%files -n trinity-tdemid
-%defattr(-,root,root,-)
-%{tde_bindir}/tdemid
-%{tde_tdelibdir}/libtdemidpart.la
-%{tde_tdelibdir}/libtdemidpart.so
-%{tde_libdir}/libtdemidlib.so.*
-%{tde_tdeappdir}/tdemid.desktop
-%{tde_datadir}/apps/tdemid/
-%{tde_datadir}/icons/hicolor/*/apps/tdemid.png
-%{tde_datadir}/mimelnk/audio/x-karaoke.desktop
-%{tde_datadir}/servicetypes/audiomidi.desktop
-%{tde_tdedocdir}/HTML/en/tdemid/
-
-##########
-
-%package -n trinity-kmix
-Summary: Sound mixer applet for Trinity
-Group: Productivity/Multimedia/Sound/Mixers
-Requires: trinity-kicker >= %{tde_version}
-
-%description -n trinity-kmix
-This package includes TDE's dockable sound mixer applet.
-
-%files -n trinity-kmix
-%defattr(-,root,root,-)
-%{tde_bindir}/kmix
-%{tde_bindir}/kmixctrl
-%{tde_tdelibdir}/kmix.la
-%{tde_tdelibdir}/kmix.so
-%{tde_tdelibdir}/kmix_panelapplet.la
-%{tde_tdelibdir}/kmix_panelapplet.so
-%{tde_tdelibdir}/kmixctrl.la
-%{tde_tdelibdir}/kmixctrl.so
-%{tde_libdir}/libtdeinit_kmix.so
-%{tde_libdir}/libtdeinit_kmixctrl.so
-%{tde_tdeappdir}/kmix.desktop
-%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
-%{tde_datadir}/apps/kmix/
-%{tde_datadir}/autostart/kmix.desktop
-%{tde_datadir}/autostart/restore_kmix_volumes.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kmix.png
-%{tde_datadir}/services/kmixctrl_restore.desktop
-%{tde_tdedocdir}/HTML/en/kmix/
-
-##########
-
-%package -n trinity-krec
-Summary: Sound recorder utility for Trinity
-Group: Productivity/Multimedia/CD/Record
-
-%description -n trinity-krec
-This is a sound recording utility for Trinity.
-
-%files -n trinity-krec
-%defattr(-,root,root,-)
-%{tde_bindir}/krec
-%{tde_tdelibdir}/kcm_krec.la
-%{tde_tdelibdir}/kcm_krec.so
-%{tde_tdelibdir}/kcm_krec_files.la
-%{tde_tdelibdir}/kcm_krec_files.so
-%{tde_tdelibdir}/krec.la
-%{tde_tdelibdir}/krec.so
-%if 0%{?with_lame}
-%{tde_tdelibdir}/libkrecexport_mp3.la
-%{tde_tdelibdir}/libkrecexport_mp3.so
-%{tde_datadir}/services/krec_exportmp3.desktop
-%endif
-%{tde_tdelibdir}/libkrecexport_ogg.la
-%{tde_tdelibdir}/libkrecexport_ogg.so
-%{tde_tdelibdir}/libkrecexport_wave.la
-%{tde_tdelibdir}/libkrecexport_wave.so
-%{tde_libdir}/libtdeinit_krec.so
-%{tde_tdeappdir}/krec.desktop
-%{tde_datadir}/apps/krec/
-%{tde_datadir}/icons/hicolor/*/apps/krec.png
-%{tde_datadir}/services/kcm_krec.desktop
-%{tde_datadir}/services/kcm_krec_files.desktop
-%{tde_datadir}/services/krec_exportogg.desktop
-%{tde_datadir}/services/krec_exportwave.desktop
-%{tde_datadir}/servicetypes/krec_exportitem.desktop
-%{tde_tdedocdir}/HTML/en/krec/
-
-##########
-
-%package -n trinity-kscd
-Summary: Audio CD player for Trinity
-Group: Productivity/Multimedia/CD/Players
-
-%description -n trinity-kscd
-This is Trinity's audio CD player.
-
-%files -n trinity-kscd
-%defattr(-,root,root,-)
-%{tde_bindir}/kscd
-%{tde_bindir}/workman2cddb.pl
-%{tde_tdeappdir}/kscd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
-%{tde_datadir}/apps/kscd/
-%{tde_datadir}/apps/profiles/kscd.profile.xml
-%{tde_datadir}/config.kcfg/kscd.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kscd.png
-%{tde_datadir}/mimelnk/text/xmcd.desktop
-%{tde_tdedocdir}/HTML/en/kscd/
-
-##########
-
-%if 0%{?with_akode}
-%package -n trinity-libarts-akode
-Summary: Akode plugin for aRts
-Group: Productivity/Multimedia/Other
-
-%description -n trinity-libarts-akode
-This package contains akode plugins for aRts.
-
-%files -n trinity-libarts-akode
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_akode.so.*
-%{tde_libdir}/libarts_akode.la
-%{tde_libdir}/mcop/akodearts.mcoptype
-%{tde_libdir}/mcop/akodearts.mcopclass
-%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass
-%{tde_libdir}/mcop/akodePlayObject.mcopclass
-%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
-
-# Requires MAD support
-%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
-
-%endif
-
-##########
-
-%package -n trinity-libarts-audiofile
-Summary: Audiofile plugin for aRts
-Group: Productivity/Multimedia/Other
-
-%description -n trinity-libarts-audiofile
-This package contains audiofile plugins for aRts.
-
-%files -n trinity-libarts-audiofile
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_audiofile.so.*
-%{tde_libdir}/libarts_audiofile.la
-%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcoptype
-
-##########
-
-%if 0%{?with_mpeg}
-%package -n trinity-libarts-mpeglib
-Summary: Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group: Productivity/Multimedia/Other
-
-%description -n trinity-libarts-mpeglib
-This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
-audio and video.
-
-This is the arts (TDE Sound daemon) plugin.
-
-%files -n trinity-libarts-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
-%{tde_libdir}/libarts_mpeglib.la
-%{tde_libdir}/libarts_splay.so.*
-%{tde_libdir}/libarts_splay.la
-%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-
-%endif
-
-##########
-
-%if 0%{?with_xine}
-%package -n trinity-libarts-xine
-Summary: ARTS plugin enabling xine support
-Group: Productivity/Multimedia/Other
-
-%description -n trinity-libarts-xine
-This package contains aRts' xine plugin, allowing the use of the xine
-multimedia engine though aRts.
-
-%files -n trinity-libarts-xine
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/videothumbnail.la
-%{tde_tdelibdir}/videothumbnail.so
-%{tde_libdir}/libarts_xine.so.*
-%{tde_libdir}/libarts_xine.la
-%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass
-%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass
-%{tde_datadir}/apps/videothumbnail/sprocket-large.png
-%{tde_datadir}/apps/videothumbnail/sprocket-medium.png
-%{tde_datadir}/apps/videothumbnail/sprocket-small.png
-%{tde_datadir}/services/videothumbnail.desktop
-
-%endif
-
-##########
-
-%package -n trinity-libkcddb
-Summary: CDDB library for Trinity
-Group: Productivity/Multimedia/Other
-Requires: trinity-kcontrol >= %{tde_version}
-
-%description -n trinity-libkcddb
-The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
-CD meta-information (track titles, artist information, etc.) from on-line
-databases, for TDE applications.
-
-%files -n trinity-libkcddb
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_cddb.la
-%{tde_tdelibdir}/kcm_cddb.so
-%{tde_libdir}/libkcddb.so.*
-%{tde_tdeappdir}/libkcddb.desktop
-%{tde_datadir}/apps/tdeconf_update/kcmcddb-emailsettings.upd
-%{tde_datadir}/config.kcfg/libkcddb.kcfg
-%{tde_tdedocdir}/HTML/en/kcontrol/cddb/
-
-##########
-
-%if 0%{?with_mpeg}
-
-%package -n trinity-mpeglib
-Summary: MP3 and MPEG-1 audio and video library
-Group: Productivity/Multimedia/Other
-%if 0%{?with_mpeg}
-Requires: trinity-libarts-mpeglib = %{version}-%{release}
-%endif
-
-%description -n trinity-mpeglib
-mpeglib is a MPEG-1 and MP3 audio and video library. It supports
-MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
-and WAV playback
-
-%files -n trinity-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/yaf-cdda
-%{tde_bindir}/yaf-mpgplay
-%{tde_bindir}/yaf-splay
-%{tde_bindir}/yaf-tplay
-%{tde_bindir}/yaf-vorbis
-%{tde_bindir}/yaf-yuv
-%{tde_libdir}/libmpeg-0.3.0.so
-%{tde_libdir}/libyafcore.so
-%{tde_libdir}/libyafxplayer.so
-
-%endif
-
-##########
-
-%package -n trinity-noatun
-Summary: Media player for Trinity
-Group: Productivity/Multimedia/Video/Players
-Requires: trinity-tdebase-bin >= %{tde_version}
-
-# 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides: devel(libnoatunarts)
-Provides: devel(libnoatunarts(64bit))
-%endif
-
-%description -n trinity-noatun
-Noatun is an aRts-based audio and video player for Trinity. It supports all
-formats supported by your installation of aRts (including aRts plugins).
-
-%files -n trinity-noatun
-%defattr(-,root,root,-)
-%{tde_bindir}/noatun
-%{tde_libdir}/tdeconf_update_bin/noatun20update
-%{tde_tdelibdir}/noatun.la
-%{tde_tdelibdir}/noatun.so
-%{tde_tdelibdir}/noatun_dcopiface.la
-%{tde_tdelibdir}/noatun_dcopiface.so
-%{tde_tdelibdir}/noatun_excellent.la
-%{tde_tdelibdir}/noatun_excellent.so
-%{tde_tdelibdir}/noatun_htmlexport.la
-%{tde_tdelibdir}/noatun_htmlexport.so
-%{tde_tdelibdir}/noatun_infrared.la
-%{tde_tdelibdir}/noatun_infrared.so
-%{tde_tdelibdir}/noatun_kaiman.la
-%{tde_tdelibdir}/noatun_kaiman.so
-%{tde_tdelibdir}/noatun_keyz.la
-%{tde_tdelibdir}/noatun_keyz.so
-%{tde_tdelibdir}/noatun_kjofol.la
-%{tde_tdelibdir}/noatun_kjofol.so
-%{tde_tdelibdir}/noatun_marquis.la
-%{tde_tdelibdir}/noatun_marquis.so
-%{tde_tdelibdir}/noatun_metatag.la
-%{tde_tdelibdir}/noatun_metatag.so
-%{tde_tdelibdir}/noatun_monoscope.la
-%{tde_tdelibdir}/noatun_monoscope.so
-%{tde_tdelibdir}/noatun_net.la
-%{tde_tdelibdir}/noatun_net.so
-%{tde_tdelibdir}/noatun_splitplaylist.la
-%{tde_tdelibdir}/noatun_splitplaylist.so
-%{tde_tdelibdir}/noatun_systray.la
-%{tde_tdelibdir}/noatun_systray.so
-%{tde_tdelibdir}/noatun_ui.la
-%{tde_tdelibdir}/noatun_ui.so
-%{tde_tdelibdir}/noatun_voiceprint.la
-%{tde_tdelibdir}/noatun_voiceprint.so
-%{tde_tdelibdir}/noatun_winskin.la
-%{tde_tdelibdir}/noatun_winskin.so
-%{tde_tdelibdir}/noatunsimple.la
-%{tde_tdelibdir}/noatunsimple.so
-%{tde_libdir}/libartseffects.la
-%{tde_libdir}/libartseffects.so
-%{tde_libdir}/libtdeinit_noatun.so
-%{tde_libdir}/libnoatun.so.*
-%{tde_libdir}/libnoatunarts.la
-%{tde_libdir}/libnoatunarts.so
-%{tde_libdir}/libnoatuncontrols.so.*
-%{tde_libdir}/libnoatuntags.so.*
-%{tde_libdir}/libwinskinvis.la
-%{tde_libdir}/libwinskinvis.so
-%{tde_libdir}/mcop/ExtraStereo.mcopclass
-%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
-%{tde_libdir}/mcop/Noatun/
-%{tde_libdir}/mcop/RawWriter.mcopclass
-%{tde_libdir}/mcop/VoiceRemoval.mcopclass
-%{tde_libdir}/mcop/artseffects.mcopclass
-%{tde_libdir}/mcop/artseffects.mcoptype
-%{tde_libdir}/mcop/noatunarts.mcopclass
-%{tde_libdir}/mcop/noatunarts.mcoptype
-%{tde_libdir}/mcop/winskinvis.mcopclass
-%{tde_libdir}/mcop/winskinvis.mcoptype
-%{tde_tdeappdir}/noatun.desktop
-%{tde_datadir}/apps/tdeconf_update/noatun.upd
-%{tde_datadir}/apps/noatun/
-%{tde_datadir}/icons/hicolor/*/apps/noatun.png
-%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
-%{tde_tdedocdir}/HTML/en/noatun/
-
-##########
-
-%package devel
-Summary: Development files for %{name}, aRts and noatun plugins
-Group: Development/Libraries/Other
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-tdelibs-devel >= %{tde_version}
-
-Obsoletes: trinity-kdemultimedia-devel < %{version}-%{release}
-Provides: trinity-kdemultimedia-devel = %{version}-%{release}
-
-%description devel
-{summary}.
-
-Install %{name}-devel if you wish to develop or compile any
-applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
-noatun plugins.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%if 0%{?with_akode}
-%{tde_libdir}/libarts_akode.so
-%endif
-%{tde_libdir}/libarts_audiofile.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libarts_mpeglib.so
-%{tde_libdir}/libarts_splay.so
-%endif
-%if 0%{?with_xine}
-%{tde_libdir}/libarts_xine.so
-%endif
-%{tde_libdir}/libartsbuilder.so
-%{tde_libdir}/libartscontrolapplet.so
-%{tde_libdir}/libartscontrolsupport.so
-%{tde_libdir}/libartsgui.so
-%{tde_libdir}/libartsgui_idl.so
-%{tde_libdir}/libartsgui_kde.so
-%{tde_libdir}/libartsmidi.so
-%{tde_libdir}/libartsmidi_idl.so
-%{tde_libdir}/libartsmodules.so
-%{tde_libdir}/libartsmodulescommon.so
-%{tde_libdir}/libartsmoduleseffects.so
-%{tde_libdir}/libartsmodulesmixers.so
-%{tde_libdir}/libartsmodulessynth.so
-%{tde_libdir}/libaudiocdplugins.la
-%{tde_libdir}/libaudiocdplugins.so
-%{tde_libdir}/libkcddb.la
-%{tde_libdir}/libkcddb.so
-%{tde_libdir}/libtdeinit_kmix.la
-%{tde_libdir}/libtdeinit_kmixctrl.la
-%{tde_libdir}/libtdeinit_krec.la
-%{tde_libdir}/libtdeinit_noatun.la
-%{tde_libdir}/libtdemidlib.la
-%{tde_libdir}/libtdemidlib.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libmpeg.la
-%{tde_libdir}/libmpeg.so
-%endif
-%{tde_libdir}/libnoatun.la
-%{tde_libdir}/libnoatun.so
-%{tde_libdir}/libnoatuncontrols.la
-%{tde_libdir}/libnoatuncontrols.so
-%{tde_libdir}/libnoatuntags.la
-%{tde_libdir}/libnoatuntags.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libyafcore.la
-%{tde_libdir}/libyafxplayer.la
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{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"
-
-# Update icons for some control center modules
-%__sed -i "tdeioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
- --datadir=%{tde_datadir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
- \
- --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
- \
- --with-vorbis \
- --without-ossaudio \
- --with-alsa \
- --with-cdparanoia \
- %{?with_lame:--with-lame} %{!?with_lame:--without-lame} \
- %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \
- %{?with_akode:--with-akode} %{!?with_akode:--without-akode} \
- --with-audiofile \
- %{?with_musicbrainz:--with-musicbrainz} %{!?with_musicbrainz:--without-musicbrainz} \
- --with-gstreamer \
- --with-kscd-cdda \
- --with-theora \
- --with-flac \
- %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
-
-# Fix unexplained "undefined reference to `__stack_chk_fail'"
-%if 0%{?mgaversion} >= 4 || 0%{?pclinuxos}
-%__sed -i "noatun/app/Makefile" -e "/^libtdeinit_noatun_la_LDFLAGS/ s/$/ -Wl,-lc/"
-%endif
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Disable MPEG support entirely
-%if 0%{?with_mpeg} == 0
-%__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
-%__rm %{?buildroot}%{tde_bindir}/yaf-*
-%__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
-%__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
-%__rm %{?buildroot}%{tde_libdir}/libmpeg*
-%__rm %{?buildroot}%{tde_libdir}/libyaf*
-%__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-%endif
-
-# Copy missing icons from 'crystalsvg' theme (tdelibs)
-%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/"
-pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/
-for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/media-optical-cdaudio.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done
-popd
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file krec AudioVideo Recorder
-%suse_update_desktop_file tdemid AudioVideo Midi
-%suse_update_desktop_file artsbuilder AudioVideo AudioVideoEditing
-%suse_update_desktop_file artscontrol AudioVideo AudioVideoEditing
-%suse_update_desktop_file kmix AudioVideo Mixer
-%suse_update_desktop_file kaboodle AudioVideo Player
-%suse_update_desktop_file kaudiocreator AudioVideo CD
-%suse_update_desktop_file kscd AudioVideo Player CD
-%suse_update_desktop_file noatun AudioVideo Player Video
-%suse_update_desktop_file juk AudioVideo Player Jukebox
-%suse_update_desktop_file audiocd
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
deleted file mode 120000
index 90fb9141a..000000000
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
+++ /dev/null
@@ -1 +0,0 @@
-tdemultimedia-14.0.0-cmake.spec \ No newline at end of file
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia.spec
index 086f7ec9f..263ada4e8 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdemultimedia
%define tde_prefix /opt/trinity
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 28717c158..94345b490 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -26,7 +26,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdenetwork
%define tde_prefix /opt/trinity
@@ -46,11 +46,8 @@
# Avoids relinking, which breaks consolehelper
%define dont_relink 1
-%if "%{?tde_version}" == "14.0.4"
-%define with_aim 1
-%else
+# Disable AIM support
%define with_aim 0
-%endif
Name: trinity-%{tde_pkg}
Summary: Trinity Desktop Environment - Network Applications
@@ -184,7 +181,7 @@ BuildRequires: libiw-devel
%endif
# OpenSLP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_openslp 1
BuildRequires: openslp-devel
%endif
@@ -229,7 +226,7 @@ Requires: jasper
BuildRequires: libacl-devel
# MEANWHILE support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version}
%define with_meanwhile 1
BuildRequires: meanwhile-devel
%endif
@@ -915,7 +912,9 @@ and shouldn't be run on a multi-user machine.
%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
%{tde_datadir}/sounds/ktalkd.wav
+%if 0%{?fedora} == 0 || 0%{?fedora} <= 30
%dir %{_sysconfdir}/xinetd.d
+%endif
%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
%{tde_tdedocdir}/HTML/en/ktalkd
diff --git a/redhat/main/tdepim/tdepim-14.0.0.patch b/redhat/main/tdepim/tdepim-14.0.0.patch
deleted file mode 100644
index 0770a8af9..000000000
--- a/redhat/main/tdepim/tdepim-14.0.0.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
-index aa01c96..d27f041 100644
---- a/kmail/kmkernel.cpp
-+++ b/kmail/kmkernel.cpp
-@@ -170,17 +170,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
- connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)",
- "selectFolder(TQString)", false );
-
-- mNetworkManager = TDEGlobal::networkManager();
-- if (mNetworkManager) {
-- connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ),
-- this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) );
-- if (networkStateConnected()) {
-- resumeNetworkJobs();
-- }
-- else {
-- stopNetworkJobs();
-- }
-- }
-+ // Assume connected
-+ resumeNetworkJobs();
- }
-
- KMKernel::~KMKernel ()
-@@ -2470,34 +2461,8 @@ int KMKernel::timeOfLastMessageCountChange() const
-
- bool KMKernel::networkStateConnected()
- {
-- if (mNetworkManager) {
-- TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags networkStatus = mNetworkManager->backendStatus();
-- if ((networkStatus & TDENetworkGlobalManagerFlags::Connected)
-- || (networkStatus & TDENetworkGlobalManagerFlags::BackendUnavailable)
-- || (networkStatus == TDENetworkGlobalManagerFlags::Unknown)
-- ){
-- // Connected or no backend available
-- return true;
-- }
-- else {
-- // Not connected
-- return false;
-- }
-- }
-- else {
-- // Assume connected
-- return true;
-- }
--}
--
--void KMKernel::slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)
--{
-- if (networkStateConnected()) {
-- resumeNetworkJobs();
-- }
-- else {
-- stopNetworkJobs();
-- }
-+ // Assume connected
-+ return true;
- }
-
- Wallet *KMKernel::wallet() {
-diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
-index 0dc4644..37a3eec 100644
---- a/kmail/kmkernel.h
-+++ b/kmail/kmkernel.h
-@@ -14,8 +14,6 @@
- #include <tdeimproxy.h>
- #include <tdepimmacros.h>
-
--#include <tdenetworkconnections.h>
--
- #include "kmailIface.h"
- #include "kmmsgbase.h"
- #include "globalsettings.h"
-@@ -436,7 +434,6 @@ public slots:
- protected slots:
- void slotDataReq(TDEIO::Job*,TQByteArray&);
- void slotResult(TDEIO::Job*);
-- void slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString);
-
- signals:
- void configChanged();
-@@ -527,7 +524,6 @@ private:
- TQString mAddMessageLastFolder;
- KMFolder *mAddMsgCurrentFolder;
-
-- TDEGlobalNetworkManager *mNetworkManager;
- };
-
- #endif
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec
index c5341e7c5..5a22f1ed3 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/main/tdepim/tdepim.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdepim
%define tde_prefix /opt/trinity
diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk.spec
index dac97e526..91ba8f601 100644
--- a/redhat/main/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/main/tdesdk/tdesdk.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdesdk
%define tde_prefix /opt/trinity
@@ -98,7 +98,12 @@ BuildRequires: pcre-devel
# for kbugbuster/libkcal
BuildRequires: desktop-file-utils
+# DB5 support
+%if 0%{?rhel} >= 8
+BuildRequires: libdb-devel
+
# DB4 support
+%else
%if 0%{?mgaversion} || 0%{?mdkversion}
#BuildRequires: %{_lib}db4.8-devel
%endif
@@ -108,6 +113,7 @@ BuildRequires: db4-devel
%if 0%{?suse_version}
BuildRequires: libdb-4_8-devel
%endif
+%endif
# kbabel, F-7+: flex >= 2.5.33-9
BuildRequires: flex
@@ -126,6 +132,13 @@ BuildRequires: perl-podlators
# OPENSSL support
BuildRequires: openssl-devel
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+%define python python3
+%else
+%define python python
+%endif
+
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
BuildRequires: %{_lib}binutils-devel
@@ -454,7 +467,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%package -n trinity-tdecachegrind-converters
Summary: Format converters for tdecachegrind profiling visualisation tool
Group: Development/Languages/Other
-Requires: python
+Requires: %{python}
%if 0%{?suse_version} || 0%{?rhel} == 4
Requires: php
%else
@@ -543,7 +556,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%package scripts
Summary: a set of useful development scripts for Trinity
Group: Development/Languages/Other
-Requires: python
+Requires: %{python}
%description scripts
This package contains a number of scripts which can be used to help in
@@ -1007,13 +1020,13 @@ This package contains the development files for tdesdk.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
# Fix shebangs
sed -i "scripts/kdelnk2desktop.py" \
"scripts/zonetab2pot.py" \
"tdecachegrind/converters/hotshot2calltree" \
"umbrello/umbrello/headings/heading.py" \
- -e "s|env python|env python3|"
+ -e "s|env python|env %{python}|"
%endif
diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec
index dcc317623..8f58aac06 100644
--- a/redhat/main/tdetoys/tdetoys.spec
+++ b/redhat/main/tdetoys/tdetoys.spec
@@ -21,7 +21,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdetoys
%define tde_prefix /opt/trinity
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index 2eafa51b3..693adb10d 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -21,7 +21,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdeutils
%define tde_prefix /opt/trinity
diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop.spec
index e958532c8..cf2ad252e 100644
--- a/redhat/main/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/main/tdevelop/tdevelop.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdevelop
%define tde_prefix /opt/trinity
@@ -108,10 +108,16 @@ BuildRequires: gamin-devel
# PCRE support
BuildRequires: pcre-devel
+# DB5 support
+%if 0%{?rhel} >= 8
+BuildRequires: libdb-devel
+
+%else
# DB4 support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: db4-devel
%endif
+%endif
# FLEX support
BuildRequires: flex
diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev.spec
index 4ddcde0b9..b48ab894d 100644
--- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/main/tdewebdev/tdewebdev.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tdewebdev
%define tde_prefix /opt/trinity