summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
commita615d19df88eb2e989316b480519161945dbc7dc (patch)
tree369970b98042998b86c11024598155e037b76fec /redhat/main
parent76a93e0011ade1583a1ec672f33411dfd35454f3 (diff)
downloadtde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz
tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tde-i18n/tde-i18n-14.0.0.spec1775
-rw-r--r--redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec1851
-rw-r--r--redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec122
-rw-r--r--redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec204
-rw-r--r--redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc2
-rw-r--r--redhat/main/tdeaddons/tdeaddons-14.0.0.spec82
-rw-r--r--redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec15
-rw-r--r--redhat/main/tdeadmin/tdeadmin-14.0.0.spec113
-rw-r--r--redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec151
-rw-r--r--redhat/main/tdeartwork/tdeartwork-14.0.0.spec355
-rw-r--r--redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec12
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc215
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc225
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc235
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc245
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc255
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc265
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc275
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.fc285
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga55
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.mga65
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.pclos20155
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.pclos20165
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.pclos20175
-rw-r--r--redhat/main/tdebase/pamd.kcheckpass-trinity.pclos20185
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2116
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2216
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2316
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2416
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2516
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2616
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2716
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.fc2816
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.mga511
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.mga611
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.pclos20157
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.pclos20167
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.pclos20177
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity-np.pclos20187
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2119
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2221
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2321
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2423
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2523
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2623
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2723
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.fc2823
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.mga515
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.mga615
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.pclos20158
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.pclos20168
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.pclos20178
-rw-r--r--redhat/main/tdebase/pamd.kdm-trinity.pclos20188
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc215
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc225
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc235
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc245
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc255
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc265
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc275
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.fc285
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga55
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.mga65
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.pclos20155
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.pclos20165
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.pclos20175
-rw-r--r--redhat/main/tdebase/pamd.kscreensaver-trinity.pclos20185
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec802
-rw-r--r--redhat/main/tdebase/tdebase-3.5.13.2.spec354
-rw-r--r--redhat/main/tdebase/tdm.fc19.te11
-rw-r--r--redhat/main/tdebase/tdm.fc21.ppbin0 -> 932 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc21.te11
-rw-r--r--redhat/main/tdebase/tdm.fc22.ppbin0 -> 932 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc22.te11
-rw-r--r--redhat/main/tdebase/tdm.fc23.ppbin0 -> 932 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc24.ppbin0 -> 932 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc25.ppbin0 -> 932 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc26.ppbin0 -> 932 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc27.ppbin0 -> 932 bytes
-rw-r--r--redhat/main/tdebase/tdm.fc28.ppbin0 -> 932 bytes
-rw-r--r--redhat/main/tdebase/tdm.service.fc2112
-rw-r--r--redhat/main/tdebase/tdm.service.fc2212
-rw-r--r--redhat/main/tdebase/tdm.service.fc2312
-rw-r--r--redhat/main/tdebase/tdm.service.fc2412
-rw-r--r--redhat/main/tdebase/tdm.service.fc2512
-rw-r--r--redhat/main/tdebase/tdm.service.fc2612
-rw-r--r--redhat/main/tdebase/tdm.service.fc2712
-rw-r--r--redhat/main/tdebase/tdm.service.fc2812
-rw-r--r--redhat/main/tdebase/trinity-tdebase-rpmlintrc2
-rw-r--r--redhat/main/tdebindings/tdebindings-14.0.0.spec216
-rw-r--r--redhat/main/tdebindings/tdebindings-3.5.13.2.spec163
-rw-r--r--redhat/main/tdebindings/trinity-tdebindings-rpmlintrc2
-rw-r--r--redhat/main/tdeedu/tdeedu-14.0.0.spec395
-rw-r--r--redhat/main/tdeedu/tdeedu-3.5.13.2.spec14
-rw-r--r--redhat/main/tdeedu/trinity-tdeedu-rpmlintrc2
-rw-r--r--redhat/main/tdegames/tdegames-14.0.0.spec580
-rw-r--r--redhat/main/tdegames/tdegames-3.5.13.2.spec222
-rw-r--r--redhat/main/tdegames/trinity-tdegames-rpmlintrc2
-rw-r--r--redhat/main/tdegraphics/tdegraphics-14.0.0.spec340
-rw-r--r--redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec15
-rw-r--r--redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc2
-rw-r--r--redhat/main/tdelibs/tdelibs-14.0.0.spec138
-rw-r--r--redhat/main/tdelibs/tdelibs-14.0.1.patch31
-rw-r--r--redhat/main/tdelibs/tdelibs-14.1.0.patch13
-rw-r--r--redhat/main/tdelibs/tdelibs-3.5.13.2.spec77
-rw-r--r--redhat/main/tdelibs/trinity-tdelibs-rpmlintrc1
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec1145
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec1158
l---------[-rw-r--r--]redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec1322
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec148
-rw-r--r--redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc2
-rw-r--r--redhat/main/tdenetwork/tdenetwork-14.0.0.spec257
-rw-r--r--redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec325
-rw-r--r--redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc2
-rw-r--r--redhat/main/tdepim/tdepim-14.0.0.patch90
-rw-r--r--redhat/main/tdepim/tdepim-14.0.0.spec564
-rw-r--r--redhat/main/tdepim/tdepim-3.5.13.2.spec227
-rw-r--r--redhat/main/tdepim/trinity-tdepim-rpmlintrc2
-rw-r--r--redhat/main/tdesdk/tdesdk-14.0.0.spec178
-rw-r--r--redhat/main/tdesdk/tdesdk-3.5.13.2.spec282
-rw-r--r--redhat/main/tdesdk/trinity-tdesdk-rpmlintrc2
-rw-r--r--redhat/main/tdetoys/tdetoys-14.0.0.spec88
-rw-r--r--redhat/main/tdetoys/tdetoys-3.5.13.2.spec13
-rw-r--r--redhat/main/tdeutils/tdeutils-14.0.0.spec475
-rw-r--r--redhat/main/tdeutils/tdeutils-3.5.13.2.spec15
-rw-r--r--redhat/main/tdeutils/trinity-tdeutils-rpmlintrc2
-rw-r--r--redhat/main/tdevelop/tdevelop-14.0.0.spec70
-rw-r--r--redhat/main/tdevelop/tdevelop-3.5.13.2.spec263
-rw-r--r--redhat/main/tdevelop/trinity-tdevelop-rpmlintrc2
-rw-r--r--redhat/main/tdewebdev/tdewebdev-14.0.0.spec190
-rw-r--r--redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec14
-rw-r--r--redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc2
132 files changed, 7949 insertions, 7627 deletions
diff --git a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec b/redhat/main/tde-i18n/tde-i18n-14.0.0.spec
index 47129a3c7..bad847a91 100644
--- a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/main/tde-i18n/tde-i18n-14.0.0.spec
@@ -1,43 +1,62 @@
-# Default version for this component
-%define tde_pkg tde-i18n
+#
+# spec file for package tde-i18n (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
%endif
-
-# TDE specific building variables
-BuildRequires: autoconf automake libtool m4
+%define tde_pkg tde-i18n
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
-
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
# Builds all supported languages (not unsupported ones)
%if "%{?TDE_LANGS}" == ""
-%define TDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW
+%define TDE_LANGS af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW
%endif
Name: trinity-%{tde_pkg}
-Summary: Internationalization support for Trinity
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: Internationalization support for Trinity
+Group: User Interface/Desktops
URL: http://www.trinitydesktop.org/
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-License: GFDL
-Group: User Interface/Desktops
BuildArch: noarch
# Speed build options
@@ -47,636 +66,1353 @@ AutoReq: no
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: findutils
BuildRequires: gettext
+BuildRequires: cmake
+BuildRequires: gcc-c++
%description
-%{summary}.
+This package contains %{summary}.
+
+##########
%package Afrikaans
Summary: Afrikaans(af) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-af = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Afrikaans < %{version}-%{release}
-Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release}
+Provides: %{name}-af = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Afrikaans < %{version}-%{release}
+Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release}
+
%description Afrikaans
-%{summary}.
+This package contains %{summary}.
+
+%files Afrikaans
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/af/
+
+##########
%package Arabic
Summary: Arabic(ar) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ar = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides: trinity-kde-i18n-Arabic = %{version}-%{release}
+Provides: %{name}-ar = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release}
+Provides: trinity-kde-i18n-Arabic = %{version}-%{release}
+
%description Arabic
-%{summary}.
+This package contains %{summary}.
+
+%files Arabic
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ar/
+
+##########
%package Azerbaijani
Summary: Azerbaijani(az) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-az = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides: trinity-kde-i18n-Arabic = %{version}-%{release}
+Provides: %{name}-az = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release}
+Provides: trinity-kde-i18n-Arabic = %{version}-%{release}
+
%description Azerbaijani
-%{summary}.
+This package contains %{summary}.
+
+%files Azerbaijani
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/az/
+
+##########
%package Belarusian
Summary: Belarusian(be) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-be = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Belarusian < %{version}-%{release}
-Provides: trinity-kde-i18n-Belarusian = %{version}-%{release}
+Provides: %{name}-be = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Belarusian < %{version}-%{release}
+Provides: trinity-kde-i18n-Belarusian = %{version}-%{release}
+
%description Belarusian
-%{summary}.
+This package contains %{summary}.
+
+%files Belarusian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/be/
+
+##########
%package Bulgarian
Summary: Bulgarian(bg) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Bulgarian < %{version}-%{release}
-Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release}
+Provides: %{name}-bg = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Bulgarian < %{version}-%{release}
+Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release}
+
%description Bulgarian
-%{summary}.
+This package contains %{summary}.
+
+%files Bulgarian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bg/
+
+##########
%package Bengali
Summary: Bengali(bn) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Bengali < %{version}-%{release}
-Provides: trinity-kde-i18n-Bengali = %{version}-%{release}
+Provides: %{name}-bn = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Bengali < %{version}-%{release}
+Provides: trinity-kde-i18n-Bengali = %{version}-%{release}
+
%description Bengali
-%{summary}.
+This package contains %{summary}.
+
+%files Bengali
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bn/
+
+##########
%package Tibetan
Summary: Tibetan(bo) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Tibetan < %{version}-%{release}
-Provides: trinity-kde-i18n-Tibetan = %{version}-%{release}
+Provides: %{name}-bo = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Tibetan < %{version}-%{release}
+Provides: trinity-kde-i18n-Tibetan = %{version}-%{release}
+
%description Tibetan
-%{summary}.
+This package contains %{summary}.
+
+#%files Tibetan
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/bo/
+
+##########
%package Breton
Summary: Breton(br) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Breton < %{version}-%{release}
-Provides: trinity-kde-i18n-Breton = %{version}-%{release}
+Provides: %{name}-br = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Breton < %{version}-%{release}
+Provides: trinity-kde-i18n-Breton = %{version}-%{release}
+
%description Breton
-%{summary}.
+This package contains %{summary}.
+
+%files Breton
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/br/
+
+##########
%package Bosnian
Summary: Bosnian(bs) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Bosnian < %{version}-%{release}
-Provides: trinity-kde-i18n-Bosnian = %{version}-%{release}
+Provides: %{name}-bs = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Bosnian < %{version}-%{release}
+Provides: trinity-kde-i18n-Bosnian = %{version}-%{release}
+
%description Bosnian
-%{summary}.
+This package contains %{summary}.
+
+%files Bosnian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bs/
+
+##########
%package Catalan
Summary: Catalan(ca) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Catalan < %{version}-%{release}
-Provides: trinity-kde-i18n-Catalan = %{version}-%{release}
+Provides: %{name}-ca = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Catalan < %{version}-%{release}
+Provides: trinity-kde-i18n-Catalan = %{version}-%{release}
+
%description Catalan
-%{summary}.
+This package contains %{summary}.
+
+%files Catalan
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ca/
+%{tde_tdedocdir}/HTML/ca/
+
+##########
%package Czech
Summary: Czech(cs) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Czech < %{version}-%{release}
-Provides: trinity-kde-i18n-Czech = %{version}-%{release}
+Provides: %{name}-cs = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Czech < %{version}-%{release}
+Provides: trinity-kde-i18n-Czech = %{version}-%{release}
+
%description Czech
-%{summary}.
+This package contains %{summary}.
+
+%files Czech
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/cs/
+%{tde_tdedocdir}/HTML/cs/
+
+##########
+
+%package Kashubian
+Summary: Kashubian(csb) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-csb = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Kashubian < %{version}-%{release}
+Provides: trinity-kde-i18n-Kashubian = %{version}-%{release}
+
+%description Kashubian
+This package contains %{summary}.
+
+%files Kashubian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/csb/
+
+##########
%package Cymraeg
Summary: Cymraeg language support for TDE
Group: User Interface/Desktops
-Obsoletes: trinity-kde-i18n-Cymraeg < %{version}-%{release}
-Provides: trinity-kde-i18n-Cymraeg = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Cymraeg < %{version}-%{release}
+Provides: trinity-kde-i18n-Cymraeg = %{version}-%{release}
+
%description Cymraeg
-%{summary}.
+This package contains %{summary}.
+
+##########
%package Welsh
Summary: Welsh(cy) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Welsh < %{version}-%{release}
-Provides: trinity-kde-i18n-Welsh = %{version}-%{release}
+Provides: %{name}-cy = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Welsh < %{version}-%{release}
+Provides: trinity-kde-i18n-Welsh = %{version}-%{release}
+
%description Welsh
-%{summary}.
+This package contains %{summary}.
+
+%files Welsh
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/cy/
+
+##########
%package Danish
Summary: Danish(da) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Danish < %{version}-%{release}
-Provides: trinity-kde-i18n-Danish = %{version}-%{release}
+Provides: %{name}-da = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Danish < %{version}-%{release}
+Provides: trinity-kde-i18n-Danish = %{version}-%{release}
+
%description Danish
-%{summary}.
+This package contains %{summary}.
+
+%files Danish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/da/
+%{tde_tdedocdir}/HTML/da/
+
+##########
%package German
Summary: German(de) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-German < %{version}-%{release}
-Provides: trinity-kde-i18n-German = %{version}-%{release}
+Provides: %{name}-de = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-German < %{version}-%{release}
+Provides: trinity-kde-i18n-German = %{version}-%{release}
+
%description German
-%{summary}.
+This package contains %{summary}.
+
+%files German
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/de/
+%{tde_tdedocdir}/HTML/de/
+
+##########
%package Greek
Summary: Greek(el) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Greek < %{version}-%{release}
-Provides: trinity-kde-i18n-Greek = %{version}-%{release}
+Provides: %{name}-el = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Greek < %{version}-%{release}
+Provides: trinity-kde-i18n-Greek = %{version}-%{release}
+
%description Greek
-%{summary}.
+This package contains %{summary}.
+
+%files Greek
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/el/
+
+##########
%package British
Summary: British(en_GB) English support for TDE
Group: User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-British < %{version}-%{release}
-Provides: trinity-kde-i18n-British = %{version}-%{release}
+Provides: %{name}-en_GB = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-British < %{version}-%{release}
+Provides: trinity-kde-i18n-British = %{version}-%{release}
+
%description British
-%{summary}.
+This package contains %{summary}.
+
+%files British
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/en_GB/
+%{tde_tdedocdir}/HTML/en_GB/
+
+##########
%package Esperanto
Summary: Esperanto(eo) support for TDE
Group: User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Esperanto < %{version}-%{release}
-Provides: trinity-kde-i18n-Esperanto = %{version}-%{release}
+Provides: %{name}-eo = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Esperanto < %{version}-%{release}
+Provides: trinity-kde-i18n-Esperanto = %{version}-%{release}
+
%description Esperanto
-%{summary}.
+This package contains %{summary}.
+
+%files Esperanto
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/eo/
+
+##########
%package Spanish
Summary: Spanish(es) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Spanish < %{version}-%{release}
-Provides: trinity-kde-i18n-Spanish = %{version}-%{release}
+Provides: %{name}-es = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Spanish < %{version}-%{release}
+Provides: trinity-kde-i18n-Spanish = %{version}-%{release}
+
%description Spanish
-%{summary}.
+This package contains %{summary}.
+
+%files Spanish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/es/
+%{tde_tdedocdir}/HTML/es/
+
+##########
%package Estonian
Summary: Estonian(et) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Estonian < %{version}-%{release}
-Provides: trinity-kde-i18n-Estonian = %{version}-%{release}
+Provides: %{name}-et = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Estonian < %{version}-%{release}
+Provides: trinity-kde-i18n-Estonian = %{version}-%{release}
+
%description Estonian
-%{summary}.
+This package contains %{summary}.
+
+%files Estonian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/et/
+%{tde_tdedocdir}/HTML/et/
+
+##########
%package Basque
Summary: Basque(eu) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Basque < %{version}-%{release}
-Provides: trinity-kde-i18n-Basque = %{version}-%{release}
+Provides: %{name}-eu = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Basque < %{version}-%{release}
+Provides: trinity-kde-i18n-Basque = %{version}-%{release}
+
%description Basque
-%{summary}.
+This package contains %{summary}.
+
+%files Basque
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/eu/
+%{tde_tdedocdir}/HTML/eu/
+
+##########
%package Farsi
Summary: Farsi(fa) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fa = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Farsi < %{version}-%{release}
-Provides: trinity-kde-i18n-Farsi = %{version}-%{release}
+Provides: %{name}-fa = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Farsi < %{version}-%{release}
+Provides: trinity-kde-i18n-Farsi = %{version}-%{release}
+
%description Farsi
-%{summary}.
+This package contains %{summary}.
+
+%files Farsi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fa/
+
+##########
%package Finnish
Summary: Finnish(fi) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Finnish < %{version}-%{release}
-Provides: trinity-kde-i18n-Finnish = %{version}-%{release}
+Provides: %{name}-fi = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Finnish < %{version}-%{release}
+Provides: trinity-kde-i18n-Finnish = %{version}-%{release}
+
%description Finnish
-%{summary}.
+This package contains %{summary}.
+
+%files Finnish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fi/
+%{tde_tdedocdir}/HTML/fi/
+
+##########
%package Faroese
Summary: Faroese(fo) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Faroese < %{version}-%{release}
-Provides: trinity-kde-i18n-Faroese = %{version}-%{release}
+Provides: %{name}-fo = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Faroese < %{version}-%{release}
+Provides: trinity-kde-i18n-Faroese = %{version}-%{release}
+
%description Faroese
-%{summary}.
+This package contains %{summary}.
+
+#%files Faroese
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/fo/
+
+##########
%package French
Summary: French(fr) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-French < %{version}-%{release}
-Provides: trinity-kde-i18n-French = %{version}-%{release}
+Provides: %{name}-fr = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-French < %{version}-%{release}
+Provides: trinity-kde-i18n-French = %{version}-%{release}
+
%description French
-%{summary}.
+This package contains %{summary}.
+
+%files French
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fr/
+%{tde_tdedocdir}/HTML/fr/
+
+##########
%package Frisian
Summary: Frisian(fy) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Frisian < %{version}-%{release}
-Provides: trinity-kde-i18n-Frisian = %{version}-%{release}
+Provides: %{name}-fy = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Frisian < %{version}-%{release}
+Provides: trinity-kde-i18n-Frisian = %{version}-%{release}
+
%description Frisian
-%{summary}.
+This package contains %{summary}.
+
+%files Frisian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fy/
+
+##########
%package Irish
Summary: Irish(ga) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ga = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Irish < %{version}-%{release}
-Provides: trinity-kde-i18n-Irish = %{version}-%{release}
+Provides: %{name}-ga = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Irish < %{version}-%{release}
+Provides: trinity-kde-i18n-Irish = %{version}-%{release}
+
%description Irish
-%{summary}.
+This package contains %{summary}.
+
+%files Irish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ga/
+
+##########
%package Galician
Summary: Galician(gl) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Galician < %{version}-%{release}
-Provides: trinity-kde-i18n-Galician = %{version}-%{release}
+Provides: %{name}-gl = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Galician < %{version}-%{release}
+Provides: trinity-kde-i18n-Galician = %{version}-%{release}
+
%description Galician
-%{summary}.
+This package contains %{summary}.
+
+%files Galician
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/gl/
+
+##########
%package Hebrew
Summary: Hebrew(he) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Hebrew < %{version}-%{release}
-Provides: trinity-kde-i18n-Hebrew = %{version}-%{release}
+Provides: %{name}-he = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Hebrew < %{version}-%{release}
+Provides: trinity-kde-i18n-Hebrew = %{version}-%{release}
+
%description Hebrew
-%{summary}.
+This package contains %{summary}.
+
+%files Hebrew
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/he/
+%{tde_tdedocdir}/HTML/he/
+
+##########
%package Hindi
Summary: Hindi(hi) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Hindi < %{version}-%{release}
-Provides: trinity-kde-i18n-Hindi = %{version}-%{release}
+Provides: %{name}-hi = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Hindi < %{version}-%{release}
+Provides: trinity-kde-i18n-Hindi = %{version}-%{release}
+
%description Hindi
-%{summary}.
+This package contains %{summary}.
+
+%files Hindi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hi/
+
+##########
%package Croatian
Summary: Croatian(hr) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Croatian < %{version}-%{release}
-Provides: trinity-kde-i18n-Croatian = %{version}-%{release}
+Provides: %{name}-hr = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Croatian < %{version}-%{release}
+Provides: trinity-kde-i18n-Croatian = %{version}-%{release}
+
%description Croatian
-%{summary}.
+This package contains %{summary}.
+
+%files Croatian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hr/
+%{tde_tdedocdir}/HTML/hr/
+
+##########
%package Hungarian
Summary: Hungarian(hu) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Hungarian < %{version}-%{release}
-Provides: trinity-kde-i18n-Hungarian = %{version}-%{release}
+Provides: %{name}-hu = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Hungarian < %{version}-%{release}
+Provides: trinity-kde-i18n-Hungarian = %{version}-%{release}
+
%description Hungarian
-%{summary}.
+This package contains %{summary}.
+
+%files Hungarian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hu/
+%{tde_tdedocdir}/HTML/hu/
+
+##########
%package Indonesian
Summary: Indonesian(id) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Indonesian < %{version}-%{release}
-Provides: trinity-kde-i18n-Indonesian = %{version}-%{release}
+Provides: %{name}-id = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Indonesian < %{version}-%{release}
+Provides: trinity-kde-i18n-Indonesian = %{version}-%{release}
+
%description Indonesian
-%{summary}.
+This package contains %{summary}.
+
+#%files Indonesian
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/id/
+
+##########
%package Icelandic
Summary: Icelandic(is) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Icelandic < %{version}-%{release}
-Provides: trinity-kde-i18n-Icelandic = %{version}-%{release}
+Provides: %{name}-is = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Icelandic < %{version}-%{release}
+Provides: trinity-kde-i18n-Icelandic = %{version}-%{release}
+
%description Icelandic
-%{summary}.
+This package contains %{summary}.
+
+%files Icelandic
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/is/
+
+##########
%package Italian
Summary: Italian(it) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Italian < %{version}-%{release}
-Provides: trinity-kde-i18n-Italian = %{version}-%{release}
+Provides: %{name}-it = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Italian < %{version}-%{release}
+Provides: trinity-kde-i18n-Italian = %{version}-%{release}
+
%description Italian
-%{summary}.
+This package contains %{summary}.
+
+%files Italian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/it/
+%{tde_tdedocdir}/HTML/it/
+
+##########
%package Japanese
Summary: Japanese(ja) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Japanese < %{version}-%{release}
-Provides: trinity-kde-i18n-Japanese = %{version}-%{release}
+Provides: %{name}-ja = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Japanese < %{version}-%{release}
+Provides: trinity-kde-i18n-Japanese = %{version}-%{release}
+
%description Japanese
-%{summary}.
+This package contains %{summary}.
+
+%files Japanese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ja/
+%{tde_tdedocdir}/HTML/ja/
+
+##########
+
+%package Kazakh
+Summary: Kazakh(kk) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-kk = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Kazakh < %{version}-%{release}
+Provides: trinity-kde-i18n-Kazakh = %{version}-%{release}
+
+%description Kazakh
+This package contains %{summary}.
+
+%files Kazakh
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/kk/
+
+##########
+
+%package Khmer
+Summary: Khmer(km) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-ko = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Khmer < %{version}-%{release}
+Provides: trinity-kde-i18n-Khmer = %{version}-%{release}
+
+%description Khmer
+This package contains %{summary}.
+
+%files Khmer
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/km/
+
+##########
%package Korean
Summary: Korean(ko) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Korean < %{version}-%{release}
-Provides: trinity-kde-i18n-Korean = %{version}-%{release}
+Provides: %{name}-ko = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Korean < %{version}-%{release}
+Provides: trinity-kde-i18n-Korean = %{version}-%{release}
+
%description Korean
-%{summary}.
+This package contains %{summary}.
+
+%files Korean
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ko/
+%{tde_tdedocdir}/HTML/ko/
+
+##########
%package Kurdish
Summary: Kurdish(ku) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Kurdish < %{version}-%{release}
-Provides: trinity-kde-i18n-Kurdish = %{version}-%{release}
+Provides: %{name}-ku = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Kurdish < %{version}-%{release}
+Provides: trinity-kde-i18n-Kurdish = %{version}-%{release}
+
%description Kurdish
-%{summary}.
+This package contains %{summary}.
+
+#%files Kurdish
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/ku/
+
+##########
%package Lao
Summary: Lao(lo) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Lao < %{version}-%{release}
-Provides: trinity-kde-i18n-Lao = %{version}-%{release}
+Provides: %{name}-lo = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Lao < %{version}-%{release}
+Provides: trinity-kde-i18n-Lao = %{version}-%{release}
+
%description Lao
-%{summary}.
+This package contains %{summary}.
+
+#%files Lao
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/lo/
+
+##########
%package Lithuanian
Summary: Lithuanian(lt) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Lithuanian < %{version}-%{release}
-Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release}
+Provides: %{name}-lt = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Lithuanian < %{version}-%{release}
+Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release}
+
%description Lithuanian
-%{summary}.
+This package contains %{summary}.
+
+%files Lithuanian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/lt/
+
+##########
%package Latvian
Summary: Latvian(lv) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Latvian < %{version}-%{release}
-Provides: trinity-kde-i18n-Latvian = %{version}-%{release}
+Provides: %{name}-lv = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Latvian < %{version}-%{release}
+Provides: trinity-kde-i18n-Latvian = %{version}-%{release}
+
%description Latvian
-%{summary}.
+This package contains %{summary}.
+
+%files Latvian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/lv/
+
+##########
%package Maori
Summary: Maori(mi) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Maori < %{version}-%{release}
-Provides: trinity-kde-i18n-Maori = %{version}-%{release}
+Provides: %{name}-mi = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Maori < %{version}-%{release}
+Provides: trinity-kde-i18n-Maori = %{version}-%{release}
+
%description Maori
-%{summary}.
+This package contains %{summary}.
+
+#%files Maori
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/mi/
+
+##########
%package Macedonian
Summary: Macedonian(mk) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Macedonian < %{version}-%{release}
-Provides: trinity-kde-i18n-Macedonian = %{version}-%{release}
+Provides: %{name}-mk = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Macedonian < %{version}-%{release}
+Provides: trinity-kde-i18n-Macedonian = %{version}-%{release}
+
%description Macedonian
-%{summary}.
+This package contains %{summary}.
+
+%files Macedonian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/mk/
+
+##########
+
+%package Mongolian
+Summary: Mongolian(mn) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-mn = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Mongolian < %{version}-%{release}
+Provides: trinity-kde-i18n-Mongolian = %{version}-%{release}
+
+%description Mongolian
+This package contains %{summary}.
+
+%files Mongolian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/mn/
+
+##########
+
+%package Malay
+Summary: Malay(ms) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-ms = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Malay < %{version}-%{release}
+Provides: trinity-kde-i18n-Malay = %{version}-%{release}
+
+%description Malay
+This package contains %{summary}.
+
+%files Malay
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ms/
+
+##########
%package Maltese
Summary: Maltese(mt) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Maltese < %{version}-%{release}
-Provides: trinity-kde-i18n-Maltese = %{version}-%{release}
+Provides: %{name}-mt = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Maltese < %{version}-%{release}
+Provides: trinity-kde-i18n-Maltese = %{version}-%{release}
+
%description Maltese
-%{summary}.
+This package contains %{summary}.
+
+#%files Maltese
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/mt/
+
+##########
+
+%package Low-Saxon
+Summary: Low Saxon(nds) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-nds = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Low-Saxon < %{version}-%{release}
+Provides: trinity-kde-i18n-Low-Saxon = %{version}-%{release}
+
+%description Low-Saxon
+This package contains %{summary}.
+
+%files Low-Saxon
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nds/
+
+##########
%package Dutch
Summary: Dutch(nl) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Dutch < %{version}-%{release}
-Provides: trinity-kde-i18n-Dutch = %{version}-%{release}
+Provides: %{name}-nl = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Dutch < %{version}-%{release}
+Provides: trinity-kde-i18n-Dutch = %{version}-%{release}
+
%description Dutch
-%{summary}.
+This package contains %{summary}.
+
+%files Dutch
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nl/
+%{tde_tdedocdir}/HTML/nl/
+
+##########
%package Norwegian
Summary: Norwegian(no) (Bokmaal) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Norwegian < %{version}-%{release}
-Provides: trinity-kde-i18n-Norwegian = %{version}-%{release}
+Provides: %{name}-no = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Norwegian < %{version}-%{release}
+Provides: trinity-kde-i18n-Norwegian = %{version}-%{release}
+
%description Norwegian
-%{summary}.
+This package contains %{summary}.
+
+%files Norwegian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nb/
+
+##########
%package Norwegian-Nynorsk
Summary: Norwegian(nn) (Nynorsk) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release}
-Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release}
+Provides: %{name}-nn = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release}
+Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release}
+
%description Norwegian-Nynorsk
-%{summary}.
+This package contains %{summary}.
+
+%files Norwegian-Nynorsk
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nn/
+
+##########
%package Occitan
Summary: Occitan(oc) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Occitan < %{version}-%{release}
-Provides: trinity-kde-i18n-Occitan = %{version}-%{release}
+Provides: %{name}-oc = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Occitan < %{version}-%{release}
+Provides: trinity-kde-i18n-Occitan = %{version}-%{release}
+
%description Occitan
-%{summary}.
+This package contains %{summary}.
+
+#%files Occitan
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/oc/
+
+##########
%package Polish
Summary: Polish(pl) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Polish < %{version}-%{release}
-Provides: trinity-kde-i18n-Polish = %{version}-%{release}
+Provides: %{name}-pl = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Polish < %{version}-%{release}
+Provides: trinity-kde-i18n-Polish = %{version}-%{release}
+
%description Polish
-%{summary}.
+This package contains %{summary}.
+
+%files Polish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pl/
+%{tde_tdedocdir}/HTML/pl/
+
+##########
%package Portuguese
Summary: Portuguese(pt) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Portuguese < %{version}-%{release}
-Provides: trinity-kde-i18n-Portuguese = %{version}-%{release}
+Provides: %{name}-pt = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Portuguese < %{version}-%{release}
+Provides: trinity-kde-i18n-Portuguese = %{version}-%{release}
+
%description Portuguese
-%{summary}.
+This package contains %{summary}.
+
+%files Portuguese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pt/
+%{tde_tdedocdir}/HTML/pt/
+
+##########
%package Punjabi
Summary: Punjabi(pa) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Punjabi < %{version}-%{release}
-Provides: trinity-kde-i18n-Punjabi = %{version}-%{release}
+Provides: %{name}-pa = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Punjabi < %{version}-%{release}
+Provides: trinity-kde-i18n-Punjabi = %{version}-%{release}
+
%description Punjabi
-%{summary}.
+This package contains %{summary}.
+
+%files Punjabi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pa/
+
+##########
%package Brazil
Summary: Brazil(pt_BR) Portuguese language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Brazil < %{version}-%{release}
-Provides: trinity-kde-i18n-Brazil = %{version}-%{release}
+Provides: %{name}-pt_BR = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Brazil < %{version}-%{release}
+Provides: trinity-kde-i18n-Brazil = %{version}-%{release}
+
%description Brazil
-%{summary}.
+This package contains %{summary}.
+
+%files Brazil
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pt_BR/
+%{tde_tdedocdir}/HTML/pt_BR/
+
+##########
%package Romanian
Summary: Romanian(ro) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Romanian < %{version}-%{release}
-Provides: trinity-kde-i18n-Romanian = %{version}-%{release}
+Provides: %{name}-ro = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Romanian < %{version}-%{release}
+Provides: trinity-kde-i18n-Romanian = %{version}-%{release}
+
%description Romanian
-%{summary}.
+This package contains %{summary}.
+
+%files Romanian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ro/
+%{tde_tdedocdir}/HTML/ro/
+
+##########
%package Russian
Summary: Russian(ru) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Russian < %{version}-%{release}
-Provides: trinity-kde-i18n-Russian = %{version}-%{release}
+Provides: %{name}-ru = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Russian < %{version}-%{release}
+Provides: trinity-kde-i18n-Russian = %{version}-%{release}
+
%description Russian
-%{summary}.
+This package contains %{summary}.
+
+%files Russian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ru/
+%{tde_tdedocdir}/HTML/ru/
+
+##########
+
+%package Kinyarwanda
+Summary: Kinyarwanda(rw) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-rw = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Kinyarwanda < %{version}-%{release}
+Provides: trinity-kde-i18n-Kinyarwanda = %{version}-%{release}
+
+%description Kinyarwanda
+This package contains %{summary}.
+
+%files Kinyarwanda
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/rw/
+
+##########
+
+%package Northern-Sami
+Summary: Northern-Sami(se) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-se = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Northern-Sami < %{version}-%{release}
+Provides: trinity-kde-i18n-Northern-Sami = %{version}-%{release}
+
+%description Northern-Sami
+This package contains %{summary}.
+
+%files Northern-Sami
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/se/
+
+##########
%package Slovak
Summary: Slovak(sk) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Slovak < %{version}-%{release}
-Provides: trinity-kde-i18n-Slovak = %{version}-%{release}
+Provides: %{name}-sk = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Slovak < %{version}-%{release}
+Provides: trinity-kde-i18n-Slovak = %{version}-%{release}
+
%description Slovak
-%{summary}.
+This package contains %{summary}.
+
+%files Slovak
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sk/
+%{tde_tdedocdir}/HTML/sk/
+
+##########
%package Slovenian
Summary: Slovenian(sl) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Slovenian < %{version}-%{release}
-Provides: trinity-kde-i18n-Slovenian = %{version}-%{release}
+Provides: %{name}-sl = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Slovenian < %{version}-%{release}
+Provides: trinity-kde-i18n-Slovenian = %{version}-%{release}
+
%description Slovenian
-%{summary}.
+This package contains %{summary}.
+
+%files Slovenian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sl/
+%{tde_tdedocdir}/HTML/sl/
+
+##########
%package Serbian
Summary: Serbian(sr) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Serbian < %{version}-%{release}
-Provides: trinity-kde-i18n-Serbian = %{version}-%{release}
+Provides: %{name}-sr = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Serbian < %{version}-%{release}
+Provides: trinity-kde-i18n-Serbian = %{version}-%{release}
+
%description Serbian
-%{summary}.
+This package contains %{summary}.
+
+%files Serbian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sr/
+%{tde_tdedocdir}/HTML/sr/
+
+##########
+
+%package Serbian-Latin
+Summary: Serbian-Latin(sr@Latn) language support for TDE
+Group: User Interface/Desktops
+Obsoletes: trinity-kde-i18n-Serbian-Latin < %{version}-%{release}
+Provides: trinity-kde-i18n-Serbian-Latin = %{version}-%{release}
+
+%description Serbian-Latin
+This package contains %{summary}.
+
+%files Serbian-Latin
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sr@Latn/
+
+##########
+
+%package South-Sudan
+Summary: South-Sudan(ss) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-ss = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-South-Sudan < %{version}-%{release}
+Provides: trinity-kde-i18n-South-Sudan = %{version}-%{release}
+
+%description South-Sudan
+This package contains %{summary}.
+
+%files South-Sudan
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ss/
+
+##########
%package Swedish
Summary: Swedish(sv) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Swedish < %{version}-%{release}
-Provides: trinity-kde-i18n-Swedish = %{version}-%{release}
+Provides: %{name}-sv = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Swedish < %{version}-%{release}
+Provides: trinity-kde-i18n-Swedish = %{version}-%{release}
+
%description Swedish
-%{summary}.
+This package contains %{summary}.
+
+%files Swedish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sv/
+%{tde_tdedocdir}/HTML/sv/
+
+##########
%package Tamil
Summary: Tamil(ta) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Tamil < %{version}-%{release}
-Provides: trinity-kde-i18n-Tamil = %{version}-%{release}
+Provides: %{name}-ta = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Tamil < %{version}-%{release}
+Provides: trinity-kde-i18n-Tamil = %{version}-%{release}
+
%description Tamil
-%{summary}.
+This package contains %{summary}.
+
+%files Tamil
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ta/
+
+##########
+
+%package Telugu
+Summary: Telugu(te) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-te = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Telugu < %{version}-%{release}
+Provides: trinity-kde-i18n-Telugu = %{version}-%{release}
+
+%description Telugu
+This package contains %{summary}.
+
+%files Telugu
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/te/
+
+##########
%package Tajik
Summary: Tajik(tg) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Tajik < %{version}-%{release}
-Provides: trinity-kde-i18n-Tajik = %{version}-%{release}
+Provides: %{name}-tg = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Tajik < %{version}-%{release}
+Provides: trinity-kde-i18n-Tajik = %{version}-%{release}
+
%description Tajik
-%{summary}.
+This package contains %{summary}.
+
+%files Tajik
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/tg/
+
+##########
%package Thai
Summary: Thai(th) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Thai < %{version}-%{release}
-Provides: trinity-kde-i18n-Thai = %{version}-%{release}
+Provides: %{name}-th = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Thai < %{version}-%{release}
+Provides: trinity-kde-i18n-Thai = %{version}-%{release}
+
%description Thai
-%{summary}.
+This package contains %{summary}.
+
+%files Thai
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/th/
+
+##########
%package Turkish
Summary: Turkish(tr) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Turkish < %{version}-%{release}
-Provides: trinity-kde-i18n-Turkish = %{version}-%{release}
+Provides: %{name}-tr = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Turkish < %{version}-%{release}
+Provides: trinity-kde-i18n-Turkish = %{version}-%{release}
+
%description Turkish
-%{summary}.
+This package contains %{summary}.
+
+%files Turkish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/tr/
+%{tde_tdedocdir}/HTML/tr/
+
+##########
%package Ukrainian
Summary: Ukrainian(uk) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Ukrainian < %{version}-%{release}
-Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release}
+Provides: %{name}-uk = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Ukrainian < %{version}-%{release}
+Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release}
+
%description Ukrainian
-%{summary}.
+This package contains %{summary}.
+
+%files Ukrainian
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/uk/
+%{tde_datadir}/locale/uk/
+
+##########
+
+%package Uzbek
+Summary: Uzbek(uz) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-uz = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Uzbek < %{version}-%{release}
+Provides: trinity-kde-i18n-Uzbek = %{version}-%{release}
+
+%description Uzbek
+This package contains %{summary}.
+
+%files Uzbek
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/uz/
+
+##########
+
+%package Uzbek-Cyrillic
+Summary: Uzbek(uz@cyrillic) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-uz@cyrillic = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Uzbek-Cyrillic < %{version}-%{release}
+Provides: trinity-kde-i18n-Uzbek-Cyrillic = %{version}-%{release}
+
+%description Uzbek-Cyrillic
+This package contains %{summary}.
+
+%files Uzbek-Cyrillic
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/uz@cyrillic/
+
+##########
%package Venda
Summary: Venda(ven) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Venda < %{version}-%{release}
-Provides: trinity-kde-i18n-Venda = %{version}-%{release}
+Provides: %{name}-ven = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Venda < %{version}-%{release}
+Provides: trinity-kde-i18n-Venda = %{version}-%{release}
+
%description Venda
-%{summary}.
+This package contains %{summary}.
+
+#%files Venda
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/ven/
+
+##########
%package Vietnamese
Summary: Vietnamese(vi) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Vietnamese < %{version}-%{release}
-Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release}
+Provides: %{name}-vi = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Vietnamese < %{version}-%{release}
+Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release}
+
%description Vietnamese
-%{summary}.
+This package contains %{summary}.
+
+%files Vietnamese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/vi/
+
+##########
%package Walloon
Summary: Walloon(wa) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Walloon < %{version}-%{release}
-Provides: trinity-kde-i18n-Walloon = %{version}-%{release}
+Provides: %{name}-wa = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Walloon < %{version}-%{release}
+Provides: trinity-kde-i18n-Walloon = %{version}-%{release}
+
%description Walloon
-%{summary}.
+This package contains %{summary}.
+
+%files Walloon
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/wa/
+
+##########
%package Xhosa
Summary: Xhosa(xh) (a Bantu language) support for TDE
Group: User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Xhosa < %{version}-%{release}
-Provides: trinity-kde-i18n-Xhosa = %{version}-%{release}
+Provides: %{name}-xh = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Xhosa < %{version}-%{release}
+Provides: trinity-kde-i18n-Xhosa = %{version}-%{release}
+
%description Xhosa
-%{summary}.
+This package contains %{summary}.
+
+#%files Xhosa
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/xh/
+
+##########
%package Chinese
Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Chinese < %{version}-%{release}
-Provides: trinity-kde-i18n-Chinese = %{version}-%{release}
+Provides: %{name}-zh_CN = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Chinese < %{version}-%{release}
+Provides: trinity-kde-i18n-Chinese = %{version}-%{release}
+
%description Chinese
-%{summary}.
+This package contains %{summary}.
+
+%files Chinese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/zh_CN/
+%{tde_tdedocdir}/HTML/zh_CN/
+
+##########
%package Chinese-Big5
Summary: Chinese(zh_TW) (Big5) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
-Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
+Provides: %{name}-tz_TW = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
+Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
+
%description Chinese-Big5
-%{summary}.
+This package contains %{summary}.
+%files Chinese-Big5
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/zh_TW/
+%{tde_tdedocdir}/HTML/zh_TW/
+##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -754,450 +1490,5 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%clean
%__rm -rf %{buildroot}
-%if "%( grep -w af <<< '%{TDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/af/*
-%{tde_tdedocdir}/HTML/af/
-%endif
-
-%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != ""
-%files Arabic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{TDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{TDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != ""
-%files Tibetan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bo/*
-%endif
-
-%if "%( grep -w br <<< '%{TDE_LANGS}' )" != ""
-%files Breton
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/br/*
-%endif
-
-%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != ""
-%files Bosnian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bs/*
-%endif
-
-%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != ""
-%files Catalan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ca/*
-%{tde_tdedocdir}/HTML/ca/
-%endif
-
-%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != ""
-%files Czech
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cs/*
-%{tde_tdedocdir}/HTML/cs/
-%endif
-
-%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != ""
-%files Welsh
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cy/*
-%endif
-
-%if "%( grep -w da <<< '%{TDE_LANGS}' )" != ""
-%files Danish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/da/*
-%{tde_tdedocdir}/HTML/da/
-%endif
-
-%if "%( grep -w de <<< '%{TDE_LANGS}' )" != ""
-%files German
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/de/*
-%{tde_tdedocdir}/HTML/de/
-%endif
-
-%if "%( grep -w el <<< '%{TDE_LANGS}' )" != ""
-%files Greek
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/el/*
-%endif
-
-%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != ""
-%files British
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/en_GB/*
-%{tde_tdedocdir}/HTML/en_GB/
-%endif
-
-%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != ""
-%files Esperanto
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eo/*
-%endif
-
-%if "%( grep -w es <<< '%{TDE_LANGS}' )" != ""
-%files Spanish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/es/*
-%{tde_tdedocdir}/HTML/es/
-%endif
-
-%if "%( grep -w et <<< '%{TDE_LANGS}' )" != ""
-%files Estonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/et/*
-%{tde_tdedocdir}/HTML/et/
-%endif
-
-%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != ""
-%files Basque
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eu/*
-%endif
-
-%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != ""
-%files Farsi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fa/*
-%endif
-
-%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != ""
-%files Finnish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fi/*
-%{tde_tdedocdir}/HTML/fi/
-%endif
-
-%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != ""
-%files Faroese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fo/*
-%endif
-
-%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != ""
-%files French
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fr/*
-%{tde_tdedocdir}/HTML/fr/
-%endif
-
-%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != ""
-%files Frisian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fy/*
-%endif
-
-%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != ""
-%files Irish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ga/*
-%endif
-
-%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != ""
-%files Galician
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/gl/*
-%endif
-
-%if "%( grep -w he <<< '%{TDE_LANGS}' )" != ""
-%files Hebrew
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/he/*
-%{tde_tdedocdir}/HTML/he/
-%endif
-
-%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != ""
-%files Hindi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hi/*
-%endif
-
-%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != ""
-%files Croatian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hr/*
-%{tde_tdedocdir}/HTML/hr/
-%endif
-
-%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != ""
-%files Hungarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hu/*
-%{tde_tdedocdir}/HTML/hu/
-%endif
-
-%if "%( grep -w id <<< '%{TDE_LANGS}' )" != ""
-%files Indonesian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/id/*
-%{tde_tdedocdir}/HTML/id/
-%endif
-
-%if "%( grep -w is <<< '%{TDE_LANGS}' )" != ""
-%files Icelandic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/is/*
-%endif
-
-%if "%( grep -w it <<< '%{TDE_LANGS}' )" != ""
-%files Italian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/it/*
-%{tde_tdedocdir}/HTML/it/
-%endif
-
-%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != ""
-%files Japanese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ja/*
-%{tde_tdedocdir}/HTML/ja/
-%endif
-
-%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != ""
-%files Korean
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ko/*
-%{tde_tdedocdir}/HTML/ko/
-%endif
-
-%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != ""
-%files Kurdish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ku/*
-%{tde_tdedocdir}/HTML/ku/
-%endif
-
-%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != ""
-%files Lao
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lo/*
-%{tde_tdedocdir}/HTML/lo/
-%endif
-
-%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != ""
-%files Lithuanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lt/*
-%endif
-
-%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != ""
-%files Latvian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lv/*
-%endif
-
-%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != ""
-%files Maori
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mi/*
-%endif
-
-%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != ""
-%files Macedonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mk/*
-%endif
-
-%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != ""
-%files Maltese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mt/*
-%endif
-
-%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != ""
-%files Dutch
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nl/*
-%{tde_tdedocdir}/HTML/nl/
-%endif
-
-%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != ""
-%files Norwegian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nb/*
-#%{tde_tdedocdir}/HTML/nb/
-%endif
-
-%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != ""
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nn/*
-#%{tde_tdedocdir}/HTML/nn/
-%endif
-
-%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != ""
-%files Occitan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/oc/*
-%endif
-
-%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != ""
-%files Punjabi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pa/*
-%endif
-
-%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != ""
-%files Polish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pl/*
-%{tde_tdedocdir}/HTML/pl/
-%endif
-
-%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != ""
-%files Portuguese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt/*
-%{tde_tdedocdir}/HTML/pt/
-%endif
-
-%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != ""
-%files Brazil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt_BR/*
-%{tde_tdedocdir}/HTML/pt_BR/
-%endif
-
-%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != ""
-%files Romanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ro/*
-%{tde_tdedocdir}/HTML/ro/
-%endif
-
-%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != ""
-%files Russian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ru/*
-%{tde_tdedocdir}/HTML/ru/
-%endif
-
-%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != ""
-%files Slovak
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sk/*
-%{tde_tdedocdir}/HTML/sk/
-%endif
-
-%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != ""
-%files Slovenian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sl/*
-%{tde_tdedocdir}/HTML/sl/
-%endif
-
-%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != ""
-%files Serbian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sr/*
-%{tde_tdedocdir}/HTML/sr/
-%endif
-
-%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != ""
-%files Swedish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sv/*
-%{tde_tdedocdir}/HTML/sv/
-%endif
-
-%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != ""
-%files Tamil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ta/*
-%endif
-
-%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != ""
-%files Tajik
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tg/*
-%endif
-
-%if "%( grep -w th <<< '%{TDE_LANGS}' )" != ""
-%files Thai
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/th/*
-%endif
-
-%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != ""
-%files Turkish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tr/*
-%{tde_tdedocdir}/HTML/tr/
-%endif
-
-%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != ""
-%files Ukrainian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/uk/
-%{tde_datadir}/locale/uk/*
-%endif
-
-%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != ""
-%files Venda
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ven/*
-%endif
-
-%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != ""
-%files Vietnamese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/vi/*
-%endif
-
-%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != ""
-%files Walloon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/wa/*
-%endif
-
-%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != ""
-%files Xhosa
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/xh/*
-%{tde_tdedocdir}/HTML/xh/
-%endif
-
-%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != ""
-%files Chinese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_CN/*
-%{tde_tdedocdir}/HTML/zh_CN/
-%endif
-
-%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != ""
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_TW/*
-%{tde_tdedocdir}/HTML/zh_TW/
-%endif
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec b/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec
index 444ed210b..2d7946091 100644
--- a/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec
+++ b/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec
@@ -1,44 +1,63 @@
-# Default version for this component
-%define tde_pkg tde-i18n
+#
+# spec file for package tde-i18n (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 3.5.13.2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
%endif
-
-# TDE specific building variables
-BuildRequires: autoconf automake libtool m4
+%define tde_pkg tde-i18n
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
-
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
# Builds all supported languages (not unsupported ones)
%if "%{?TDE_LANGS}" == ""
-%define TDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW
+%define TDE_LANGS af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW
%endif
Name: trinity-%{tde_pkg}
-Summary: Internationalization support for Trinity
Version: %{tde_version}
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
+Summary: Internationalization support for Trinity
+Group: User Interface/Desktops
URL: http://www.trinitydesktop.org/
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
+
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-License: GFDL
-Group: User Interface/Desktops
-BuildArch: noarch
+BuildArch: noarch
# Speed build options
%define debug_package %{nil}
@@ -47,649 +66,1365 @@ AutoReq: no
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+
BuildRequires: findutils
BuildRequires: gettext
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: gcc-c++
%description
-%{summary}.
+This package contains %{summary}.
+
+##########
%package Afrikaans
Summary: Afrikaans(af) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-af = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Afrikaans < %{version}-%{release}
-Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release}
+Provides: %{name}-af = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Afrikaans < %{version}-%{release}
+Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release}
+
%description Afrikaans
-%{summary}.
+This package contains %{summary}.
+
+%files Afrikaans
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/af/
+
+##########
%package Arabic
Summary: Arabic(ar) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ar = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides: trinity-kde-i18n-Arabic = %{version}-%{release}
+Provides: %{name}-ar = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release}
+Provides: trinity-kde-i18n-Arabic = %{version}-%{release}
+
%description Arabic
-%{summary}.
+This package contains %{summary}.
+
+%files Arabic
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ar/
+
+##########
%package Azerbaijani
Summary: Azerbaijani(az) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-az = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides: trinity-kde-i18n-Arabic = %{version}-%{release}
+Provides: %{name}-az = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release}
+Provides: trinity-kde-i18n-Arabic = %{version}-%{release}
+
%description Azerbaijani
-%{summary}.
+This package contains %{summary}.
+
+%files Azerbaijani
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/az/
+
+##########
%package Belarusian
Summary: Belarusian(be) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-be = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Belarusian < %{version}-%{release}
-Provides: trinity-kde-i18n-Belarusian = %{version}-%{release}
+Provides: %{name}-be = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Belarusian < %{version}-%{release}
+Provides: trinity-kde-i18n-Belarusian = %{version}-%{release}
+
%description Belarusian
-%{summary}.
+This package contains %{summary}.
+
+%files Belarusian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/be/
+
+##########
%package Bulgarian
Summary: Bulgarian(bg) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Bulgarian < %{version}-%{release}
-Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release}
+Provides: %{name}-bg = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Bulgarian < %{version}-%{release}
+Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release}
+
%description Bulgarian
-%{summary}.
+This package contains %{summary}.
+
+%files Bulgarian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bg/
+
+##########
%package Bengali
Summary: Bengali(bn) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Bengali < %{version}-%{release}
-Provides: trinity-kde-i18n-Bengali = %{version}-%{release}
+Provides: %{name}-bn = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Bengali < %{version}-%{release}
+Provides: trinity-kde-i18n-Bengali = %{version}-%{release}
+
%description Bengali
-%{summary}.
+This package contains %{summary}.
+
+%files Bengali
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bn/
+
+##########
%package Tibetan
Summary: Tibetan(bo) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Tibetan < %{version}-%{release}
-Provides: trinity-kde-i18n-Tibetan = %{version}-%{release}
+Provides: %{name}-bo = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Tibetan < %{version}-%{release}
+Provides: trinity-kde-i18n-Tibetan = %{version}-%{release}
+
%description Tibetan
-%{summary}.
+This package contains %{summary}.
+
+#%files Tibetan
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/bo/
+
+##########
%package Breton
Summary: Breton(br) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Breton < %{version}-%{release}
-Provides: trinity-kde-i18n-Breton = %{version}-%{release}
+Provides: %{name}-br = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Breton < %{version}-%{release}
+Provides: trinity-kde-i18n-Breton = %{version}-%{release}
+
%description Breton
-%{summary}.
+This package contains %{summary}.
+
+%files Breton
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/br/
+
+##########
%package Bosnian
Summary: Bosnian(bs) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Bosnian < %{version}-%{release}
-Provides: trinity-kde-i18n-Bosnian = %{version}-%{release}
+Provides: %{name}-bs = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Bosnian < %{version}-%{release}
+Provides: trinity-kde-i18n-Bosnian = %{version}-%{release}
+
%description Bosnian
-%{summary}.
+This package contains %{summary}.
+
+%files Bosnian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bs/
+
+##########
%package Catalan
Summary: Catalan(ca) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Catalan < %{version}-%{release}
-Provides: trinity-kde-i18n-Catalan = %{version}-%{release}
+Provides: %{name}-ca = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Catalan < %{version}-%{release}
+Provides: trinity-kde-i18n-Catalan = %{version}-%{release}
+
%description Catalan
-%{summary}.
+This package contains %{summary}.
+
+%files Catalan
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ca/
+%{tde_tdedocdir}/HTML/ca/
+
+##########
%package Czech
Summary: Czech(cs) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Czech < %{version}-%{release}
-Provides: trinity-kde-i18n-Czech = %{version}-%{release}
+Provides: %{name}-cs = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Czech < %{version}-%{release}
+Provides: trinity-kde-i18n-Czech = %{version}-%{release}
+
%description Czech
-%{summary}.
+This package contains %{summary}.
+
+%files Czech
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/cs/
+%{tde_tdedocdir}/HTML/cs/
+
+##########
+
+%package Kashubian
+Summary: Kashubian(csb) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-csb = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Kashubian < %{version}-%{release}
+Provides: trinity-kde-i18n-Kashubian = %{version}-%{release}
+
+%description Kashubian
+This package contains %{summary}.
+
+%files Kashubian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/csb/
+
+##########
%package Cymraeg
Summary: Cymraeg language support for TDE
Group: User Interface/Desktops
-Obsoletes: trinity-kde-i18n-Cymraeg < %{version}-%{release}
-Provides: trinity-kde-i18n-Cymraeg = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Cymraeg < %{version}-%{release}
+Provides: trinity-kde-i18n-Cymraeg = %{version}-%{release}
+
%description Cymraeg
-%{summary}.
+This package contains %{summary}.
+
+##########
%package Welsh
Summary: Welsh(cy) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Welsh < %{version}-%{release}
-Provides: trinity-kde-i18n-Welsh = %{version}-%{release}
+Provides: %{name}-cy = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Welsh < %{version}-%{release}
+Provides: trinity-kde-i18n-Welsh = %{version}-%{release}
+
%description Welsh
-%{summary}.
+This package contains %{summary}.
+
+%files Welsh
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/cy/
+
+##########
%package Danish
Summary: Danish(da) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Danish < %{version}-%{release}
-Provides: trinity-kde-i18n-Danish = %{version}-%{release}
+Provides: %{name}-da = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Danish < %{version}-%{release}
+Provides: trinity-kde-i18n-Danish = %{version}-%{release}
+
%description Danish
-%{summary}.
+This package contains %{summary}.
+
+%files Danish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/da/
+%{tde_tdedocdir}/HTML/da/
+
+##########
%package German
Summary: German(de) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-German < %{version}-%{release}
-Provides: trinity-kde-i18n-German = %{version}-%{release}
+Provides: %{name}-de = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-German < %{version}-%{release}
+Provides: trinity-kde-i18n-German = %{version}-%{release}
+
%description German
-%{summary}.
+This package contains %{summary}.
+
+%files German
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/de/
+%{tde_tdedocdir}/HTML/de/
+
+##########
%package Greek
Summary: Greek(el) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Greek < %{version}-%{release}
-Provides: trinity-kde-i18n-Greek = %{version}-%{release}
+Provides: %{name}-el = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Greek < %{version}-%{release}
+Provides: trinity-kde-i18n-Greek = %{version}-%{release}
+
%description Greek
-%{summary}.
+This package contains %{summary}.
+
+%files Greek
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/el/
+
+##########
%package British
Summary: British(en_GB) English support for TDE
Group: User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-British < %{version}-%{release}
-Provides: trinity-kde-i18n-British = %{version}-%{release}
+Provides: %{name}-en_GB = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-British < %{version}-%{release}
+Provides: trinity-kde-i18n-British = %{version}-%{release}
+
%description British
-%{summary}.
+This package contains %{summary}.
+
+%files British
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/en_GB/
+%{tde_tdedocdir}/HTML/en_GB/
+
+##########
%package Esperanto
Summary: Esperanto(eo) support for TDE
Group: User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Esperanto < %{version}-%{release}
-Provides: trinity-kde-i18n-Esperanto = %{version}-%{release}
+Provides: %{name}-eo = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Esperanto < %{version}-%{release}
+Provides: trinity-kde-i18n-Esperanto = %{version}-%{release}
+
%description Esperanto
-%{summary}.
+This package contains %{summary}.
+
+%files Esperanto
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/eo/
+
+##########
%package Spanish
Summary: Spanish(es) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Spanish < %{version}-%{release}
-Provides: trinity-kde-i18n-Spanish = %{version}-%{release}
+Provides: %{name}-es = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Spanish < %{version}-%{release}
+Provides: trinity-kde-i18n-Spanish = %{version}-%{release}
+
%description Spanish
-%{summary}.
+This package contains %{summary}.
+
+%files Spanish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/es/
+%{tde_tdedocdir}/HTML/es/
+
+##########
%package Estonian
Summary: Estonian(et) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Estonian < %{version}-%{release}
-Provides: trinity-kde-i18n-Estonian = %{version}-%{release}
+Provides: %{name}-et = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Estonian < %{version}-%{release}
+Provides: trinity-kde-i18n-Estonian = %{version}-%{release}
+
%description Estonian
-%{summary}.
+This package contains %{summary}.
+
+%files Estonian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/et/
+%{tde_tdedocdir}/HTML/et/
+
+##########
%package Basque
Summary: Basque(eu) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Basque < %{version}-%{release}
-Provides: trinity-kde-i18n-Basque = %{version}-%{release}
+Provides: %{name}-eu = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Basque < %{version}-%{release}
+Provides: trinity-kde-i18n-Basque = %{version}-%{release}
+
%description Basque
-%{summary}.
+This package contains %{summary}.
+
+%files Basque
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/eu/
+%{tde_tdedocdir}/HTML/eu/
+
+##########
%package Farsi
Summary: Farsi(fa) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fa = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Farsi < %{version}-%{release}
-Provides: trinity-kde-i18n-Farsi = %{version}-%{release}
+Provides: %{name}-fa = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Farsi < %{version}-%{release}
+Provides: trinity-kde-i18n-Farsi = %{version}-%{release}
+
%description Farsi
-%{summary}.
+This package contains %{summary}.
+
+%files Farsi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fa/
+
+##########
%package Finnish
Summary: Finnish(fi) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Finnish < %{version}-%{release}
-Provides: trinity-kde-i18n-Finnish = %{version}-%{release}
+Provides: %{name}-fi = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Finnish < %{version}-%{release}
+Provides: trinity-kde-i18n-Finnish = %{version}-%{release}
+
%description Finnish
-%{summary}.
+This package contains %{summary}.
+
+%files Finnish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fi/
+%{tde_tdedocdir}/HTML/fi/
+
+##########
%package Faroese
Summary: Faroese(fo) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Faroese < %{version}-%{release}
-Provides: trinity-kde-i18n-Faroese = %{version}-%{release}
+Provides: %{name}-fo = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Faroese < %{version}-%{release}
+Provides: trinity-kde-i18n-Faroese = %{version}-%{release}
+
%description Faroese
-%{summary}.
+This package contains %{summary}.
+
+#%files Faroese
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/fo/
+
+##########
%package French
Summary: French(fr) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-French < %{version}-%{release}
-Provides: trinity-kde-i18n-French = %{version}-%{release}
+Provides: %{name}-fr = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-French < %{version}-%{release}
+Provides: trinity-kde-i18n-French = %{version}-%{release}
+
%description French
-%{summary}.
+This package contains %{summary}.
+
+%files French
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fr/
+%{tde_tdedocdir}/HTML/fr/
+
+##########
%package Frisian
Summary: Frisian(fy) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Frisian < %{version}-%{release}
-Provides: trinity-kde-i18n-Frisian = %{version}-%{release}
+Provides: %{name}-fy = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Frisian < %{version}-%{release}
+Provides: trinity-kde-i18n-Frisian = %{version}-%{release}
+
%description Frisian
-%{summary}.
+This package contains %{summary}.
+
+%files Frisian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fy/
+
+##########
%package Irish
Summary: Irish(ga) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ga = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Irish < %{version}-%{release}
-Provides: trinity-kde-i18n-Irish = %{version}-%{release}
+Provides: %{name}-ga = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Irish < %{version}-%{release}
+Provides: trinity-kde-i18n-Irish = %{version}-%{release}
+
%description Irish
-%{summary}.
+This package contains %{summary}.
+
+%files Irish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ga/
+
+##########
%package Galician
Summary: Galician(gl) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Galician < %{version}-%{release}
-Provides: trinity-kde-i18n-Galician = %{version}-%{release}
+Provides: %{name}-gl = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Galician < %{version}-%{release}
+Provides: trinity-kde-i18n-Galician = %{version}-%{release}
+
%description Galician
-%{summary}.
+This package contains %{summary}.
+
+%files Galician
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/gl/
+
+##########
%package Hebrew
Summary: Hebrew(he) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Hebrew < %{version}-%{release}
-Provides: trinity-kde-i18n-Hebrew = %{version}-%{release}
+Provides: %{name}-he = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Hebrew < %{version}-%{release}
+Provides: trinity-kde-i18n-Hebrew = %{version}-%{release}
+
%description Hebrew
-%{summary}.
+This package contains %{summary}.
+
+%files Hebrew
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/he/
+%{tde_tdedocdir}/HTML/he/
+
+##########
%package Hindi
Summary: Hindi(hi) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Hindi < %{version}-%{release}
-Provides: trinity-kde-i18n-Hindi = %{version}-%{release}
+Provides: %{name}-hi = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Hindi < %{version}-%{release}
+Provides: trinity-kde-i18n-Hindi = %{version}-%{release}
+
%description Hindi
-%{summary}.
+This package contains %{summary}.
+
+%files Hindi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hi/
+
+##########
%package Croatian
Summary: Croatian(hr) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Croatian < %{version}-%{release}
-Provides: trinity-kde-i18n-Croatian = %{version}-%{release}
+Provides: %{name}-hr = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Croatian < %{version}-%{release}
+Provides: trinity-kde-i18n-Croatian = %{version}-%{release}
+
%description Croatian
-%{summary}.
+This package contains %{summary}.
+
+%files Croatian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hr/
+%{tde_tdedocdir}/HTML/hr/
+
+##########
%package Hungarian
Summary: Hungarian(hu) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Hungarian < %{version}-%{release}
-Provides: trinity-kde-i18n-Hungarian = %{version}-%{release}
+Provides: %{name}-hu = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Hungarian < %{version}-%{release}
+Provides: trinity-kde-i18n-Hungarian = %{version}-%{release}
+
%description Hungarian
-%{summary}.
+This package contains %{summary}.
+
+%files Hungarian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hu/
+%{tde_tdedocdir}/HTML/hu/
+
+##########
%package Indonesian
Summary: Indonesian(id) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Indonesian < %{version}-%{release}
-Provides: trinity-kde-i18n-Indonesian = %{version}-%{release}
+Provides: %{name}-id = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Indonesian < %{version}-%{release}
+Provides: trinity-kde-i18n-Indonesian = %{version}-%{release}
+
%description Indonesian
-%{summary}.
+This package contains %{summary}.
+
+#%files Indonesian
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/id/
+
+##########
%package Icelandic
Summary: Icelandic(is) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Icelandic < %{version}-%{release}
-Provides: trinity-kde-i18n-Icelandic = %{version}-%{release}
+Provides: %{name}-is = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Icelandic < %{version}-%{release}
+Provides: trinity-kde-i18n-Icelandic = %{version}-%{release}
+
%description Icelandic
-%{summary}.
+This package contains %{summary}.
+
+%files Icelandic
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/is/
+
+##########
%package Italian
Summary: Italian(it) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Italian < %{version}-%{release}
-Provides: trinity-kde-i18n-Italian = %{version}-%{release}
+Provides: %{name}-it = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Italian < %{version}-%{release}
+Provides: trinity-kde-i18n-Italian = %{version}-%{release}
+
%description Italian
-%{summary}.
+This package contains %{summary}.
+
+%files Italian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/it/
+%{tde_tdedocdir}/HTML/it/
+
+##########
%package Japanese
Summary: Japanese(ja) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Japanese < %{version}-%{release}
-Provides: trinity-kde-i18n-Japanese = %{version}-%{release}
+Provides: %{name}-ja = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Japanese < %{version}-%{release}
+Provides: trinity-kde-i18n-Japanese = %{version}-%{release}
+
%description Japanese
-%{summary}.
+This package contains %{summary}.
+
+%files Japanese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ja/
+%{tde_tdedocdir}/HTML/ja/
+
+##########
+
+%package Kazakh
+Summary: Kazakh(kk) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-kk = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Kazakh < %{version}-%{release}
+Provides: trinity-kde-i18n-Kazakh = %{version}-%{release}
+
+%description Kazakh
+This package contains %{summary}.
+
+%files Kazakh
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/kk/
+
+##########
+
+%package Khmer
+Summary: Khmer(km) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-ko = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Khmer < %{version}-%{release}
+Provides: trinity-kde-i18n-Khmer = %{version}-%{release}
+
+%description Khmer
+This package contains %{summary}.
+
+%files Khmer
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/km/
+
+##########
%package Korean
Summary: Korean(ko) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Korean < %{version}-%{release}
-Provides: trinity-kde-i18n-Korean = %{version}-%{release}
+Provides: %{name}-ko = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Korean < %{version}-%{release}
+Provides: trinity-kde-i18n-Korean = %{version}-%{release}
+
%description Korean
-%{summary}.
+This package contains %{summary}.
+
+%files Korean
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ko/
+%{tde_tdedocdir}/HTML/ko/
+
+##########
%package Kurdish
Summary: Kurdish(ku) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Kurdish < %{version}-%{release}
-Provides: trinity-kde-i18n-Kurdish = %{version}-%{release}
+Provides: %{name}-ku = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Kurdish < %{version}-%{release}
+Provides: trinity-kde-i18n-Kurdish = %{version}-%{release}
+
%description Kurdish
-%{summary}.
+This package contains %{summary}.
+
+#%files Kurdish
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/ku/
+
+##########
%package Lao
Summary: Lao(lo) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Lao < %{version}-%{release}
-Provides: trinity-kde-i18n-Lao = %{version}-%{release}
+Provides: %{name}-lo = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Lao < %{version}-%{release}
+Provides: trinity-kde-i18n-Lao = %{version}-%{release}
+
%description Lao
-%{summary}.
+This package contains %{summary}.
+
+#%files Lao
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/lo/
+
+##########
%package Lithuanian
Summary: Lithuanian(lt) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Lithuanian < %{version}-%{release}
-Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release}
+Provides: %{name}-lt = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Lithuanian < %{version}-%{release}
+Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release}
+
%description Lithuanian
-%{summary}.
+This package contains %{summary}.
+
+%files Lithuanian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/lt/
+
+##########
%package Latvian
Summary: Latvian(lv) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Latvian < %{version}-%{release}
-Provides: trinity-kde-i18n-Latvian = %{version}-%{release}
+Provides: %{name}-lv = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Latvian < %{version}-%{release}
+Provides: trinity-kde-i18n-Latvian = %{version}-%{release}
+
%description Latvian
-%{summary}.
+This package contains %{summary}.
+
+%files Latvian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/lv/
+
+##########
%package Maori
Summary: Maori(mi) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Maori < %{version}-%{release}
-Provides: trinity-kde-i18n-Maori = %{version}-%{release}
+Provides: %{name}-mi = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Maori < %{version}-%{release}
+Provides: trinity-kde-i18n-Maori = %{version}-%{release}
+
%description Maori
-%{summary}.
+This package contains %{summary}.
+
+#%files Maori
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/mi/
+
+##########
%package Macedonian
Summary: Macedonian(mk) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Macedonian < %{version}-%{release}
-Provides: trinity-kde-i18n-Macedonian = %{version}-%{release}
+Provides: %{name}-mk = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Macedonian < %{version}-%{release}
+Provides: trinity-kde-i18n-Macedonian = %{version}-%{release}
+
%description Macedonian
-%{summary}.
+This package contains %{summary}.
+
+%files Macedonian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/mk/
+
+##########
+
+%package Mongolian
+Summary: Mongolian(mn) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-mn = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Mongolian < %{version}-%{release}
+Provides: trinity-kde-i18n-Mongolian = %{version}-%{release}
+
+%description Mongolian
+This package contains %{summary}.
+
+%files Mongolian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/mn/
+
+##########
+
+%package Malay
+Summary: Malay(ms) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-ms = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Malay < %{version}-%{release}
+Provides: trinity-kde-i18n-Malay = %{version}-%{release}
+
+%description Malay
+This package contains %{summary}.
+
+%files Malay
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ms/
+
+##########
%package Maltese
Summary: Maltese(mt) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Maltese < %{version}-%{release}
-Provides: trinity-kde-i18n-Maltese = %{version}-%{release}
+Provides: %{name}-mt = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Maltese < %{version}-%{release}
+Provides: trinity-kde-i18n-Maltese = %{version}-%{release}
+
%description Maltese
-%{summary}.
+This package contains %{summary}.
+
+#%files Maltese
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/mt/
+
+##########
+
+%package Low-Saxon
+Summary: Low Saxon(nds) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-nds = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Low-Saxon < %{version}-%{release}
+Provides: trinity-kde-i18n-Low-Saxon = %{version}-%{release}
+
+%description Low-Saxon
+This package contains %{summary}.
+
+%files Low-Saxon
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nds/
+
+##########
%package Dutch
Summary: Dutch(nl) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Dutch < %{version}-%{release}
-Provides: trinity-kde-i18n-Dutch = %{version}-%{release}
+Provides: %{name}-nl = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Dutch < %{version}-%{release}
+Provides: trinity-kde-i18n-Dutch = %{version}-%{release}
+
%description Dutch
-%{summary}.
+This package contains %{summary}.
+
+%files Dutch
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nl/
+%{tde_tdedocdir}/HTML/nl/
+
+##########
%package Norwegian
Summary: Norwegian(no) (Bokmaal) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Norwegian < %{version}-%{release}
-Provides: trinity-kde-i18n-Norwegian = %{version}-%{release}
+Provides: %{name}-no = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Norwegian < %{version}-%{release}
+Provides: trinity-kde-i18n-Norwegian = %{version}-%{release}
+
%description Norwegian
-%{summary}.
+This package contains %{summary}.
+
+%files Norwegian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nb/
+
+##########
%package Norwegian-Nynorsk
Summary: Norwegian(nn) (Nynorsk) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release}
-Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release}
+Provides: %{name}-nn = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release}
+Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release}
+
%description Norwegian-Nynorsk
-%{summary}.
+This package contains %{summary}.
+
+%files Norwegian-Nynorsk
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nn/
+
+##########
%package Occitan
Summary: Occitan(oc) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Occitan < %{version}-%{release}
-Provides: trinity-kde-i18n-Occitan = %{version}-%{release}
+Provides: %{name}-oc = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Occitan < %{version}-%{release}
+Provides: trinity-kde-i18n-Occitan = %{version}-%{release}
+
%description Occitan
-%{summary}.
+This package contains %{summary}.
+
+#%files Occitan
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/oc/
+
+##########
%package Polish
Summary: Polish(pl) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Polish < %{version}-%{release}
-Provides: trinity-kde-i18n-Polish = %{version}-%{release}
+Provides: %{name}-pl = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Polish < %{version}-%{release}
+Provides: trinity-kde-i18n-Polish = %{version}-%{release}
+
%description Polish
-%{summary}.
+This package contains %{summary}.
+
+%files Polish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pl/
+%{tde_tdedocdir}/HTML/pl/
+
+##########
%package Portuguese
Summary: Portuguese(pt) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Portuguese < %{version}-%{release}
-Provides: trinity-kde-i18n-Portuguese = %{version}-%{release}
+Provides: %{name}-pt = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Portuguese < %{version}-%{release}
+Provides: trinity-kde-i18n-Portuguese = %{version}-%{release}
+
%description Portuguese
-%{summary}.
+This package contains %{summary}.
+
+%files Portuguese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pt/
+%{tde_tdedocdir}/HTML/pt/
+
+##########
%package Punjabi
Summary: Punjabi(pa) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Punjabi < %{version}-%{release}
-Provides: trinity-kde-i18n-Punjabi = %{version}-%{release}
+Provides: %{name}-pa = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Punjabi < %{version}-%{release}
+Provides: trinity-kde-i18n-Punjabi = %{version}-%{release}
+
%description Punjabi
-%{summary}.
+This package contains %{summary}.
+
+%files Punjabi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pa/
+
+##########
%package Brazil
Summary: Brazil(pt_BR) Portuguese language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Brazil < %{version}-%{release}
-Provides: trinity-kde-i18n-Brazil = %{version}-%{release}
+Provides: %{name}-pt_BR = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Brazil < %{version}-%{release}
+Provides: trinity-kde-i18n-Brazil = %{version}-%{release}
+
%description Brazil
-%{summary}.
+This package contains %{summary}.
+
+%files Brazil
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pt_BR/
+%{tde_tdedocdir}/HTML/pt_BR/
+
+##########
%package Romanian
Summary: Romanian(ro) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Romanian < %{version}-%{release}
-Provides: trinity-kde-i18n-Romanian = %{version}-%{release}
+Provides: %{name}-ro = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Romanian < %{version}-%{release}
+Provides: trinity-kde-i18n-Romanian = %{version}-%{release}
+
%description Romanian
-%{summary}.
+This package contains %{summary}.
+
+%files Romanian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ro/
+%{tde_tdedocdir}/HTML/ro/
+
+##########
%package Russian
Summary: Russian(ru) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Russian < %{version}-%{release}
-Provides: trinity-kde-i18n-Russian = %{version}-%{release}
+Provides: %{name}-ru = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Russian < %{version}-%{release}
+Provides: trinity-kde-i18n-Russian = %{version}-%{release}
+
%description Russian
-%{summary}.
+This package contains %{summary}.
+
+%files Russian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ru/
+%{tde_tdedocdir}/HTML/ru/
+
+##########
+
+%package Kinyarwanda
+Summary: Kinyarwanda(rw) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-rw = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Kinyarwanda < %{version}-%{release}
+Provides: trinity-kde-i18n-Kinyarwanda = %{version}-%{release}
+
+%description Kinyarwanda
+This package contains %{summary}.
+
+%files Kinyarwanda
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/rw/
+
+##########
+
+%package Northern-Sami
+Summary: Northern-Sami(se) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-se = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Northern-Sami < %{version}-%{release}
+Provides: trinity-kde-i18n-Northern-Sami = %{version}-%{release}
+
+%description Northern-Sami
+This package contains %{summary}.
+
+%files Northern-Sami
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/se/
+
+##########
%package Slovak
Summary: Slovak(sk) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Slovak < %{version}-%{release}
-Provides: trinity-kde-i18n-Slovak = %{version}-%{release}
+Provides: %{name}-sk = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Slovak < %{version}-%{release}
+Provides: trinity-kde-i18n-Slovak = %{version}-%{release}
+
%description Slovak
-%{summary}.
+This package contains %{summary}.
+
+%files Slovak
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sk/
+%{tde_tdedocdir}/HTML/sk/
+
+##########
%package Slovenian
Summary: Slovenian(sl) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Slovenian < %{version}-%{release}
-Provides: trinity-kde-i18n-Slovenian = %{version}-%{release}
+Provides: %{name}-sl = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Slovenian < %{version}-%{release}
+Provides: trinity-kde-i18n-Slovenian = %{version}-%{release}
+
%description Slovenian
-%{summary}.
+This package contains %{summary}.
+
+%files Slovenian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sl/
+%{tde_tdedocdir}/HTML/sl/
+
+##########
%package Serbian
Summary: Serbian(sr) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Serbian < %{version}-%{release}
-Provides: trinity-kde-i18n-Serbian = %{version}-%{release}
+Provides: %{name}-sr = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Serbian < %{version}-%{release}
+Provides: trinity-kde-i18n-Serbian = %{version}-%{release}
+
%description Serbian
-%{summary}.
+This package contains %{summary}.
+
+%files Serbian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sr/
+%{tde_tdedocdir}/HTML/sr/
+
+##########
+
+%package Serbian-Latin
+Summary: Serbian-Latin(sr@Latn) language support for TDE
+Group: User Interface/Desktops
+Obsoletes: trinity-kde-i18n-Serbian-Latin < %{version}-%{release}
+Provides: trinity-kde-i18n-Serbian-Latin = %{version}-%{release}
+
+%description Serbian-Latin
+This package contains %{summary}.
+
+%files Serbian-Latin
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sr@Latn/
+
+##########
+
+%package South-Sudan
+Summary: South-Sudan(ss) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-ss = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-South-Sudan < %{version}-%{release}
+Provides: trinity-kde-i18n-South-Sudan = %{version}-%{release}
+
+%description South-Sudan
+This package contains %{summary}.
+
+%files South-Sudan
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ss/
+
+##########
%package Swedish
Summary: Swedish(sv) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Swedish < %{version}-%{release}
-Provides: trinity-kde-i18n-Swedish = %{version}-%{release}
+Provides: %{name}-sv = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Swedish < %{version}-%{release}
+Provides: trinity-kde-i18n-Swedish = %{version}-%{release}
+
%description Swedish
-%{summary}.
+This package contains %{summary}.
+
+%files Swedish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sv/
+%{tde_tdedocdir}/HTML/sv/
+
+##########
%package Tamil
Summary: Tamil(ta) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Tamil < %{version}-%{release}
-Provides: trinity-kde-i18n-Tamil = %{version}-%{release}
+Provides: %{name}-ta = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Tamil < %{version}-%{release}
+Provides: trinity-kde-i18n-Tamil = %{version}-%{release}
+
%description Tamil
-%{summary}.
+This package contains %{summary}.
+
+%files Tamil
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ta/
+
+##########
+
+%package Telugu
+Summary: Telugu(te) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-te = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Telugu < %{version}-%{release}
+Provides: trinity-kde-i18n-Telugu = %{version}-%{release}
+
+%description Telugu
+This package contains %{summary}.
+
+%files Telugu
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/te/
+
+##########
%package Tajik
Summary: Tajik(tg) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Tajik < %{version}-%{release}
-Provides: trinity-kde-i18n-Tajik = %{version}-%{release}
+Provides: %{name}-tg = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Tajik < %{version}-%{release}
+Provides: trinity-kde-i18n-Tajik = %{version}-%{release}
+
%description Tajik
-%{summary}.
+This package contains %{summary}.
+
+%files Tajik
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/tg/
+
+##########
%package Thai
Summary: Thai(th) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Thai < %{version}-%{release}
-Provides: trinity-kde-i18n-Thai = %{version}-%{release}
+Provides: %{name}-th = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Thai < %{version}-%{release}
+Provides: trinity-kde-i18n-Thai = %{version}-%{release}
+
%description Thai
-%{summary}.
+This package contains %{summary}.
+
+%files Thai
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/th/
+
+##########
%package Turkish
Summary: Turkish(tr) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Turkish < %{version}-%{release}
-Provides: trinity-kde-i18n-Turkish = %{version}-%{release}
+Provides: %{name}-tr = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Turkish < %{version}-%{release}
+Provides: trinity-kde-i18n-Turkish = %{version}-%{release}
+
%description Turkish
-%{summary}.
+This package contains %{summary}.
+
+%files Turkish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/tr/
+%{tde_tdedocdir}/HTML/tr/
+
+##########
%package Ukrainian
Summary: Ukrainian(uk) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Ukrainian < %{version}-%{release}
-Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release}
+Provides: %{name}-uk = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Ukrainian < %{version}-%{release}
+Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release}
+
%description Ukrainian
-%{summary}.
+This package contains %{summary}.
+
+%files Ukrainian
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/uk/
+%{tde_datadir}/locale/uk/
+
+##########
+
+%package Uzbek
+Summary: Uzbek(uz) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-uz = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Uzbek < %{version}-%{release}
+Provides: trinity-kde-i18n-Uzbek = %{version}-%{release}
+
+%description Uzbek
+This package contains %{summary}.
+
+%files Uzbek
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/uz/
+
+##########
+
+%package Uzbek-Cyrillic
+Summary: Uzbek(uz@cyrillic) language support for TDE
+Group: User Interface/Desktops
+Provides: %{name}-uz@cyrillic = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Uzbek-Cyrillic < %{version}-%{release}
+Provides: trinity-kde-i18n-Uzbek-Cyrillic = %{version}-%{release}
+
+%description Uzbek-Cyrillic
+This package contains %{summary}.
+
+%files Uzbek-Cyrillic
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/uz@cyrillic/
+
+##########
%package Venda
Summary: Venda(ven) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Venda < %{version}-%{release}
-Provides: trinity-kde-i18n-Venda = %{version}-%{release}
+Provides: %{name}-ven = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Venda < %{version}-%{release}
+Provides: trinity-kde-i18n-Venda = %{version}-%{release}
+
%description Venda
-%{summary}.
+This package contains %{summary}.
+
+#%files Venda
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/ven/
+
+##########
%package Vietnamese
Summary: Vietnamese(vi) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Vietnamese < %{version}-%{release}
-Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release}
+Provides: %{name}-vi = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Vietnamese < %{version}-%{release}
+Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release}
+
%description Vietnamese
-%{summary}.
+This package contains %{summary}.
+
+%files Vietnamese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/vi/
+
+##########
%package Walloon
Summary: Walloon(wa) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Walloon < %{version}-%{release}
-Provides: trinity-kde-i18n-Walloon = %{version}-%{release}
+Provides: %{name}-wa = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Walloon < %{version}-%{release}
+Provides: trinity-kde-i18n-Walloon = %{version}-%{release}
+
%description Walloon
-%{summary}.
+This package contains %{summary}.
+
+%files Walloon
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/wa/
+
+##########
%package Xhosa
Summary: Xhosa(xh) (a Bantu language) support for TDE
Group: User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Xhosa < %{version}-%{release}
-Provides: trinity-kde-i18n-Xhosa = %{version}-%{release}
+Provides: %{name}-xh = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Xhosa < %{version}-%{release}
+Provides: trinity-kde-i18n-Xhosa = %{version}-%{release}
+
%description Xhosa
-%{summary}.
+This package contains %{summary}.
+
+#%files Xhosa
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/xh/
+
+##########
%package Chinese
Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Chinese < %{version}-%{release}
-Provides: trinity-kde-i18n-Chinese = %{version}-%{release}
+Provides: %{name}-zh_CN = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Chinese < %{version}-%{release}
+Provides: trinity-kde-i18n-Chinese = %{version}-%{release}
+
%description Chinese
-%{summary}.
+This package contains %{summary}.
+
+%files Chinese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/zh_CN/
+%{tde_tdedocdir}/HTML/zh_CN/
+
+##########
%package Chinese-Big5
Summary: Chinese(zh_TW) (Big5) language support for TDE
Group: User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
-Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
-Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
+Provides: %{name}-tz_TW = %{version}-%{release}
+Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
+Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
+
%description Chinese-Big5
-%{summary}.
+This package contains %{summary}.
+%files Chinese-Big5
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/zh_TW/
+%{tde_tdedocdir}/HTML/zh_TW/
+##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%build
unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
+. /etc/profile.d/qt3.sh
export KDEDIR=%{tde_prefix}
-
export kde_htmldir="%{tde_tdedocdir}/HTML"
(
@@ -721,6 +1456,7 @@ fi
wait
rm -f /tmp/rpmbuild.$$
+
%install
%__rm -rf %{?buildroot}
export PATH="%{tde_bindir}:${PATH}"
@@ -733,38 +1469,6 @@ for l in %{TDE_LANGS}; do
done
done
-# make symlinks relative
-%if "%{tde_prefix}" == "/usr"
-pushd "%{buildroot}%{tde_tdedocdir}/HTML"
-for lang in *; do
- if [ -d "$lang" ]; then
- pushd "$lang"
- for i in */*/*; do
- if [ -d $i -a -L $i/common ]; then
- rm -f $i/common
- ln -sf ../../../docs/common $i
- fi
- done
-
- for i in */*; do
- if [ -d $i -a -L $i/common ]; then
- rm -f $i/common
- ln -sf ../../docs/common $i
- fi
- done
-
- for i in *; do
- if [ -d $i -a -L $i/common ]; then
- rm -f $i/common
- ln -sf ../docs/common $i
- fi
- done
-
- popd
- fi
-done
-popd
-%endif
# remove zero-length file
find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
@@ -780,486 +1484,9 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
# remove obsolete KDE 3 application data translations
%__rm -rf "%{buildroot}%{tde_datadir}/apps"
+
%clean
%__rm -rf %{buildroot}
-%if "%( grep -w af <<< '%{TDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/af/*
-%{tde_tdedocdir}/HTML/af/
-%endif
-
-%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != ""
-%files Arabic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{TDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{TDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != ""
-%files Tibetan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bo/*
-%endif
-
-%if "%( grep -w br <<< '%{TDE_LANGS}' )" != ""
-%files Breton
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/br/*
-%endif
-
-%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != ""
-%files Bosnian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bs/*
-%endif
-
-%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != ""
-%files Catalan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ca/*
-%{tde_tdedocdir}/HTML/ca/
-%endif
-
-%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != ""
-%files Czech
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cs/*
-%{tde_tdedocdir}/HTML/cs/
-%endif
-
-%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != ""
-%files Welsh
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cy/*
-%endif
-
-%if "%( grep -w da <<< '%{TDE_LANGS}' )" != ""
-%files Danish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/da/*
-%{tde_tdedocdir}/HTML/da/
-%endif
-
-%if "%( grep -w de <<< '%{TDE_LANGS}' )" != ""
-%files German
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/de/*
-%{tde_tdedocdir}/HTML/de/
-%endif
-
-%if "%( grep -w el <<< '%{TDE_LANGS}' )" != ""
-%files Greek
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/el/*
-%endif
-
-%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != ""
-%files British
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/en_GB/*
-%{tde_tdedocdir}/HTML/en_GB/
-%endif
-
-%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != ""
-%files Esperanto
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eo/*
-%endif
-
-%if "%( grep -w es <<< '%{TDE_LANGS}' )" != ""
-%files Spanish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/es/*
-%{tde_tdedocdir}/HTML/es/
-%endif
-
-%if "%( grep -w et <<< '%{TDE_LANGS}' )" != ""
-%files Estonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/et/*
-%{tde_tdedocdir}/HTML/et/
-%endif
-
-%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != ""
-%files Basque
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eu/*
-%endif
-
-%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != ""
-%files Farsi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fa/*
-%endif
-
-%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != ""
-%files Finnish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fi/*
-%{tde_tdedocdir}/HTML/fi/
-%endif
-
-%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != ""
-%files Faroese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fo/*
-%endif
-
-%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != ""
-%files French
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fr/*
-%{tde_tdedocdir}/HTML/fr/
-%endif
-
-%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != ""
-%files Frisian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fy/*
-%endif
-
-%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != ""
-%files Irish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ga/*
-%endif
-
-%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != ""
-%files Galician
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/gl/*
-%endif
-
-%if "%( grep -w he <<< '%{TDE_LANGS}' )" != ""
-%files Hebrew
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/he/*
-%{tde_tdedocdir}/HTML/he/
-%endif
-
-%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != ""
-%files Hindi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hi/*
-%endif
-
-%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != ""
-%files Croatian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hr/*
-%{tde_tdedocdir}/HTML/hr/
-%endif
-
-%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != ""
-%files Hungarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hu/*
-%{tde_tdedocdir}/HTML/hu/
-%endif
-
-%if "%( grep -w id <<< '%{TDE_LANGS}' )" != ""
-%files Indonesian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/id/*
-%{tde_tdedocdir}/HTML/id/
-%endif
-
-%if "%( grep -w is <<< '%{TDE_LANGS}' )" != ""
-%files Icelandic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/is/*
-%endif
-
-%if "%( grep -w it <<< '%{TDE_LANGS}' )" != ""
-%files Italian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/it/*
-%{tde_tdedocdir}/HTML/it/
-%endif
-
-%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != ""
-%files Japanese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ja/*
-%{tde_tdedocdir}/HTML/ja/
-%endif
-
-%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != ""
-%files Korean
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ko/*
-%{tde_tdedocdir}/HTML/ko/
-%endif
-
-%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != ""
-%files Kurdish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ku/*
-%{tde_tdedocdir}/HTML/ku/
-%endif
-
-%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != ""
-%files Lao
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lo/*
-%{tde_tdedocdir}/HTML/lo/
-%endif
-
-%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != ""
-%files Lithuanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lt/*
-%endif
-
-%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != ""
-%files Latvian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lv/*
-%endif
-
-%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != ""
-%files Maori
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mi/*
-%endif
-
-%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != ""
-%files Macedonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mk/*
-%endif
-
-%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != ""
-%files Maltese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mt/*
-%endif
-
-%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != ""
-%files Dutch
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nl/*
-%{tde_tdedocdir}/HTML/nl/
-%endif
-
-%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != ""
-%files Norwegian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nb/*
-#%{tde_tdedocdir}/HTML/nb/
-%endif
-
-%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != ""
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nn/*
-#%{tde_tdedocdir}/HTML/nn/
-%endif
-
-%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != ""
-%files Occitan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/oc/*
-%endif
-
-%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != ""
-%files Punjabi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pa/*
-%endif
-
-%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != ""
-%files Polish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pl/*
-%{tde_tdedocdir}/HTML/pl/
-%endif
-
-%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != ""
-%files Portuguese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt/*
-%{tde_tdedocdir}/HTML/pt/
-%endif
-
-%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != ""
-%files Brazil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt_BR/*
-%{tde_tdedocdir}/HTML/pt_BR/
-%endif
-
-%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != ""
-%files Romanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ro/*
-%{tde_tdedocdir}/HTML/ro/
-%endif
-
-%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != ""
-%files Russian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ru/*
-%{tde_tdedocdir}/HTML/ru/
-%endif
-
-%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != ""
-%files Slovak
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sk/*
-%{tde_tdedocdir}/HTML/sk/
-%endif
-
-%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != ""
-%files Slovenian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sl/*
-%{tde_tdedocdir}/HTML/sl/
-%endif
-
-%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != ""
-%files Serbian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sr/*
-%{tde_tdedocdir}/HTML/sr/
-%endif
-
-%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != ""
-%files Swedish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sv/*
-%{tde_tdedocdir}/HTML/sv/
-%endif
-
-%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != ""
-%files Tamil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ta/*
-%endif
-
-%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != ""
-%files Tajik
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tg/*
-%endif
-
-%if "%( grep -w th <<< '%{TDE_LANGS}' )" != ""
-%files Thai
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/th/*
-%endif
-
-%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != ""
-%files Turkish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tr/*
-%{tde_tdedocdir}/HTML/tr/
-%endif
-
-%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != ""
-%files Ukrainian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/uk/
-%{tde_datadir}/locale/uk/*
-%endif
-
-%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != ""
-%files Venda
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ven/*
-%endif
-
-%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != ""
-%files Vietnamese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/vi/*
-%endif
-
-%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != ""
-%files Walloon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/wa/*
-%endif
-
-%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != ""
-%files Xhosa
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/xh/*
-%{tde_tdedocdir}/HTML/xh/
-%endif
-
-%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != ""
-%files Chinese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_CN/*
-%{tde_tdedocdir}/HTML/zh_CN/
-%endif
-
-%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != ""
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_TW/*
-%{tde_tdedocdir}/HTML/zh_TW/
-%endif
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
-
-* Wed Aug 15 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
-- Renames to 'trinity-i18n'
-- Updates 'zh_TW' translations
-
-* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Updates French translations (mostly Kickoff Menu related)
-
-* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Removes 'kde-filesystem" dependancy
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Fix HTML directory location
-
-* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Re-adds missing files 'entry.desktop'
-- Updates zh_TW translation, thanks to Wei-Lun Chao
-
-* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add missing french translations for TDE 3.5.13
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Initial version (French language only)
-- Based on RHEL SPEC file 'kde-i18n'
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
index e77a423c1..3e8d02cf6 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeaccessibility (version R14.0.0)
+# spec file for package tdeaccessibility (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,10 +21,13 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeaccessibility
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -34,16 +37,11 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-tdeaccessibility
Summary: Trinity Desktop Environment - Accessibility
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@@ -60,6 +58,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -85,14 +84,21 @@ BuildRequires: brp-check-trinity
BuildRequires: audiofile-devel
# AKODE support
-%if 0%{?with_akode}
+%define with_akode 1
BuildRequires: trinity-akode-devel
-%{?with_mad:BuildRequires: trinity-akode-libmad}
+
+# MAD support
+%ifarch %{ix86} x86_64
+%define with_libmad 1
+%{?with_libmad:BuildRequires: libakode_mpeg_decoder}
%endif
# ALSA support
BuildRequires: alsa-lib-devel
+# GLIB2 support
+BuildRequires: glib2-devel
+
# XCB support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
BuildRequires: libxcb-devel
@@ -207,20 +213,6 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%{tde_datadir}/icons/locolor/*/apps/kmag.png
%{tde_tdedocdir}/HTML/en/kmag/
-%post -n trinity-kmag
-/sbin/ldconfig ||:
-for icon_theme in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmag
-/sbin/ldconfig ||:
-for icon_theme in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
##########
%package -n trinity-kmousetool
@@ -242,18 +234,6 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
%{tde_tdedocdir}/HTML/en/kmousetool/
-%post -n trinity-kmousetool
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmousetool
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
##########
%package -n trinity-kmouth
@@ -270,7 +250,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmouth
%defattr(-,root,root,-)
-%{tde_datadir}/config/kmouthrc
+%{tde_confdir}/kmouthrc
%{tde_bindir}/kmouth
%{tde_tdeappdir}/kmouth.desktop
%{tde_datadir}/apps/kmouth/
@@ -281,18 +261,6 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%{tde_datadir}/icons/locolor/*/apps/kmouth.png
%{tde_tdedocdir}/HTML/en/kmouth/
-%post -n trinity-kmouth
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmouth
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
##########
%package -n trinity-ksayit
@@ -319,22 +287,6 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop
%{tde_tdedocdir}/HTML/en/ksayit/
-%post -n trinity-ksayit
-/sbin/ldconfig ||:
-for icon_theme in mono hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksayit
-/sbin/ldconfig ||:
-for icon_theme in mono hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kttsd
@@ -417,22 +369,6 @@ Homepage: http://accessibility.kde.org/developer/kttsd
%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
%{tde_tdedocdir}/HTML/en/kttsd/
-%post -n trinity-kttsd
-/sbin/ldconfig ||:
-for icon_theme in crystalsvg hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kttsd
-/sbin/ldconfig ||:
-for icon_theme in crystalsvg hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kttsd-contrib-plugins
@@ -484,12 +420,6 @@ programs.
%{tde_libdir}/libKTTSD_Lib.so
%{tde_tdeincludedir}/ksayit_fxplugin.h
-%post devel
-/sbin/ldconfig ||:
-
-%postun devel
-/sbin/ldconfig ||:
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -505,7 +435,7 @@ programs.
%__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -513,6 +443,7 @@ programs.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \
@@ -541,15 +472,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-# Avoid conflict with tdelibs
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
-
-# Move desktop files to correct XDG location
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmouth.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
# Adds missing icons in 'hicolor' theme
# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
@@ -558,6 +480,10 @@ for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i
for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png hicolor/"$i"x"$i"/apps/kcmkttsd.png ;done
popd
+# Avoid conflict with tdelibs
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
+
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -r kmag Utility Accessibility
@@ -577,5 +503,3 @@ popd
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
index 3f28a0b96..37aa24acf 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
@@ -1,56 +1,93 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdeaccessibility (version R14.0.0)
+#
+# 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 1
%define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdeaccessibility
+%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/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
-
-Summary: Trinity Desktop Environment - Accessibility
Name: trinity-tdeaccessibility
+Summary: Trinity Desktop Environment - Accessibility
Version: %{tde_version}
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-
-License: GPLv2
-Group: User Interface/Desktops
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
+Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}
+Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
-Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+%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)
-BuildRequires: autoconf automake libtool m4
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-akode-devel
-BuildRequires: trinity-arts-devel >= 1:1.5.10
+Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
-BuildRequires: alsa-lib-devel
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
-# X11 Libraries
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libXtst-devel
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
%endif
+# AUDIOFILE support
+BuildRequires: audiofile-devel
+
+# AKODE support
+%if 0%{?with_akode}
+BuildRequires: trinity-akode-devel
+%{?with_libmad:BuildRequires: trinity-akode-libmad}
+%endif
+
+# ALSA support
+BuildRequires: alsa-lib-devel
+
# XCB support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
BuildRequires: libxcb-devel
@@ -61,35 +98,24 @@ BuildRequires: %{_lib}xcb-devel
%endif
%endif
-# X11 stuff
+# XAU support
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xi-devel
%if 0%{?mgaversion} >= 4
-BuildRequires: %{_lib}xext-devel
-BuildRequires: %{_lib}x11-devel
BuildRequires: %{_lib}xau-devel
%else
-BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
-BuildRequires: %{_lib}x11%{?mgaversion:_6}-devel
BuildRequires: %{_lib}xau%{?mgaversion:6}-devel
%endif
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires: libXi-devel
-BuildRequires: libXext-devel
-BuildRequires: libX11-devel
BuildRequires: libXau-devel
%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140
-BuildRequires: xorg-x11-devel
-%endif
Obsoletes: trinity-kdeaccessibility < %{version}-%{release}
Provides: trinity-kdeaccessibility = %{version}-%{release}
Obsoletes: trinity-kdeaccessibility-libs < %{version}-%{release}
Provides: trinity-kdeaccessibility-libs = %{version}-%{release}
-Requires: trinity-kde-icons-mono = %{version}-%{release}
+Requires: trinity-tde-icons-mono = %{version}-%{release}
Requires: trinity-kbstate = %{version}-%{release}
Requires: trinity-kmag = %{version}-%{release}
Requires: trinity-kmousetool = %{version}-%{release}
@@ -111,7 +137,7 @@ Included with this package are:
%package -n trinity-tde-icons-mono
Summary: A monochromatic icons theme for TDE
-Group: User Interface/Desktops
+Group: System/GUI/Other
Obsoletes: trinity-kde-icons-mono < %{version}-%{release}
Provides: trinity-kde-icons-mono = %{version}-%{release}
@@ -123,14 +149,21 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-tde-icons-mono
%defattr(-,root,root,-)
+%dir %{tde_datadir}/icons/mono
+%dir %{tde_datadir}/icons/mono/scalable
+%dir %{tde_datadir}/icons/mono/scalable/actions
+%dir %{tde_datadir}/icons/mono/scalable/apps
+%dir %{tde_datadir}/icons/mono/scalable/devices
+%dir %{tde_datadir}/icons/mono/scalable/filesystems
+%dir %{tde_datadir}/icons/mono/scalable/mimetypes
%{tde_datadir}/icons/mono/index.theme
%{tde_datadir}/icons/mono/scalable/*/*.svgz
##########
%package -n trinity-kbstate
-Summary: a keyboard status applet for TDE
-Group: User Interface/Desktops
+Summary: A keyboard status applet for TDE
+Group: System/GUI/Other
%description -n trinity-kbstate
A panel applet that displays the keyboard status.
@@ -148,7 +181,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%package -n trinity-kmag
Summary: A screen magnifier for TDE
-Group: User Interface/Desktops
+Group: System/GUI/Other
%description -n trinity-kmag
TDE's screen magnifier tool.
@@ -163,7 +196,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmag
%defattr(-,root,root,-)
%{tde_bindir}/kmag
-%{tde_datadir}/applnk/Applications/kmag.desktop
+%{tde_tdeappdir}/kmag.desktop
%{tde_datadir}/apps/kmag/
%{tde_datadir}/icons/hicolor/*/apps/kmag.png
%{tde_datadir}/icons/locolor/*/apps/kmag.png
@@ -187,7 +220,7 @@ done
%package -n trinity-kmousetool
Summary: TDE mouse manipulation tool for the disabled
-Group: User Interface/Desktops
+Group: System/GUI/Other
%description -n trinity-kmousetool
KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
@@ -199,7 +232,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmousetool
%defattr(-,root,root,-)
%{tde_bindir}/kmousetool
-%{tde_datadir}/applnk/Applications/kmousetool.desktop
+%{tde_tdeappdir}/kmousetool.desktop
%{tde_datadir}/apps/kmousetool/
%{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
%{tde_tdedocdir}/HTML/en/kmousetool/
@@ -220,7 +253,7 @@ done
%package -n trinity-kmouth
Summary: A type-and-say KDE frontend for speech synthesizers
-Group: User Interface/Desktops
+Group: System/GUI/Other
%description -n trinity-kmouth
KDE's type-and-say frontend for speech synthesizers.
@@ -234,7 +267,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%defattr(-,root,root,-)
%{tde_datadir}/config/kmouthrc
%{tde_bindir}/kmouth
-%{tde_datadir}/applnk/Applications/kmouth.desktop
+%{tde_tdeappdir}/kmouth.desktop
%{tde_datadir}/apps/kmouth/
%{tde_datadir}/icons/hicolor/*/actions/speak.png
%{tde_datadir}/icons/hicolor/*/actions/nospeak.png
@@ -259,7 +292,7 @@ done
%package -n trinity-ksayit
Summary: A frontend for the TDE Text-to-Speech system
-Group: User Interface/Desktops
+Group: System/GUI/Other
%description -n trinity-ksayit
Text-to-speech front-end to kttsd.
@@ -269,7 +302,6 @@ This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-ksayit
%defattr(-,root,root,-)
%{tde_bindir}/ksayit
-%{tde_tdeincludedir}/ksayit_fxplugin.h
%{tde_tdelibdir}/libFreeverb_plugin.la
%{tde_tdelibdir}/libFreeverb_plugin.so
%{tde_libdir}/libKTTSD_Lib.so.*
@@ -301,7 +333,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kttsd
Summary: A Text-to-Speech system for TDE
-Group: User Interface/Desktops
+Group: System/GUI/Other
%description -n trinity-kttsd
The KDE Text-to-Speech system is a plugin based service that allows any KDE
@@ -322,8 +354,10 @@ Homepage: http://accessibility.kde.org/developer/kttsd
%{tde_tdelibdir}/kcm_kttsd.so
%{tde_tdelibdir}/ktexteditor_kttsd.la
%{tde_tdelibdir}/ktexteditor_kttsd.so
+%if 0%{?with_akode}
%{tde_tdelibdir}/libkttsd_akodeplugin.la
%{tde_tdelibdir}/libkttsd_akodeplugin.so
+%endif
%{tde_tdelibdir}/libkttsd_alsaplugin.la
%{tde_tdelibdir}/libkttsd_alsaplugin.so
%{tde_tdelibdir}/libkttsd_artsplugin.la
@@ -349,14 +383,18 @@ Homepage: http://accessibility.kde.org/developer/kttsd
%{tde_libdir}/libkttsd.so.*
%{tde_tdeappdir}/kcmkttsd.desktop
%{tde_tdeappdir}/kttsmgr.desktop
-%{tde_datadir}/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
+%{tde_datadir}/apps/ktexteditor_kttsd/
%exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
%{tde_datadir}/apps/kttsd/
%{tde_datadir}/icons/hicolor/16x16/actions/female.png
%{tde_datadir}/icons/hicolor/16x16/actions/male.png
+%{tde_datadir}/icons/hicolor/*/apps/kttsd.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmkttsd.png
%{tde_datadir}/services/ktexteditor_kttsd.desktop
%{tde_datadir}/services/kttsd.desktop
+%if 0%{?with_akode}
%{tde_datadir}/services/kttsd_akodeplugin.desktop
+%endif
%{tde_datadir}/services/kttsd_alsaplugin.desktop
%{tde_datadir}/services/kttsd_artsplugin.desktop
%{tde_datadir}/services/kttsd_commandplugin.desktop
@@ -371,8 +409,6 @@ Homepage: http://accessibility.kde.org/developer/kttsd
%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz
%{tde_tdedocdir}/HTML/en/kttsd/
%post -n trinity-kttsd
@@ -394,8 +430,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kttsd-contrib-plugins
-Summary: the TDE Text-to-Speech system
-Group: User Interface/Desktops
+Summary: The TDE Text-to-Speech system
+Group: System/GUI/Other
Requires: trinity-kttsd = %{version}-%{release}
%description -n trinity-kttsd-contrib-plugins
@@ -420,16 +456,19 @@ This package is part of Trinity, as a component of the TDE accessibility module.
##########
%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
+Summary: Development files for tdeaccessibility
+Group: Development/Libraries/X11
Requires: %{name} = %{version}-%{release}
Requires: trinity-tdelibs-devel >= %{version}
+Requires: libjpeg-devel
+Requires: libpng-devel
Obsoletes: trinity-kdeaccessibility-devel < %{version}-%{release}
Provides: trinity-kdeaccessibility-devel = %{version}-%{release}
%description devel
-%{summary}.
+This package contains the development file for TDE accessibility
+programs.
%files devel
%defattr(-,root,root,-)
@@ -437,6 +476,7 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release}
%{tde_libdir}/libkttsd.so
%{tde_libdir}/libKTTSD_Lib.la
%{tde_libdir}/libKTTSD_Lib.so
+%{tde_tdeincludedir}/ksayit_fxplugin.h
%post devel
/sbin/ldconfig ||:
@@ -446,7 +486,7 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release}
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -455,8 +495,11 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+# Update icons for some control center modules
+%__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
+
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -492,7 +535,7 @@ fi
--enable-rpath \
\
--enable-ksayit-audio-plugins \
- --with-akode
+ %{?with_akode:--with-akode} %{?!with_akode:--without-akode}
%__make %{?_smp_mflags}
@@ -502,14 +545,39 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
+# Move desktop files to correct XDG location
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmouth.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Adds missing icons in 'hicolor' theme
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png hicolor/"$i"x"$i"/apps/kttsd.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png hicolor/"$i"x"$i"/apps/kcmkttsd.png ;done
+popd
+
+# Avoid conflict with tdelibs
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kmag Utility Accessibility
+%suse_update_desktop_file kmousetool Utility Accessibility
+%suse_update_desktop_file kmouth Utility Accessibility
+%suse_update_desktop_file kttsmgr Utility Accessibility
+%suse_update_desktop_file ksayit Utility Accessibility
+%suse_update_desktop_file kcmkttsd Utility Accessibility
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
%clean
%__rm -rf %{buildroot}
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc b/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
index 2758ba766..5d546fb8e 100644
--- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeaddons
+# spec file for package tdeaddons (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -20,7 +20,9 @@
# Having KDE libraries may cause FTBFS here !
# TDE variables
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeaddons
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -33,16 +35,11 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Summary: Trinity Desktop Environment - Plugins
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: User Interface/Desktops
URL: http://www.trinitydesktop.org/
@@ -113,6 +110,9 @@ BuildRequires: gamin-devel
BuildRequires: pcre-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# DB4/DB5 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
%define with_db 1
@@ -190,20 +190,6 @@ America and Europe.
%{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
%{tde_tdedocdir}/HTML/en/atlantikdesigner/
-%post -n trinity-atlantikdesigner
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-atlantikdesigner
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kaddressbook-plugins
@@ -399,18 +385,6 @@ controls XMMS, install the xmms-kde-trinity package.
%{tde_datadir}/icons/crystalsvg/*/apps/ktimemon.png
%{tde_tdedocdir}/HTML/en/kicker-applets/
-%post -n trinity-kicker-applets
-for f in crystalsvg locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-kicker-applets
-for f in crystalsvg locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
##########
%package -n trinity-knewsticker-scripts
@@ -597,18 +571,6 @@ graphical disk usage viewer and image conversions and transformations.
%{tde_tdelibdir}/libadblock.so
%{tde_tdedocdir}/HTML/en/konq-plugins/
-%post -n trinity-konq-plugins
-for f in crystalsvg hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-konq-plugins
-for f in crystalsvg hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
##########
%package -n trinity-ksig
@@ -634,20 +596,6 @@ signatures in external mail clients such as KMail.
%{tde_datadir}/icons/hicolor/*/apps/ksig.png
%{tde_tdedocdir}/HTML/en/ksig/
-%post -n trinity-ksig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-noatun-plugins
@@ -705,18 +653,6 @@ of user interfaces, playlists and visualisation plugins.
%{tde_datadir}/apps/noatun/*
%{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
-%post -n trinity-noatun-plugins
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-noatun-plugins
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -812,5 +748,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec
index 4dca62ca8..ea4c3ccfa 100644
--- a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec
+++ b/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
%define tde_version 3.5.13.2
# TDE specific building variables
@@ -22,7 +17,7 @@
Name: trinity-tdeaddons
Summary: Trinity Desktop Environment - Plugins
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
License: GPLv2
Group: User Interface/Desktops
@@ -687,7 +682,7 @@ done
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -738,9 +733,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-
diff --git a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
index 0b1312a57..668e97ccb 100644
--- a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeadmin (version R14.0.0)
+# spec file for package tdeadmin (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,10 +21,14 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeadmin
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%define tde_sbindir %{tde_prefix}/sbin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -39,7 +43,7 @@
Name: trinity-%{tde_pkg}
Summary: Administrative tools for TDE
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@@ -99,7 +103,6 @@ BuildRequires: pam-devel
BuildRequires: lilo
%endif
-Requires: trinity-tdeadmin = %{version}-%{release}
Requires: trinity-kcron = %{version}-%{release}
Requires: trinity-kdat = %{version}-%{release}
Requires: %{name}-kfile-plugins = %{version}-%{release}
@@ -147,20 +150,6 @@ It is a graphical user interface to cron, the UNIX system scheduler.
%{tde_datadir}/icons/hicolor/*/apps/kcron.png
%{tde_tdedocdir}/HTML/en/kcron/
-%post -n trinity-kcron
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcron
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kdat
@@ -188,20 +177,6 @@ Main features are:
%{tde_datadir}/icons/locolor/*/apps/kdat.png
%{tde_tdedocdir}/HTML/en/kdat/
-%post -n trinity-kdat
-for icon_theme in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdat
-for icon_theme in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package kfile-plugins
@@ -245,18 +220,6 @@ can be used to manage network devices and settings for each device.
%{tde_tdelibdir}/kcm_knetworkconfmodule.la
%{tde_tdedocdir}/HTML/en/knetworkconf/
-%post -n trinity-knetworkconf
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-knetworkconf
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
##########
%package -n trinity-kpackage
@@ -274,24 +237,10 @@ install/remove them.
%{tde_bindir}/kpackage
%{tde_tdeappdir}/kpackage.desktop
%{tde_datadir}/apps/kpackage/
-%{tde_datadir}/config/kpackagerc
+%{tde_confdir}/kpackagerc
%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
%{tde_tdedocdir}/HTML/en/kpackage/
-%post -n trinity-kpackage
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpackage
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ksysv
@@ -308,27 +257,13 @@ drag and drop GUI.
%{tde_bindir}/ksysv
%{tde_tdeappdir}/ksysv.desktop
%{tde_datadir}/apps/ksysv/
-%{tde_datadir}/config/ksysvrc
+%{tde_confdir}/ksysvrc
%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png
%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
%{tde_datadir}/mimelnk/application/x-ksysv.desktop
%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
%{tde_tdedocdir}/HTML/en/ksysv/
-%post -n trinity-ksysv
-for icon_theme in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksysv
-for icon_theme in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kuser
@@ -354,7 +289,7 @@ A user/group administration tool for TDE.
%{tde_bindir}/kuser
%{tde_tdeappdir}/kuser.desktop
%{tde_datadir}/apps/kuser/
-%{tde_datadir}/config/kuserrc
+%{tde_confdir}/kuserrc
%{tde_datadir}/config.kcfg/kuser.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kuser.png
%{tde_tdedocdir}/HTML/en/kuser/
@@ -366,20 +301,6 @@ A user/group administration tool for TDE.
%config(noreplace) /etc/security/console.apps/kuser
%endif
-%post -n trinity-kuser
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kuser
-for icon_theme in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%if 0%{?with_lilo}
@@ -420,13 +341,14 @@ touch /etc/lilo.conf
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
@@ -453,7 +375,11 @@ fi
--with-rpm \
--with-pam=kde \
--with-shadow \
- --with-private-groups
+ --with-private-groups \
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+ --with-first-uid=1000 \
+ --with-first-gid=1000 \
+%endif
%__make %{?_smp_mflags} || %__make
@@ -470,7 +396,8 @@ comps="kcron kdat knetworkconf kpackage ksysv kuser"
%{buildroot}%{tde_sbindir} \
%{buildroot}%{_sbindir}
-%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
+%__mkdir_p "%{buildroot}%{tde_confdir}/"
+%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} "%{buildroot}%{tde_confdir}/"
%if 0%{?with_consolehelper}
# Run kuser through consolehelper
@@ -529,5 +456,3 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec b/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec
index 38e835e4e..c6377059d 100644
--- a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec
+++ b/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec
@@ -1,43 +1,60 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdeadmin (version 3.5.13-SRU)
+#
+# 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 1
%define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdeadmin
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_sbindir %{tde_prefix}/sbin
%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_sbindir %{tde_prefix}/sbin
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-tdeadmin
-Summary: Administrative tools for TDE
-Version: %{tde_version}
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: trinity-%{tde_pkg}
+Summary: Administrative tools for TDE
+Version: %{tde_version}
+Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}
+Group: System/GUI/Other
+URL: http://www.trinitydesktop.org/
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Prefix: %{tde_prefix}
+#Vendor: Trinity Project
+#Packager: Francois Andriot <francois.andriot@free.fr>
-Obsoletes: trinity-kdeadmin < %{version}-%{release}
-Provides: trinity-kdeadmin = %{version}-%{release}
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kuser.pam
@@ -46,17 +63,39 @@ Source5: kpackagerc
Source6: ksysvrc
Source7: kuserrc
-BuildRequires: autoconf automake libtool m4
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+Obsoletes: trinity-kdeadmin < %{version}-%{release}
+Provides: trinity-kdeadmin = %{version}-%{release}
+
+BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: m4
+BuildRequires: fdupes
+BuildRequires: gcc-c++
+
+# 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
+
+# RPM support
BuildRequires: rpm-devel
+
+# PAM support
BuildRequires: pam-devel
+# LILO support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_lilo 1
+#define with_lilo 1
%endif
-
%if 0%{?with_lilo}
BuildRequires: lilo
%endif
@@ -70,6 +109,8 @@ Requires: trinity-ksysv = %{version}-%{release}
Requires: trinity-kuser = %{version}-%{release}
%if 0%{?with_lilo}
Requires: trinity-lilo-config = %{version}-%{release}
+%else
+Obsoletes: trinity-lilo-config
%endif
# CONSOLEHELPER (usermode) support
@@ -96,7 +137,7 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
%package -n trinity-kcron
Summary: The Trinity crontab editor
-Group: Applications/Utilities
+Group: System/GUI/Other
%description -n trinity-kcron
KCron is an application for scheduling programs to run in the background.
@@ -106,7 +147,7 @@ It is a graphical user interface to cron, the UNIX system scheduler.
%defattr(-,root,root,-)
%{tde_bindir}/kcron
%{tde_tdeappdir}/kcron.desktop
-%{tde_datadir}/apps/kcron/kcronui.rc
+%{tde_datadir}/apps/kcron/
%{tde_datadir}/icons/hicolor/*/apps/kcron.png
%{tde_tdedocdir}/HTML/en/kcron/
@@ -128,7 +169,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kdat
Summary: A Trinity tape backup tool
-Group: Applications/Utilities
+Group: System/GUI/Other
%description -n trinity-kdat
KDat is a tar-based tape archiver. It is designed to work with multiple
@@ -169,10 +210,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package kfile-plugins
Summary: Trinity file metainfo plugins for deb and rpm files
-Group: Environment/Libraries
+Group: System/GUI/Other
%description kfile-plugins
-File metainfo plugins for deb and rpm package files.
+This package contains the Trinity File metainfo plugins for deb and rpm
+package files.
%files kfile-plugins
%defattr(-,root,root,-)
@@ -187,7 +229,7 @@ File metainfo plugins for deb and rpm package files.
%package -n trinity-knetworkconf
Summary: Trinity network configuration tool
-Group: Applications/Utilities
+Group: System/GUI/Other
%description -n trinity-knetworkconf
This is a TDE control center module to configure TCP/IP settings. It
@@ -223,7 +265,7 @@ done
%package -n trinity-kpackage
Summary: Trinity package management tool
-Group: Applications/Utilities
+Group: System/GUI/Other
%description -n trinity-kpackage
This is a frontend to both .rpm and .deb package formats. It allows you
@@ -258,7 +300,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-ksysv
Summary: Trinity SysV-style init configuration editor
-Group: Applications/Utilities
+Group: System/GUI/Other
%description -n trinity-ksysv
This program allows you to edit your start and stop scripts using a
@@ -295,7 +337,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kuser
Summary: Trinity user/group administration tool
-Group: Applications/Utilities
+Group: System/GUI/Other
%if 0%{?with_consolehelper}
# package 'usermode' provides '/usr/bin/consolehelper-gtk'
@@ -347,7 +389,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%if 0%{?with_lilo}
%package -n trinity-lilo-config
Summary: Trinity frontend for lilo configuration
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: trinity-kcontrol
Requires: trinity-tdebase-bin
#Requires: lilo
@@ -372,7 +414,7 @@ touch /etc/lilo.conf
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -382,7 +424,7 @@ touch /etc/lilo.conf
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -468,14 +510,29 @@ done
# * Removed useless program secpolicy. (Closes: #399426)
%__rm -f %{?buildroot}%{tde_bindir}/secpolicy
+# Remove lilo related files, if unwanted.
+%if 0%{?with_lilo} == 0
+%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/lilo-config/
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.la
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.so
+%__rm -f %{?buildroot}%{tde_tdeappdir}/lilo.desktop
+%endif
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kdat System Backup
+%suse_update_desktop_file kpackage System PackageManager
+%suse_update_desktop_file kcron System ServiceConfiguration
+%suse_update_desktop_file ksysv System ServiceConfiguration
+%suse_update_desktop_file kuser System SystemSetup
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
%clean
%__rm -rf %{buildroot}
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
index 78ebaffcd..3d31f7233 100644
--- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeartwork (version R14.0.0)
+# spec file for package tdeartwork (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,7 +21,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeartwork
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -39,7 +41,7 @@
Name: trinity-%{tde_pkg}
Summary: Additional artwork (themes, sound themes, ...) for TDE
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@@ -74,6 +76,9 @@ BuildRequires: libidn-devel
# ESOUND support
BuildRequires: esound-devel
+# ACL support
+BuildRequires: libacl-devel
+
# MESA support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: mesa-libGL-devel
@@ -98,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} || 0%{?with_xscreensaver}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5
@@ -106,7 +111,7 @@ BuildRequires: libXScrnSaver-devel
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
BuildRequires: xscreensaver-extras
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora}
BuildRequires: xscreensaver-extras-base
%endif
BuildRequires: xscreensaver-gl-base
@@ -140,7 +145,7 @@ BuildRequires: xscreensaver-gl
%endif
# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%define with_jack 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%define jack_devel %{_lib}jack-devel
@@ -161,6 +166,9 @@ BuildRequires: %{jack_devel}
BuildRequires: gamin-devel
%endif
+# OPENSSL support
+BuildRequires: openssl-devel
+
# Metapackage
Requires: %{name}-emoticons = %{version}-%{release}
@@ -273,18 +281,6 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/icons/locolor/index.theme
%{tde_datadir}/icons/locolor/*/*/*.png
-%post theme-icon
-for i in locolor ikons kdeclassic kids slick ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
-%postun theme-icon
-for i in locolor ikons kdeclassic kids slick ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
##########
%package theme-window
@@ -485,11 +481,38 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
%{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
%{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
%{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
+%endif
+%if 0%{?rhel} == 5
+%{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/critical.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flag.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/forest.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/laser.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/vines.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
+%endif
+
+%endif
##########
@@ -548,177 +571,122 @@ This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-tdescreensaver-xsavers-extra
%defattr(-,root,root,-)
-%{tde_datadir}/applnk/System/ScreenSavers/anemone.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/anemotaxis.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/antmaze.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/apollonian.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/apple2.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/atlantis.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/attraction.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/barcode.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blaster.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blitspin.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blocktube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boing.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bouboule.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bouncingcow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boxed.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boxfit.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bsod.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bumps.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cage.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/carousel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ccurve.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/celtic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cloudlife.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/compass.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/coral.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/crackberg.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/crystal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cube21.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cubenetic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cynosure.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/dangerball.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/decayscreen.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/deluxe.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/demon.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/discrete.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/drift.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/epicycle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/eruption.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/euler2d.desktop
-%if 0%{?rhel} != 7
-%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop
-%endif
-%{tde_datadir}/applnk/System/ScreenSavers/fadeplot.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fireworkx.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flame.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fliptext.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fluidballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flurry.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fontglide.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glhanoi.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glplanet.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/goop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/grav.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/greynetic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/halftone.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/halo.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/helix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hopalong.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ifs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/imsmap.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/interaggregate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/interference.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/intermomentary.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/jigsaw.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/juggler3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/julia.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kaleidescope.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/klein.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kumppa.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lament.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/loop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/maze.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/memscroller.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/menger.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moire.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moire2.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/mountain.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/munch.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/nerverot.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/noof.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/noseguy.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pacman.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pedal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/penetrate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/petri.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/phosphor.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/piecewise.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pinion.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/polyominoes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pong.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/providence.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pyro.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/qix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rd-bomb.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rorschach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rotzoomer.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rubik.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sierpinski.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/slip.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/speedmine.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/spotlight.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sproingies.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/squiral.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/stairs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/starfish.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/starwars.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/strange.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/substrate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tangram.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/thornbird.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/timetunnel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/triangle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/truchet.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/twang.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/vermiculate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/wander.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/whirlwindwarp.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/wormhole.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xanalogtv.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xflame.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xrayswarm.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xspirograph.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop
-
-# These screensavers do not exist on OpenSuse
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%{tde_datadir}/applnk/System/ScreenSavers/vidwhacker.desktop
-%endif
-
-# These screensavers do not exist on Mageia / Mandriva
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
-%endif
-
-%if 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?fedora} >= 15 || 0%{?pclinuxos}
-%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
-%endif
-
-%if 0%{?mgaversion} || 0%{?rhel} >= 7 || 0%{?fedora} >= 15 || 0%{?pclinuxos}
-%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
-%endif
-
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?mgaversion} >= 4 || 0%{?rhel} >= 7
-%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
-%endif
-
-%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4 || 0%{?rhel} >= 7
-%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
-%endif
-
-%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
-%endif
-
-%if 0%{?fedora} >= 20
-%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
-%endif
-
-%endif
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
+%endif
+%if 0%{?rhel} == 5
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/critical.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flag.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/forest.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/laser.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/vines.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
+%endif
+
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop
+
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
+
+%{tde_datadir}/applnk/System/ScreenSavers/*.desktop
##########
@@ -796,18 +764,9 @@ chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage"
chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage-file"
%endif
-# Fix missing screensavers on Fedora 20
-%if 0%{?with_xscreensaver} && 0%{?fedora} >= 20
-touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop"
-touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop"
-touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop"
-%endif
-
%clean
%__rm -rf %{buildroot}
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec
index 87f00043e..e1d12b94c 100644
--- a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec
+++ b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
%define tde_version 3.5.13.2
# TDE specific building variables
@@ -23,7 +18,7 @@
Name: trinity-tdeartwork
Summary: Additional artwork (themes, sound themes, ...) for TDE
Version: %{tde_version}
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
License: GPLv2
Group: User Interface/Desktops
@@ -747,8 +742,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21
@@ -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.fc22 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc22
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc22
@@ -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.fc23 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23
@@ -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.fc24 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc24
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc24
@@ -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.fc25 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc25
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc25
@@ -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.fc26 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc26
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc26
@@ -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.fc27 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc27
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc27
@@ -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.fc28 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28
@@ -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.mga5 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5
@@ -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.mga6 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6
@@ -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.pclos2015 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc21 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc21
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc21
@@ -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.fc22 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc22
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc22
@@ -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.fc23 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc23
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc23
@@ -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.fc24 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc24
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc24
@@ -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.fc25 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc25
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc25
@@ -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.fc26 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc26
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc26
@@ -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.fc27 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc27
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc27
@@ -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.fc28 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28
@@ -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.mga5 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga5
new file mode 100644
index 000000000..f884c1de6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga5
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6
new file mode 100644
index 000000000..f884c1de6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015
new file mode 100644
index 000000000..690b4df08
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016
new file mode 100644
index 000000000..690b4df08
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017
new file mode 100644
index 000000000..690b4df08
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018
new file mode 100644
index 000000000..690b4df08
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc21 b/redhat/main/tdebase/pamd.kdm-trinity.fc21
new file mode 100644
index 000000000..686433fce
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc21
@@ -0,0 +1,19 @@
+#%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 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 include postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc22 b/redhat/main/tdebase/pamd.kdm-trinity.fc22
new file mode 100644
index 000000000..e72140962
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc22
@@ -0,0 +1,21 @@
+#%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 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 include postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc23 b/redhat/main/tdebase/pamd.kdm-trinity.fc23
new file mode 100644
index 000000000..e72140962
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc23
@@ -0,0 +1,21 @@
+#%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 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 include postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc24 b/redhat/main/tdebase/pamd.kdm-trinity.fc24
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc24
@@ -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.fc25 b/redhat/main/tdebase/pamd.kdm-trinity.fc25
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc25
@@ -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.fc26 b/redhat/main/tdebase/pamd.kdm-trinity.fc26
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc26
@@ -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.fc27 b/redhat/main/tdebase/pamd.kdm-trinity.fc27
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc27
@@ -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.fc28 b/redhat/main/tdebase/pamd.kdm-trinity.fc28
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc28
@@ -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.mga5 b/redhat/main/tdebase/pamd.kdm-trinity.mga5
new file mode 100644
index 000000000..cb0982c9a
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.mga5
@@ -0,0 +1,15 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_succeed_if.so
+auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
+auth substack system-auth
+-auth optional pam_kwallet.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga6 b/redhat/main/tdebase/pamd.kdm-trinity.mga6
new file mode 100644
index 000000000..cb0982c9a
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.mga6
@@ -0,0 +1,15 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_succeed_if.so
+auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
+auth substack system-auth
+-auth optional pam_kwallet.so
+account required pam_nologin.so
+account include system-auth
+password include system-auth
+session required pam_loginuid.so
+session optional pam_console.so
+session optional pam_keyinit.so force revoke
+session required pam_namespace.so
+session include system-auth
+-session optional pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015
new file mode 100644
index 000000000..87d080f58
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-auth
+auth required pam_nologin.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
+session required pam_namespace.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2016
new file mode 100644
index 000000000..87d080f58
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2016
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-auth
+auth required pam_nologin.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
+session required pam_namespace.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2017
new file mode 100644
index 000000000..87d080f58
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2017
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-auth
+auth required pam_nologin.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
+session required pam_namespace.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2018 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2018
new file mode 100644
index 000000000..87d080f58
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2018
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-auth
+auth required pam_nologin.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
+session required pam_namespace.so
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21
@@ -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.fc22 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc22
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc22
@@ -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.fc23 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23
@@ -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.fc24 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc24
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc24
@@ -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.fc25 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc25
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc25
@@ -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.fc26 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc26
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc26
@@ -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.fc27 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc27
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc27
@@ -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.fc28 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28
@@ -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.mga5 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5
@@ -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.mga6 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6
@@ -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.pclos2015 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 0844117f2..f87ab705a 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdebase (version R14.0.0)
+# spec file for package tdebase (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,15 +12,18 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdebase
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -34,15 +37,10 @@
%define tdm_datadir %{tde_datadir}/apps/%{tdm}
%define starttde starttde
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity Base Programs
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@@ -60,7 +58,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1: trinity-tdebase-rpmlintrc
+Source1: %{name}-rpmlintrc
# Pam configuration files for RHEL / Fedora
%if 0%{?suse_version} == 0
@@ -71,7 +69,9 @@ Source5: pamd.kscreensaver-trinity%{?dist}
%endif
# openSUSE: configuration file for TDM
+%if 0%{?suse_version} >= 1210
Source6: suse-displaymanagers-tdm
+%endif
# Fedora 18: use SYSTEMD for TDM startup
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@@ -80,7 +80,7 @@ Source7: tdm.service%{?dist}
# openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
%if 0%{?suse_version} == 1140
-Source7: xdm.oss114
+Source7: xdm%{?dist}
%endif
# Fedora >= 17: special selinux policy required for TDM
@@ -170,6 +170,70 @@ Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
+# Fedora 21 Theme
+%if 0%{?fedora} == 21
+Requires: f21-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f21/default/standard/f21.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 22 Theme
+%if 0%{?fedora} == 22
+Requires: f22-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f22/default/standard/f22.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 23 Theme
+%if 0%{?fedora} == 23
+Requires: f23-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f23/default/standard/f23.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 24 Theme
+%if 0%{?fedora} == 24
+Requires: f24-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f24/default/standard/f24.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 25 Theme
+%if 0%{?fedora} == 25
+Requires: f25-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f25/default/standard/f25.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 26 Theme
+%if 0%{?fedora} == 26
+Requires: f26-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f26/default/standard/f26.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 27 Theme
+%if 0%{?fedora} == 27
+Requires: f27-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f27/default/standard/f27.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# Fedora 28 Theme
+%if 0%{?fedora} == 28
+Requires: f28-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png
+Requires: fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
# RHEL 4 Theme
%if 0%{?rhel} == 4
Requires: desktop-backgrounds-basic
@@ -220,6 +284,20 @@ Requires: mageia-theme-Default
%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
%endif
+# Mageia 5 Theme
+%if 0%{?mgaversion} == 5
+Requires: mageia-theme-Default
+%define tde_bg /usr/share/mga/backgrounds/default.jpg
+%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
+%endif
+
+# Mageia 6 Theme
+%if 0%{?mgaversion} == 6
+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
@@ -235,7 +313,7 @@ Requires: desktop-common-data
# OpenSuse 11.4 Theme
%if "%{?suse_version}" == "1140"
-Requires: hicolor-icon-theme-branding = 11.4
+Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
@@ -243,7 +321,7 @@ Requires: hicolor-icon-theme-branding = 11.4
%if "%{?suse_version}" == "1220"
Requires: wallpaper-branding = 12.2
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires: hicolor-icon-theme-branding = 12.2
+Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
@@ -251,7 +329,7 @@ Requires: hicolor-icon-theme-branding = 12.2
%if "%{?suse_version}" == "1230"
Requires: wallpaper-branding = 12.3
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires: hicolor-icon-theme-branding = 12.3
+Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
@@ -259,7 +337,7 @@ Requires: hicolor-icon-theme-branding = 12.3
%if "%{?suse_version}" == "1310"
Requires: wallpaper-branding = 13.1
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires: hicolor-icon-theme-branding = 13.1
+Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
@@ -267,7 +345,39 @@ Requires: hicolor-icon-theme-branding = 13.1
%if "%{?suse_version}" == "1320"
Requires: wallpaper-branding = 13.2
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires: hicolor-icon-theme-branding = 13.2
+Requires: hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
+# OpenSuse 42.1 Theme
+%if "%{?sle_version}" == "120100"
+Requires: wallpaper-branding = 42.1
+%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 42.2 Theme
+%if "%{?sle_version}" == "120200"
+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 42.3 Theme
+%if "%{?sle_version}" == "120300"
+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 15.0 Theme
+%if "%{?suse_version}" == "1500"
+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
@@ -311,9 +421,11 @@ BuildRequires: %{_lib}sasl2-devel
BuildRequires: cyrus-sasl-devel
%endif
-# LIBUSB support
+# PAM support
BuildRequires: pam-devel
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+
+# LIBUSB support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}usb1.0-devel
BuildRequires: %{_lib}usb-compat0.1-devel
%else
@@ -337,10 +449,14 @@ BuildRequires: gamin-devel
%endif
# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: openldap-devel
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
-%else
-BuildRequires: openldap-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires: openldap24-libs-devel
%endif
# SENSORS support
@@ -354,11 +470,17 @@ BuildRequires: libsensors4-devel
# TSAK support (requires libudev-devel)
# On RHEL5, udev is built statically, so TSAK cannot build.
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?suse_version} >= 1310
+BuildRequires: udev
+%endif
BuildRequires: libudev-devel
%define with_tsak 1
%define with_tdehwlib 1
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# XRANDR support
# On RHEL5, xrandr library is too old.
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
@@ -386,17 +508,42 @@ BuildRequires: OpenEXR-devel
%endif
# XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
+# RHEL 4: disabled
+# RHEL 5: available in centos-extras
+# RHEL 6: available in EPEL
+# RHEL 7: available in NUX
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+BuildRequires: xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires: xscreensaver-extras-base
+%endif
+BuildRequires: xscreensaver-gl-base
+BuildRequires: xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-data
+BuildRequires: xscreensaver-data-extra
%endif
+
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xscrnsaver-devel
%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+BuildRequires: xscreensaver-extrusion
+BuildRequires: xscreensaver-gl
%endif
%endif
@@ -533,7 +680,37 @@ BuildRequires: drakconf
# LIBCONFIG support
# Needed for "compton" stuff
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
+%define with_libconfig 1
BuildRequires: libconfig-devel
+%endif
+
+# KBDLEDSYNC support
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
+%define with_kbdledsync 1
+%endif
+
+# TDERANDR support
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_tderandrtray 1
+%endif
+
+# ELFICON support
+%if 0
+%define with_elficon 1
+BuildRequires: libr-devel >= 0.6.0
+%endif
+
+# RPC support
+%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1550
+BuildRequires: libtirpc-devel
+BuildRequires: rpcgen
+%if 0%{?fedora}
+BuildRequires: libnsl2-devel
+%else
+BuildRequires: libnsl-devel
+%endif
+%endif
# tdebase is a metapackage that installs all sub-packages
Requires: %{name}-runtime-data-common = %{version}-%{release}
@@ -692,7 +869,6 @@ Such as the desktop right-click-"Create New" list
%files runtime-data-common
%defattr(-,root,root,-)
-%{tde_datadir}/autostart/khotkeys.desktop
%{tde_datadir}/desktop-directories/
%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
@@ -706,18 +882,6 @@ Such as the desktop right-click-"Create New" list
%{tde_datadir}/sounds/pop.wav
%{tde_datadir}/templates/
-%post runtime-data-common
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
-%postun runtime-data-common
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
##########
%package -n trinity-kappfinder
@@ -737,20 +901,6 @@ creates menu entries for them.
%{tde_datadir}/apps/kappfinder
%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
-%post -n trinity-kappfinder
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
-%postun -n trinity-kappfinder
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
##########
%package -n trinity-libkateinterfaces
@@ -758,18 +908,12 @@ Summary: Common libraries used by kwrite and kate
Group: System/GUI/Other
%description -n trinity-libkateinterfaces
-%{summary}.
+This package contains the kateinterface library.
%files -n trinity-libkateinterfaces
%defattr(-,root,root,-)
%{tde_libdir}/libkateinterfaces.so.*
-%post -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-%postun -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
##########
%package -n trinity-kate
@@ -815,22 +959,6 @@ Some random features:
%{tde_datadir}/servicetypes/kateplugin.desktop
%{tde_tdedocdir}/HTML/en/kate/
-%post -n trinity-kate
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kate
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-/sbin/ldconfig || :
-
##########
%package -n trinity-kate-devel
@@ -849,12 +977,6 @@ This package contains the development files fare Kate.
%{tde_libdir}/libkateinterfaces.so
%{tde_libdir}/libkateinterfaces.la
-%post -n trinity-kate-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kate-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-kwrite
@@ -880,20 +1002,6 @@ Kwrite is an advanced text editor for TDE.
%{tde_tdedocdir}/HTML/en/kwrite/
-%post -n trinity-kwrite
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
-%postun -n trinity-kwrite
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
##########
%package -n trinity-kcontrol
@@ -902,9 +1010,11 @@ Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
# Requires 'usb.ids'
-Requires: usbutils
+Requires: usbutils
+BuildRequires: usbutils
%if 0%{?suse_version} == 0
-Requires: hwdata
+BuildRequires: hwdata
+Requires: hwdata
%endif
%description -n trinity-kcontrol
@@ -961,8 +1071,10 @@ plugdev group.
%{tde_tdelibdir}/kcm_fontinst.so
%{tde_tdelibdir}/kcm_fonts.la
%{tde_tdelibdir}/kcm_fonts.so
+%if 0%{?with_tdehwlib}
%{tde_tdelibdir}/kcm_hwmanager.la
%{tde_tdelibdir}/kcm_hwmanager.so
+%endif
%{tde_tdelibdir}/kcm_icons.la
%{tde_tdelibdir}/kcm_icons.so
%{tde_tdelibdir}/kcm_info.la
@@ -1062,7 +1174,9 @@ plugdev group.
%{tde_tdeappdir}/filebrowser.desktop
%{tde_tdeappdir}/filetypes.desktop
%{tde_tdeappdir}/fonts.desktop
+%if 0%{?with_tdehwlib}
%{tde_tdeappdir}/hwmanager.desktop
+%endif
%{tde_tdeappdir}/icons.desktop
%{tde_tdeappdir}/installktheme.desktop
%{tde_tdeappdir}/interrupts.desktop
@@ -1168,8 +1282,15 @@ plugdev group.
%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
%{tde_tdedocdir}/HTML/en/tdefontview/
+# tdehwtray
+%if "%{?tde_version}" == "14.1.0"
+%{tde_bindir}/tdehwdevicetray
+%{tde_tdeappdir}/tdehwdevicetray.desktop
+%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop
+%endif
+
# The following features are not compiled under RHEL 5 and older
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?with_tderandrtray}
%{tde_bindir}/tderandrtray
%{tde_tdelibdir}/kcm_displayconfig.la
%{tde_tdelibdir}/kcm_displayconfig.so
@@ -1185,14 +1306,6 @@ plugdev group.
%{tde_tdedocdir}/HTML/en/tderandrtray/
%endif
-%post -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
-%postun -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
##########
%package -n trinity-kcontrol-devel
@@ -1208,12 +1321,6 @@ Requires: trinity-kcontrol = %{version}-%{release}
%{tde_libdir}/libtdefontinst.la
%{tde_libdir}/libtdefontinst.so
-%post -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
##########
%package bin
@@ -1221,6 +1328,11 @@ Summary: Core binaries for the TDE base module
Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: pam
+%if 0%{?rhel} >= 7
+Requires: xorg-x11-server-Xorg
+Requires: xorg-x11-drv-evdev
+Requires: dejavu-sans-fonts
+%endif
Provides: tdebase-bin = %{version}-%{release}
Obsoletes: tdebase-bin < %{version}-%{release}
@@ -1235,7 +1347,9 @@ TDE applications, particularly those in the TDE base module.
%if 0%{?with_tsak}
%{tde_bindir}/tsak
%endif
+%if 0%{?with_libconfig}
%{tde_bindir}/compton-tde
+%endif
%{tde_bindir}/tdedebugdialog
%{tde_bindir}/kreadconfig
%{tde_bindir}/kwriteconfig
@@ -1289,6 +1403,9 @@ TDE applications, particularly those in the TDE base module.
%{tde_libdir}/libtdeinit_kxkb.la
%{tde_libdir}/libtdeinit_kxkb.so
%{tde_libdir}/libkhotkeys_shared.so.*
+%if "%{?tde_version}" == "14.1.0"
+%{tde_tdeappdir}/kdcop.desktop
+%endif
%{tde_tdeappdir}/keyboard.desktop
%{tde_tdeappdir}/keyboard_layout.desktop
%{tde_tdeappdir}/khotkeys.desktop
@@ -1300,7 +1417,6 @@ TDE applications, particularly those in the TDE base module.
%{tde_datadir}/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd
%{tde_datadir}/apps/kdcop/
%{tde_datadir}/apps/khotkeys/
-%{tde_datadir}/services/kded/khotkeys.desktop
%{tde_datadir}/services/kxkb.desktop
%if 0%{?suse_version} == 0
%config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity
@@ -1315,21 +1431,17 @@ TDE applications, particularly those in the TDE base module.
# SETUID binaries
# Some setuid binaries need special care
%if 0%{?suse_version}
-%if 0%{?with_tsak}
-%verify(not mode) %{tde_bindir}/%{tdm}tsak
-%endif
+%{?with_tsak:%verify(not mode) %{tde_bindir}/%{tdm}tsak}
%verify(not mode) %{tde_bindir}/kcheckpass
-%verify(not mode) %{tde_bindir}/tdekbdledsync
+%{?with_kbdledsync:%verify(not mode) %{tde_bindir}/tdekbdledsync}
%else
-%if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak
-%endif
+%{?with_tsak:%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak}
%attr(4755,root,root) %{tde_bindir}/kcheckpass
-%attr(4755,root,root) %{tde_bindir}/tdekbdledsync
+%{?with_kbdledsync:%attr(4755,root,root) %{tde_bindir}/tdekbdledsync}
%endif
# SUSE's runupdater utility
-%if 0%{?opensuse_bs} == 0 && 0%{?suse_version}
+%if 0
%{tde_bindir}/runupdater
%{tde_libdir}/libtdeinit_runupdater.la
%{tde_libdir}/libtdeinit_runupdater.so
@@ -1339,21 +1451,13 @@ TDE applications, particularly those in the TDE base module.
%endif
%post bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || :
# Sets permissions on setuid files (openSUSE specific)
%if 0%{?suse_version}
-%if 0%{?with_tsak}
-%set_permissions %{tde_bindir}/%{tdm}tsak
-%endif
+%{?with_tsak:%set_permissions %{tde_bindir}/%{tdm}tsak}
%set_permissions %{tde_bindir}/kcheckpass
-%set_permissions %{tde_bindir}/tdekbdledsync
+%{?with_kbdledsync:%set_permissions %{tde_bindir}/tdekbdledsync}
%endif
-%postun bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
##########
%package bin-devel
@@ -1366,19 +1470,14 @@ Obsoletes: tdebase-bin-devel < %{version}-%{release}
Provides: tdebase-bin-devel = %{version}-%{release}
%description bin-devel
-%{summary}.
+This package contains the development files for core binaries for
+the TDE base module
%files bin-devel
%defattr(-,root,root,-)
%{tde_libdir}/libkhotkeys_shared.la
%{tde_libdir}/libkhotkeys_shared.so
-%post bin-devel
-/sbin/ldconfig || :
-
-%postun bin-devel
-/sbin/ldconfig || :
-
##########
%package data
@@ -1651,6 +1750,7 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/wallpapers/*
# 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
@@ -1660,11 +1760,6 @@ needed for a basic TDE desktop installation.
%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
%post data
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
%if "%{distribution}" == "Mandriva Linux"
# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
# First, we read the "product" key in /etc/product.id
@@ -1681,12 +1776,6 @@ if [ ! -r "%{tde_bg}" ] && [ -r "%{_datadir}/mga/backgrounds/Mageia-Default-1920
fi
%endif
-%postun data
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
##########
%package tdeio-plugins
@@ -1796,6 +1885,7 @@ group.
%{tde_datadir}/apps/tdeio_info/
%{tde_datadir}/apps/tdeio_man/
%{tde_datadir}/apps/systemview/
+%{tde_datadir}/autostart/mediabackend.desktop
%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
%{tde_datadir}/mimelnk/application/x-smb-server.desktop
%{tde_datadir}/mimelnk/inode/system_directory.desktop
@@ -1844,21 +1934,23 @@ group.
%{tde_datadir}/servicetypes/thumbcreator.desktop
%{tde_datadir}/services/tdefile_trash.desktop
%{tde_tdedocdir}/HTML/en/tdeioslave/
+
%if 0%{?with_exr}
%{tde_tdelibdir}/exrthumbnail.la
%{tde_tdelibdir}/exrthumbnail.so
%{tde_datadir}/services/exrthumbnail.desktop
%endif
+
# HWManager
%{tde_tdelibdir}/media_propsdlgplugin.la
%{tde_tdelibdir}/media_propsdlgplugin.so
%{tde_datadir}/services/media_propsdlgplugin.desktop
-%post tdeio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
-%postun tdeio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || :
+%if "%{tde_version}" == "14.1.0"
+%{tde_tdelibdir}/ktrashpropsdlgplugin.la
+%{tde_tdelibdir}/ktrashpropsdlgplugin.so
+%{tde_datadir}/services/ktrashpropsdlgplugin.desktop
+%endif
##########
@@ -1912,12 +2004,6 @@ system passwords.
%{_datadir}/faces/Teddybear.png
%{_datadir}/faces/Turtle.png
-%post -n trinity-tdepasswd
-update-desktop-database %{tde_tdeappdir} 2> /dev/null || :
-
-%postun -n trinity-tdepasswd
-update-desktop-database %{tde_tdeappdir} 2> /dev/null || :
-
##########
%package -n trinity-tdeprint
@@ -1979,22 +2065,6 @@ Installation of smbclient will make you able to use smb shared printers.
%{tde_tdedocdir}/HTML/en/tdeprintfax/
%{tde_tdedocdir}/HTML/en/kjobviewer/
-%post -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
-%postun -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
##########
%package -n trinity-kdesktop
@@ -2034,20 +2104,6 @@ the TDE desktop.
%{tde_datadir}/config.kcfg/kwebdesktop.kcfg
%{tde_datadir}/icons/crystalsvg/*/apps/error.png
-%post -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
-%postun -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
##########
%package -n trinity-kdesktop-devel
@@ -2056,7 +2112,7 @@ Group: Development/Libraries/Other
Requires: trinity-kdesktop = %{version}-%{release}
%description -n trinity-kdesktop-devel
-%{summary}.
+This package contains the development files for kdesktop.
%files -n trinity-kdesktop-devel
%defattr(-,root,root,-)
@@ -2132,18 +2188,17 @@ already. Most users won't need this.
%dir %{tdm_datadir}/sessions
%{tdm_datadir}/sessions/*.desktop
%{tdm_datadir}/themes/
-%{tde_datadir}/config/%{tdm}
-%dir %{_sysconfdir}/trinity/%{tdm}
-%if 0%{?with_selinux_policy}
-%exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp
-%endif
-%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/*
+%{tde_confdir}/%{tdm}
%{tde_tdedocdir}/HTML/en/%{tdm}/
%if 0%{?suse_version} == 0
%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
%endif
+%if "%{?tde_version}" == "14.1.0"
+%{tde_bindir}/tdecryptocardwatcher
+%endif
+
# XDG user faces
%dir %{_datadir}/faces
%{_datadir}/faces/default1.png
@@ -2162,7 +2217,7 @@ already. Most users won't need this.
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
/usr/lib/systemd/system/tdm.service
%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
%{_datadir}/xsessions/tde.desktop
%endif
@@ -2208,10 +2263,19 @@ fi
%if 0%{?mgaversion} || 0%{?mdkversion}
%make_session
%endif
+
+# SELINUX context for tdm
%if 0%{?with_selinux_policy}
/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
%endif
+%if 0%{?fedora} == 21 || 0%{?rhel} >= 7
+if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then
+ echo "%{tde_bindir}/tdm -- system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local"
+ restorecon "%{tde_bindir}/tdm"
+fi
+%endif
+
# Sets default user icon in TDM
if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then
[ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces"
@@ -2230,6 +2294,10 @@ if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then
cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
fi
+# openSUSE 15.0 alternatives
+%if 0%{?suse_version} >= 1500
+update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager default-displaymanager /usr/lib/X11/displaymanagers/tdm 30 || :
+%endif
%posttrans -n trinity-tdm
# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
@@ -2243,6 +2311,11 @@ fi
%make_session
%endif
+# openSUSE 15.0 alternatives
+%if 0%{?suse_version} >= 1500
+update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || :
+%endif
+
##########
%package -n trinity-tdm-devel
@@ -2252,7 +2325,7 @@ Requires: trinity-tdm = %{version}-%{release}
%{?xtst_devel:Requires: %{xtst_devel}}
%description -n trinity-tdm-devel
-%{summary}.
+This package contains the development files for TDM.
%files -n trinity-tdm-devel
%defattr(-,root,root,-)
@@ -2281,20 +2354,6 @@ workstations.
%{tde_datadir}/servicetypes/findpart.desktop
%{tde_tdedocdir}/HTML/en/kfind/
-%post -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
-%postun -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
##########
%package -n trinity-khelpcenter
@@ -2328,22 +2387,6 @@ documentation.
%{tde_datadir}/services/khelpcenter.desktop
%{tde_tdedocdir}/HTML/en/khelpcenter/
-%post -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-kicker
@@ -2461,22 +2504,6 @@ functionality.
%{tde_datadir}/oxygen/scalable/mgabutton.svg
%endif
-%post -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-kicker-devel
@@ -2486,7 +2513,7 @@ Requires: trinity-kicker = %{version}-%{release}
%{?xtst_devel:Requires: %{xtst_devel}}
%description -n trinity-kicker-devel
-%{summary}.
+This package contains the development files for kicker.
%files -n trinity-kicker-devel
%defattr(-,root,root,-)
@@ -2503,12 +2530,6 @@ Requires: trinity-kicker = %{version}-%{release}
%{tde_libdir}/libtaskmanager.la
%{tde_libdir}/libtaskmanager.so
-%post -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-klipper
@@ -2542,22 +2563,6 @@ web browser if the clipboard contains a URL.
%{tde_datadir}/icons/hicolor/*/apps/klipper.*
%{tde_tdedocdir}/HTML/en/klipper/
-%post -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-kmenuedit
@@ -2587,14 +2592,6 @@ structure.
%{tde_datadir}/apps/kmenuedit/
%{tde_tdedocdir}/HTML/en/kmenuedit/
-%post -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-/sbin/ldconfig || :
-
##########
%package -n trinity-konqueror
@@ -2729,12 +2726,6 @@ ever launching another application.
%{tde_tdedocdir}/HTML/en/keditbookmarks/
%post -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
if [ $1 -eq 1 ]; then
update-alternatives --install \
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
@@ -2743,14 +2734,6 @@ if [ $1 -eq 1 ]; then
10 || :
fi
-%postun -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
%preun -n trinity-konqueror
if [ $1 -eq 0 ]; then
update-alternatives --remove \
@@ -2766,7 +2749,7 @@ Group: Development/Libraries/Other
Requires: trinity-konqueror = %{version}-%{release}
%description -n trinity-konqueror-devel
-%{summary}.
+This package contains the development files for konqueror.
%files -n trinity-konqueror-devel
%defattr(-,root,root,-)
@@ -2775,12 +2758,6 @@ Requires: trinity-konqueror = %{version}-%{release}
%{tde_libdir}/libkonqsidebarplugin.la
%{tde_libdir}/libkonqsidebarplugin.so
-%post -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-konqueror-nsplugins
@@ -2802,12 +2779,6 @@ This package includes support for Netscape plugins in Konqueror.
%{tde_tdeappdir}/tdehtml_plugins.desktop
%{tde_datadir}/apps/plugin/nspluginpart.rc
-%post -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
-%postun -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-
##########
%package -n trinity-konsole
@@ -2861,22 +2832,6 @@ Using Konsole, a user can open:
%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
%config %{_sysconfdir}/fonts/conf.d/99-konsole.conf
-%post -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-kpager
@@ -2897,20 +2852,6 @@ applications. It is used to switch between applications or desktops.
%{tde_datadir}/icons/hicolor/*/apps/kpager.png
%{tde_tdedocdir}/HTML/en/kpager/
-%post -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
-%postun -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
##########
%package -n trinity-kpersonalizer
@@ -2932,20 +2873,6 @@ automatically started. KPersonalizer can also be called later.
%{tde_datadir}/apps/kpersonalizer/
%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
-%post -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
-%postun -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
##########
%package -n trinity-ksmserver
@@ -2982,17 +2909,25 @@ TDE will start, but many good defaults will not be set.
%{tde_datadir}/apps/ksmserver/
%post -n trinity-ksmserver
-/sbin/ldconfig || :
%if 0%{?mdkversion} || 0%{?mgaversion}
fndSession
%endif
+# openSUSE 15.0 alternatives
+%if 0%{?suse_version} >= 1500
+update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || :
+%endif
+
%postun -n trinity-ksmserver
-/sbin/ldconfig || :
%if 0%{?mdkversion} || 0%{?mgaversion}
fndSession
%endif
+# openSUSE 15.0 alternatives
+%if 0%{?suse_version} >= 1500
+update-alternatives --remove default-xsession.desktop /usr/share/xsessions/tde.desktop || :
+%endif
+
##########
%package -n trinity-ksplash
@@ -3029,14 +2964,6 @@ a TDE session is launched.
%{tde_datadir}/servicetypes/ksplashplugins.desktop
%{tde_tdedocdir}/HTML/en/ksplashml/
-%post -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-/sbin/ldconfig || :
-
##########
%package -n trinity-ksplash-devel
@@ -3045,7 +2972,7 @@ Group: Development/Libraries/Other
Requires: trinity-ksplash = %{version}-%{release}
%description -n trinity-ksplash-devel
-%{summary}.
+This package contains the development files for ksplash.
%files -n trinity-ksplash-devel
%defattr(-,root,root,-)
@@ -3053,12 +2980,6 @@ Requires: trinity-ksplash = %{version}-%{release}
%{tde_libdir}/libksplashthemes.la
%{tde_libdir}/libksplashthemes.so
-%post -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-ksysguard
@@ -3085,22 +3006,6 @@ computer.
%{tde_datadir}/mimelnk/application/x-ksysguard.desktop
%{tde_tdedocdir}/HTML/en/ksysguard/
-%post -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-ksysguard-devel
@@ -3109,7 +3014,7 @@ Group: Development/Libraries/Other
Requires: trinity-ksysguard = %{version}-%{release}
%description -n trinity-ksysguard-devel
-%{summary}.
+This package contains the development files for ksysguard.
%files -n trinity-ksysguard-devel
%defattr(-,root,root,-)
@@ -3117,12 +3022,6 @@ Requires: trinity-ksysguard = %{version}-%{release}
%{tde_libdir}/libksgrd.la
%{tde_libdir}/libksgrd.so
-%post -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-ksysguardd
@@ -3159,20 +3058,6 @@ ktip provides many useful tips on using TDE when you log in.
%{tde_datadir}/autostart/ktip.desktop
%{tde_datadir}/icons/hicolor/*/apps/ktip.*
-%post -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
-%postun -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-
##########
%package -n trinity-twin
@@ -3185,7 +3070,6 @@ This package contains the default X window manager for TDE.
%files -n trinity-twin
%defattr(-,root,root,-)
-%{tde_bindir}/kompmgr
%{tde_bindir}/twin
%{tde_bindir}/twin_killer_helper
%{tde_bindir}/twin_resumer_helper
@@ -3227,22 +3111,6 @@ This package contains the default X window manager for TDE.
%{tde_datadir}/icons/crystalsvg/*/apps/twin.png
%{tde_tdedocdir}/HTML/en/kompmgr/
-%post -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || :
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-twin-devel
@@ -3251,7 +3119,7 @@ Group: Development/Libraries/Other
Requires: trinity-twin = %{version}-%{release}
%description -n trinity-twin-devel
-%{summary}.
+This package contains the development files for twin.
%files -n trinity-twin-devel
%defattr(-,root,root,-)
@@ -3265,12 +3133,6 @@ Requires: trinity-twin = %{version}-%{release}
%{tde_libdir}/libtdecorations.la
%{tde_libdir}/libtdecorations.so
-%post -n trinity-twin-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-twin-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkonq
@@ -3300,12 +3162,6 @@ Konqueror and the kdesktop package.
%{tde_datadir}/services/kded/favicons.desktop
%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop
-%post -n trinity-libkonq
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq
-/sbin/ldconfig || :
-
##########
%package libtqt3-integration
@@ -3352,12 +3208,6 @@ Konqueror libraries.
%{tde_libdir}/libkonq.la
%{tde_libdir}/libkonq.so
-%post -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
##########
%package tdeio-smb-plugin
@@ -3401,8 +3251,8 @@ Windows and Samba shares.
%__sed -i "kpersonalizer/keyecandypage.cpp" \
-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
%__sed -i "%{starttde}" \
- -e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
- -e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
+ -e 's|$TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop|%{tde_bg}|' \
+ -e 's|Wallpaper=Trinity-lineart.svg|Wallpaper=%{tde_bg}|'
%endif
# TDE default directory and icon in startup script
@@ -3460,6 +3310,11 @@ fi
%__sed -i "tdeioslave/cgi/kcmcgi/kcmcgi.desktop" -e "s|^Icon=.*|Icon=kcmcgi|"
%__sed -i "tdeioslave/media/tdecmodule/media.desktop" -e "s|^Icon=.*|Icon=kcmmedia|"
+# RHEL 5 does not support 'compton'
+%if 0%{?with_libconfig} == 0
+%__sed -i "twin/CMakeLists.txt" -e "/compton-tde/ s/^/#/"
+%endif
+
%build
unset QTDIR QTINC QTLIB
@@ -3472,6 +3327,16 @@ if [ -d "/usr/include/samba-4.0" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0"
fi
+# openldap 2.4 includes (CentOS 5)
+if [ -d "/usr/include/openldap24" ]; then
+ RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
+fi
+
+# libtirpc (fedora)
+if [ -d "/usr/include/tirpc" ]; then
+ RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}"
+fi
+
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
@@ -3488,6 +3353,7 @@ fi
-DWITH_GCC_VISIBILITY=ON \
\
-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}" \
@@ -3505,8 +3371,8 @@ fi
-DWITH_XFIXES=ON \
%{?!with_xrandr:-DWITH_XRANDR=OFF} \
-DWITH_XRENDER=ON \
- -DWITH_XDAMAGE=ON \
- -DWITH_XEXT=ON \
+ %{?!with_libconfig:-DWITH_LIBCONFIG=OFF} \
+ -DWITH_PCRE=ON \
%{?!with_xtest:-DWITH_XTEST=OFF} \
-DWITH_OPENGL=ON \
%{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
@@ -3514,6 +3380,7 @@ fi
-DWITH_LIBUSB=ON \
-DWITH_LIBRAW1394=ON \
-DWITH_SUDO_TDESU_BACKEND=OFF \
+ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND=OFF \
-DWITH_PAM=ON \
-DWITH_SHADOW=OFF \
-DWITH_XDMCP=ON \
@@ -3523,8 +3390,8 @@ fi
-DWITH_SENSORS=ON \
%{?with_hal:-DWITH_HAL=ON} \
%{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
- -DWITH_ELFICON=OFF \
-DWITH_UPOWER=ON \
+ %{?!with_elficon:-DWITH_ELFICON=OFF} \
\
-DBUILD_ALL=ON \
%if 0%{?suse_version}
@@ -3536,7 +3403,11 @@ fi
-DTDM_PAM_SERVICE="tdm-trinity" \
-DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
%endif
+ %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \
%{!?with_tsak:-DBUILD_TSAK=OFF} \
+%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320
+ -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
+%endif
..
%__make %{?_smp_mflags} || %__make
@@ -3553,7 +3424,7 @@ fi
# Adds a GDM/KDM/XDM session called 'TDE'
# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
%__install -D -m 644 \
"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
@@ -3581,8 +3452,12 @@ EXEC=%{tde_bindir}/%{tdm}
%if 0%{?pclinuxos}
FNDSESSION_EXEC="/usr/sbin/chksession -k"
%else
+%if 0%{?mgaversion} >= 6
+FNDSESSION_EXEC="/usr/sbin/chksession"
+%else
FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
%endif
+%endif
EOF
%endif
@@ -3596,19 +3471,20 @@ EOF
# TDM configuration
%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else
-e "s/^#*MinShowUID=.*/MinShowUID=500/"
%endif
# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%if 0%{?suse_version} || 0%{?mgaversion} >= 4
-%__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%else
-%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%endif
+if [ -r "/usr/share/usb.ids" ]; then
+ %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+ %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+elif [ -r "/usr/share/hwdata/usb.ids" ]; then
+ %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+ %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+fi
# Makes 'media_safelyremove.desktop' an alternative.
# This allows the use of 'tdeio-umountwrapper' package.
@@ -3629,10 +3505,6 @@ EOF
%__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%endif
-# Symlink TDM configuration
-%__mkdir_p "%{?buildroot}%{tde_datadir}/config"
-%__ln_s "%{_sysconfdir}/trinity/%{tdm}" "%{?buildroot}%{tde_datadir}/config/%{tdm}"
-
# SELINUX policy for RHEL / Fedora
%if 0%{?with_selinux_policy}
%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
@@ -3698,8 +3570,8 @@ for i in {16,22}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i
for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png hicolor/"$i"x"$i"/apps/kcmnetpref.png ;done
for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png hicolor/"$i"x"$i"/apps/kcmkdnssd.png ;done
for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-joystick.png hicolor/"$i"x"$i"/apps/kcmjoystick.png ;done
-for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done
+for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/computer.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done
for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png hicolor/"$i"x"$i"/apps/kcmcrypto.png ;done
for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/trashcan_empty.png hicolor/"$i"x"$i"/apps/kcmprivacy.png ;done
for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png hicolor/"$i"x"$i"/apps/kcmnic.png ;done
@@ -3727,9 +3599,12 @@ popd
%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kwrite.desktop TextEditor
%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/tdeprintfax.desktop PrintingUtility
%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop Graphics Viewer
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop
+%{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop}
%suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager
%endif
+if [ -r %{?buildroot}%{tde_tdeappdir}/kdcop.desktop ]; then
+%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop System Utility
+fi
# Icons from TDE Control Center should only be displayed in TDE
for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
@@ -3746,16 +3621,19 @@ for i in ksysguard tde-kcontrol tdefontview showdesktop; do
done
# Remove setuid bit on some binaries.
-%if 0%{?with_tsak}
-chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"
-%endif
+%{?with_tsak:chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"}
chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
-chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"
+%{?with_kbdledsync:chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"}
# Fix permissions on shell scripts
chmod 0755 "%{?buildroot}%{tde_datadir}/apps/tdeconf_update/move_session_config.sh"
chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs"
+# Removes tderandrtray documentation, if not built.
+%if 0%{?with_tderandrtray} == 0
+%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tderandrtray"
+%endif
+
# Links duplicate files
%fdupes "%{?buildroot}%{tde_datadir}"
@@ -3767,14 +3645,10 @@ chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxref
%if 0%{?suse_version}
# Check permissions on setuid files (openSUSE specific)
%verifyscript
-%if 0%{?with_tsak}
-%verify_permissions -e %{tde_bindir}/%{tdm}tsak
-%endif
+%{?with_tsak:%verify_permissions -e %{tde_bindir}/%{tdm}tsak}
%verify_permissions -e %{tde_bindir}/kcheckpass
-%verify_permissions -e %{tde_bindir}/tdekbdledsync
+%{?with_kbdledsync:%verify_permissions -e %{tde_bindir}/tdekbdledsync}
%endif
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdebase/tdebase-3.5.13.2.spec b/redhat/main/tdebase/tdebase-3.5.13.2.spec
index c349bc37e..6c4318f8d 100644
--- a/redhat/main/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/main/tdebase/tdebase-3.5.13.2.spec
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
@@ -34,17 +34,12 @@
%define tdm_datadir %{tde_datadir}/apps/%{tdm}
%define starttde startkde
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Version: %{tde_version}
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity Base Programs
-Group: User Interface/Desktops
+Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -99,6 +94,8 @@ Source8: tdm%{?dist}.pp
Source9: mgabutton.svg
%endif
+%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch}
+
Obsoletes: trinity-kdebase < %{version}-%{release}
Provides: trinity-kdebase = %{version}-%{release}
Obsoletes: trinity-kdebase-libs < %{version}-%{release}
@@ -108,9 +105,17 @@ Provides: trinity-kdebase-extras = %{version}-%{release}
Obsoletes: tdebase < %{version}-%{release}
Provides: tdebase = %{version}-%{release}
-%if 0%{?suse_version}
# for set_permissions macro
+%if 0%{?suse_version}
PreReq: permissions
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
@@ -287,7 +292,7 @@ Requires: indexhtml
# OpenSuse 11.4 Theme
%if "%{?suse_version}" == "1140"
-Requires: hicolor-icon-theme-branding
+Requires: hicolor-icon-theme-branding = 11.4
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
Requires: opensuse-manuals_en
@@ -297,9 +302,9 @@ Requires: opensuse-manuals_en
# OpenSuse 12.2 Theme
%if "%{?suse_version}" == "1220"
-Requires: wallpaper-branding
+Requires: wallpaper-branding = 12.2
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires: hicolor-icon-theme-branding
+Requires: hicolor-icon-theme-branding = 12.2
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
Requires: opensuse-manuals_en
@@ -309,7 +314,7 @@ Requires: opensuse-manuals_en
# OpenSuse 12.3 Theme
%if "%{?suse_version}" == "1230"
-Requires: wallpaper-branding
+Requires: wallpaper-branding = 12.3
%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
@@ -321,14 +326,26 @@ Requires: opensuse-manuals_en
# OpenSuse 13.1 Theme
%if "%{?suse_version}" == "1310"
-Requires: wallpaper-branding
+Requires: wallpaper-branding = 13.1
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires: hicolor-icon-theme-branding
+Requires: hicolor-icon-theme-branding = 13.1
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
Requires: opensuse-manuals_en
%define tde_aboutlabel OpenSuse 13.1
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
+%define tde_aboutpage /usr/share/do%endif
+%endif
+
+# OpenSuse 13.2 Theme
+%if "%{?suse_version}" == "1320"
+Requires: wallpaper-branding = 13.2
+%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
+
+Requires: release-notes-openSUSE
+%define tde_aboutlabel OpenSuse 13.2
+%define tde_aboutpage /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html
%endif
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
@@ -337,6 +354,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: make
+BuildRequires: fdupes
# HTDIG support
BuildRequires: htdig
@@ -444,13 +462,10 @@ BuildRequires: OpenEXR-devel
%endif
# XSCREENSAVER support
-# Disabled on RHEL4, RHEL >= 7
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver}
-%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
%define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: gnome-screensaver
+%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires: libXScrnSaver-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
@@ -459,17 +474,6 @@ BuildRequires: %{_lib}xscrnsaver-devel
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires: xscreensaver
-BuildRequires: libXScrnSaver-devel
-%if 0%{?suse_version}
-BuildRequires: xscreensaver-data-extra
-%endif
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires: xscreensaver
-%endif
-%endif
%endif
# AVAHI support
@@ -560,14 +564,15 @@ BuildRequires: libXdmcp-devel
# XTST support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
-BuildRequires: %{_lib}xtst-devel
+%define xtst_devel %{_lib}xtst-devel
%else
-BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
+%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel
%endif
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires: libXtst-devel
+%define xtst_devel libXtst-devel
%endif
+%{?xtst_devel:BuildRequires: %{xtst_devel}}
# XDAMAGE support
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -682,7 +687,7 @@ web browser, X terminal emulator, and many other programs and components.
%package devel
Summary: %{summary} - Development files
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: %{name} = %{version}-%{release}
Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10
Requires: trinity-tdelibs-devel >= %{tde_version}
@@ -722,7 +727,7 @@ Kate plugins or TWin styles.
%package tdeio-pim-plugins
Summary: PIM TDEIOslaves from %{name}
-Group: Environment/Libraries
+Group: System/GUI/Other
Provides: trinity-kdebase-pim-ioslaves = %{version}-%{release}
Obsoletes: trinity-kdebase-pim-ioslaves < %{version}-%{release}
@@ -761,7 +766,7 @@ Protocol handlers (TDEIOslaves) for personal information management, including:
%package runtime-data-common
Summary: Shared common files for Trinity and KDE4
-Group: Environment/Libraries
+Group: System/GUI/Other
Provides: tdebase-runtime-data-common = %{version}-%{release}
Obsoletes: tdebase-runtime-data-common < %{version}-%{release}
@@ -802,7 +807,7 @@ done
%package -n trinity-kappfinder
Summary: Non-TDE application finder for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-kappfinder
@@ -835,10 +840,10 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%package -n trinity-libkateinterfaces
Summary: Common libraries used by kwrite and kate
-Group: Environment/Libraries
+Group: System/GUI/Other
%description -n trinity-libkateinterfaces
-%{summary}
+This package contains the kateinterface library.
%files -n trinity-libkateinterfaces
%defattr(-,root,root,-)
@@ -854,7 +859,7 @@ Group: Environment/Libraries
%package -n trinity-kate
Summary: Advanced text editor for TDE
-Group: Applications/Text
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-kwrite = %{version}-%{release}
Requires: trinity-libkateinterfaces = %{version}-%{release}
@@ -915,11 +920,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%package -n trinity-kate-devel
Summary: Development files for kate
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-kate = %{version}-%{release}
%description -n trinity-kate-devel
-%{summary}
+This package contains the development files fare Kate.
%files -n trinity-kate-devel
%defattr(-,root,root,-)
@@ -939,12 +944,12 @@ Requires: trinity-kate = %{version}-%{release}
%package -n trinity-kwrite
Summary: Advanced text editor for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-libkateinterfaces = %{version}-%{release}
%description -n trinity-kwrite
-Kwrite is a text editor for TDE.
+Kwrite is an advanced text editor for TDE.
%files -n trinity-kwrite
%defattr(-,root,root,-)
@@ -978,7 +983,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%package -n trinity-kcontrol
Summary: Control center for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
# Requires 'usb.ids'
@@ -1191,7 +1196,6 @@ plugdev group.
%{tde_tdeappdir}/sound.desktop
%{tde_tdeappdir}/spellchecking.desktop
%{tde_tdeappdir}/style.desktop
-%{tde_tdeappdir}/tde-kcontrol.desktop
%{tde_tdeappdir}/useragent.desktop
%{tde_tdeappdir}/xserver.desktop
%{tde_datadir}/applnk/.hidden/energy.desktop
@@ -1278,11 +1282,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%package -n trinity-kcontrol-devel
Summary: Development files for kcontrol
-Group: Development/Libraries
+Group: Development/Languages/Other
Requires: trinity-kcontrol = %{version}-%{release}
%description -n trinity-kcontrol-devel
-%{summary}
+This package contains the development files for Kcontrol.
%files -n trinity-kcontrol-devel
%defattr(-,root,root,-)
@@ -1299,9 +1303,14 @@ Requires: trinity-kcontrol = %{version}-%{release}
%package bin
Summary: Core binaries for the TDE base module
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: pam
+%if 0%{?rhel} >= 7
+Requires: xorg-x11-server-Xorg
+Requires: xorg-x11-drv-evdev
+Requires: dejavu-sans-fonts
+%endif
Provides: tdebase-bin = %{version}-%{release}
Obsoletes: tdebase-bin < %{version}-%{release}
@@ -1409,6 +1418,13 @@ TDE applications, particularly those in the TDE base module.
%post bin
/sbin/ldconfig || :
update-desktop-database %{tde_appdir} 2> /dev/null || :
+# Sets permissions on setuid files (openSUSE specific)
+%if 0%{?suse_version}
+%if 0%{?with_tsak}
+%set_permissions %{tde_bindir}/%{tdm}tsak
+%endif
+%set_permissions %{tde_bindir}/kcheckpass
+%endif
%postun bin
/sbin/ldconfig || :
@@ -1418,14 +1434,16 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%package bin-devel
Summary: Development files for core binaries for the TDE base module
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: %{name}-bin = %{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
Obsoletes: tdebase-bin-devel < %{version}-%{release}
Provides: tdebase-bin-devel = %{version}-%{release}
%description bin-devel
-%{summary}
+This package contains the development files for core binaries for
+the TDE base module
%files bin-devel
%defattr(-,root,root,-)
@@ -1442,7 +1460,7 @@ Provides: tdebase-bin-devel = %{version}-%{release}
%package data
Summary: Shared data files for the TDE base module
-Group: Environment/Libraries
+Group: System/GUI/Other
Requires: %{name}-runtime-data-common = %{version}-%{release}
Obsoletes: tdebase-data < %{version}-%{release}
@@ -1711,6 +1729,7 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/wallpapers/*
# 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
@@ -1752,7 +1771,7 @@ done
%package tdeio-plugins
Summary: Core I/O slaves for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: trinity-kdesktop = %{version}-%{release}
Requires: cyrus-sasl
Requires: psmisc
@@ -1926,7 +1945,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%package -n trinity-tdepasswd
Summary: Password changer for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Obsoletes: trinity-kdepasswd < %{version}-%{release}
Provides: trinity-kdepasswd = %{version}-%{release}
@@ -1983,7 +2002,7 @@ update-desktop-database %{tde_tdeappdir} 2> /dev/null || :
%package -n trinity-tdeprint
Summary: Print system for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: psutils
@@ -2058,7 +2077,7 @@ done
%package -n trinity-kdesktop
Summary: Miscellaneous binaries and files for the TDE desktop
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-bin = %{version}-%{release}
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-libkonq = %{version}-%{release}
@@ -2111,11 +2130,11 @@ done
%package -n trinity-kdesktop-devel
Summary: Development files for kdesktop
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-kdesktop = %{version}-%{release}
%description -n trinity-kdesktop-devel
-%{summary}
+This package contains the development files for kdesktop.
%files -n trinity-kdesktop-devel
%defattr(-,root,root,-)
@@ -2127,7 +2146,7 @@ Requires: trinity-kdesktop = %{version}-%{release}
%package -n trinity-tdm
Summary: X Display manager for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-bin = %{version}-%{release}
Requires: %{name}-data = %{version}-%{release}
Requires: pam
@@ -2237,13 +2256,13 @@ already. Most users won't need this.
%endif
# Logrotate configuration
-%config %{_sysconfdir}/logrotate.d/tdm
+%config %{_sysconfdir}/logrotate.d/trinity-tdm
%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 there is already something under '/etc/trinity/%{tdm}', simply delete old configuration
+ # 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
@@ -2306,11 +2325,12 @@ fi
%package -n trinity-tdm-devel
Summary: Development files for tdm
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-tdm = %{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
%description -n trinity-tdm-devel
-%{summary}
+This package contains the development files for TDM.
%files -n trinity-tdm-devel
%defattr(-,root,root,-)
@@ -2320,7 +2340,7 @@ Requires: trinity-tdm = %{version}-%{release}
%package -n trinity-kfind
Summary: File-find utility for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-kfind
@@ -2357,7 +2377,7 @@ done
%package -n trinity-khelpcenter
Summary: Help center for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: htdig
@@ -2406,7 +2426,7 @@ done
%package -n trinity-kicker
Summary: Desktop panel for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-kicker
@@ -2540,11 +2560,12 @@ done
%package -n trinity-kicker-devel
Summary: Development files for kicker
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-kicker = %{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
%description -n trinity-kicker-devel
-%{summary}
+This package contains the development files for kicker.
%files -n trinity-kicker-devel
%defattr(-,root,root,-)
@@ -2571,7 +2592,7 @@ Requires: trinity-kicker = %{version}-%{release}
%package -n trinity-klipper
Summary: Clipboard utility for Trinity
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-klipper
@@ -2620,7 +2641,7 @@ done
%package -n trinity-kmenuedit
Summary: Menu editor for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-kmenuedit
@@ -2657,7 +2678,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%package -n trinity-konqueror
Summary: TDE's advanced file manager, web browser and document viewer
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-kcontrol = %{version}-%{release}
Requires: %{name}-tdeio-plugins = %{version}-%{release}
@@ -2769,6 +2790,7 @@ ever launching another application.
%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
%{tde_datadir}/apps/konqueror/tiles/
%{tde_datadir}/autostart/konqy_preload.desktop
@@ -2818,11 +2840,11 @@ fi
%package -n trinity-konqueror-devel
Summary: Development files for konqueror
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-konqueror = %{version}-%{release}
%description -n trinity-konqueror-devel
-%{summary}
+This package contains the development files for konqueror.
%files -n trinity-konqueror-devel
%defattr(-,root,root,-)
@@ -2841,7 +2863,7 @@ Requires: trinity-konqueror = %{version}-%{release}
%package -n trinity-konqueror-nsplugins
Summary: Netscape plugin support for Konqueror
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: trinity-konqueror = %{version}-%{release}
%description -n trinity-konqueror-nsplugins
@@ -2868,7 +2890,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%package -n trinity-konsole
Summary: X terminal emulator for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-konsole
@@ -2937,7 +2959,7 @@ done
%package -n trinity-kpager
Summary: Desktop pager for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-kpager
@@ -2971,7 +2993,7 @@ done
%package -n trinity-kpersonalizer
Summary: Installation personalizer for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-kpersonalizer
@@ -3006,7 +3028,7 @@ done
%package -n trinity-ksmserver
Summary: Session manager for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-twin = %{version}-%{release}
@@ -3032,7 +3054,7 @@ TDE will start, but many good defaults will not be set.
%{tde_libdir}/libkdeinit_ksmserver.so
%{tde_datadir}/apps/kconf_update/ksmserver.upd
%{tde_datadir}/apps/kconf_update/move_session_config.sh
-%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
+%{tde_datadir}/apps/ksmserver/
# Workaround conflict with KDE4
%if "%{?tde_prefix}" != "/usr"
@@ -3055,7 +3077,7 @@ fndSession
%package -n trinity-ksplash
Summary: The TDE splash screen
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-ksplash
@@ -3099,11 +3121,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%package -n trinity-ksplash-devel
Summary: Development files for ksplash
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-ksplash = %{version}-%{release}
%description -n trinity-ksplash-devel
-%{summary}
+This package contains the development files for ksplash.
%files -n trinity-ksplash-devel
%defattr(-,root,root,-)
@@ -3121,7 +3143,7 @@ Requires: trinity-ksplash = %{version}-%{release}
%package -n trinity-ksysguard
Summary: System guard for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-ksysguardd = %{version}-%{release}
@@ -3163,11 +3185,11 @@ done
%package -n trinity-ksysguard-devel
Summary: Development files for ksysguard
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-ksysguard = %{version}-%{release}
%description -n trinity-ksysguard-devel
-%{summary}
+This package contains the development files for ksysguard.
%files -n trinity-ksysguard-devel
%defattr(-,root,root,-)
@@ -3185,7 +3207,7 @@ Requires: trinity-ksysguard = %{version}-%{release}
%package -n trinity-ksysguardd
Summary: System guard daemon for TDE
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-ksysguardd
@@ -3201,8 +3223,8 @@ to monitor it through the daemon running there.
##########
%package -n trinity-ktip
-Summary: useful tips for TDE
-Group: Applications/Utilities
+Summary: Useful tips for TDE
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-ktip
@@ -3235,7 +3257,7 @@ done
%package -n trinity-twin
Summary: The TDE window manager
-Group: Applications/Utilities
+Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
%description -n trinity-twin
@@ -3304,11 +3326,11 @@ done
%package -n trinity-twin-devel
Summary: Development files for twin
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-twin = %{version}-%{release}
%description -n trinity-twin-devel
-%{summary}
+This package contains the development files for twin.
%files -n trinity-twin-devel
%defattr(-,root,root,-)
@@ -3332,7 +3354,7 @@ Requires: trinity-twin = %{version}-%{release}
%package -n trinity-libkonq
Summary: Core libraries for Konqueror
-Group: Environment/Libraries
+Group: System/GUI/Other
%description -n trinity-libkonq
These libraries are used by several TDE applications, most notably
@@ -3367,7 +3389,7 @@ Konqueror and the kdesktop package.
%package libtqt3-integration
Summary: Integration library between TQt3 and TDE
-Group: Environment/Libraries
+Group: System/GUI/Other
Obsoletes: tdebase-libtqt3-integration < %{version}-%{release}
Provides: tdebase-libtqt3-integration = %{version}-%{release}
@@ -3389,8 +3411,9 @@ These libraries allow you to use TDE dialogs in native TQt3 applications.
%package -n trinity-libkonq-devel
Summary: Development files for Konqueror's core libraries
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libkonq = %{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
%description -n trinity-libkonq-devel
This package contains headers and other development files for the core
@@ -3416,8 +3439,8 @@ Konqueror libraries.
##########
%package tdeio-smb-plugin
-Summary: Windows Connection Module for TDE
-Group: Environment/Libraries
+Summary: Windows Connection Module for TDE
+Group: System/GUI/Other
%description tdeio-smb-plugin
This package provides the "smb://" protocol, to connect to and from
@@ -3437,7 +3460,7 @@ Windows and Samba shares.
##########
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -3445,6 +3468,7 @@ Windows and Samba shares.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
# Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != ""
@@ -3474,8 +3498,13 @@ Windows and Samba shares.
# TDE default directory and icon in startup script
%__sed -i "%{starttde}" \
- -e "s|/opt/trinity|%{tde_prefix}|g" \
- -e "s|%%{tde_starticon}|%{tde_starticon}|g"
+ -e "s|/opt/trinity|%{tde_prefix}|g"
+
+# Sets default TDE menu icon
+%if "%{tde_starticon}" != ""
+%__sed -i "kicker/libkicker/kickerSettings.kcfg" \
+ -e "s|QString(\"kmenu\")|QString(\"%{tde_starticon}\")|"
+%endif
# Xsession script location may vary on some distro
%if 0%{?rhel} || 0%{?fedora}
@@ -3695,6 +3724,8 @@ chmod 755 "%{?buildroot}%{tde_bindir}/plasma-desktop"
# Makes 'media_safelyremove.desktop' an alternative.
# This allows the use of 'tdeio-umountwrapper' package.
%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
+%__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives"
+%__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop"
# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
# You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
@@ -3740,7 +3771,7 @@ EOF
# logrotate configuration
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/tdm"
+cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/trinity-tdm"
/var/log/tdm.log {
weekly
notifempty
@@ -3759,56 +3790,55 @@ fi
# Adds missing icons in 'hicolor' theme
# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
-mkdir -p "%{?buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
+%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png ;done
-for i in {16,22,32,48,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmperformance.png ;done
-for i in 16; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png hicolor/"$i"x"$i"/apps/kcmkded.png ;done
-for i in {16,22,32,48}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png hicolor/"$i"x"$i"/apps/kcmsmserver.png ;done
-for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png hicolor/"$i"x"$i"/apps/kcmspellchecking.png ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktop.png ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png hicolor/"$i"x"$i"/apps/kcmtaskbar.png ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png hicolor/"$i"x"$i"/apps/kcmcolors.png ;done
-for i in {16,22,32,48,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmlaunch.png ;done
-for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png ;done
-for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png hicolor/"$i"x"$i"/apps/kcmcgi.png ;done
-for i in {16,22}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png hicolor/"$i"x"$i"/apps/kcmhistory.png ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnetpref.png ;done
-for i in {16,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png hicolor/"$i"x"$i"/apps/kcmkdnssd.png ;done
-for i in {16,22,32,48,64}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png hicolor/"$i"x"$i"/apps/kcmjoystick.png ;done
-for i in {16,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done
-for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png hicolor/"$i"x"$i"/apps/kcmcrypto.png ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png hicolor/"$i"x"$i"/apps/kcmprivacy.png ;done
-for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnic.png ;done
+for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png ;done
+for i in {16,22,32,48,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmperformance.png ;done
+for i in 16; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png hicolor/"$i"x"$i"/apps/kcmkded.png ;done
+for i in {16,22,32,48}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png hicolor/"$i"x"$i"/apps/kcmsmserver.png ;done
+for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png hicolor/"$i"x"$i"/apps/kcmspellchecking.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktop.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png hicolor/"$i"x"$i"/apps/kcmtaskbar.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png hicolor/"$i"x"$i"/apps/kcmcolors.png ;done
+for i in {16,22,32,48,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmlaunch.png ;done
+for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png ;done
+for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png hicolor/"$i"x"$i"/apps/kcmcgi.png ;done
+for i in {16,22}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png hicolor/"$i"x"$i"/apps/kcmhistory.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnetpref.png ;done
+for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png hicolor/"$i"x"$i"/apps/kcmkdnssd.png ;done
+for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png hicolor/"$i"x"$i"/apps/kcmjoystick.png ;done
+for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done
+for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png hicolor/"$i"x"$i"/apps/kcmcrypto.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png hicolor/"$i"x"$i"/apps/kcmprivacy.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnic.png ;done
popd
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-# Other applications
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Help.desktop Documentation Viewer
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Home.desktop System FileManager core
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kate.desktop TextEditor
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KControl.desktop X-SuSE-core
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Kfind.desktop System Filesystem core
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop PrintingUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop System TrayIcon
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop Core-Configuration
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/knetattach.desktop System Network
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop WebBrowser
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop System FileManager
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsole.desktop TerminalEmulator
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop TerminalEmulator
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpager.desktop Utility DesktopUtility
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop DesktopUtility
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop System Monitor
-%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop System Utility
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kwrite.desktop TextEditor
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kprintfax.desktop PrintingUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kfontview.desktop Graphics Viewer
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/krandrtray.desktop Applet X-KDE-settings-desktop
-%suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Help.desktop Documentation Viewer
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Home.desktop System FileManager core
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kate.desktop TextEditor
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KControl.desktop X-SuSE-core
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Kfind.desktop System Filesystem core
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop PrintingUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop System TrayIcon
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop Core-Configuration
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/knetattach.desktop System Network
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop WebBrowser
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop System FileManager
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsole.desktop TerminalEmulator
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop TerminalEmulator
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpager.desktop Utility DesktopUtility
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop DesktopUtility
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop System Monitor
+%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop System Utility
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kwrite.desktop TextEditor
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kdeprintfax.desktop PrintingUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kfontview.desktop Graphics Viewer
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/krandrtray.desktop Applet X-KDE-settings-desktop
+%suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager
%endif
# Icons from TDE Control Center should only be displayed in TDE
@@ -3821,7 +3851,7 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
done
# Other apps that should stay in TDE
-for i in ksysguard tde-kcontrol kfontview showdesktop; do
+for i in ksysguard kfontview showdesktop; do
echo "OnlyShowIn=KDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
done
@@ -3831,6 +3861,12 @@ chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"
%endif
chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
+# Fix permissions on shell scripts
+chmod 0755 "%{?buildroot}%{tde_datadir}/apps/kconf_update/move_session_config.sh"
+chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs"
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
%clean
@@ -3848,23 +3884,3 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
%changelog
-* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-5
-- Add logrotate configuration file.
-- Add font configuration file.
-- Install missing icons.
-
-* Sun May 18 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4
-- Fix Fedora 20 theme
-- Fix some Mageia 4 path problems
-- Forward port KDE SVN r803253 to fix potential security hole [Commit #c383da9d]
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-- Fix XDG menu
-- Fix Mageia/Mandriva specific icons
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdebase/tdm.fc19.te b/redhat/main/tdebase/tdm.fc19.te
new file mode 100644
index 000000000..b42592f11
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc19.te
@@ -0,0 +1,11 @@
+
+module tdm.fc18 1.0;
+
+require {
+ type fprintd_t;
+ type initrc_t;
+ class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t initrc_t:dbus send_msg;
diff --git a/redhat/main/tdebase/tdm.fc21.pp b/redhat/main/tdebase/tdm.fc21.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc21.pp
Binary files differ
diff --git a/redhat/main/tdebase/tdm.fc21.te b/redhat/main/tdebase/tdm.fc21.te
new file mode 100644
index 000000000..45d8a9a2c
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc21.te
@@ -0,0 +1,11 @@
+
+module tdm.fc20 1.0;
+
+require {
+ type fprintd_t;
+ type init_t;
+ class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
diff --git a/redhat/main/tdebase/tdm.fc22.pp b/redhat/main/tdebase/tdm.fc22.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc22.pp
Binary files differ
diff --git a/redhat/main/tdebase/tdm.fc22.te b/redhat/main/tdebase/tdm.fc22.te
new file mode 100644
index 000000000..45d8a9a2c
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc22.te
@@ -0,0 +1,11 @@
+
+module tdm.fc20 1.0;
+
+require {
+ type fprintd_t;
+ type init_t;
+ class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
diff --git a/redhat/main/tdebase/tdm.fc23.pp b/redhat/main/tdebase/tdm.fc23.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc23.pp
Binary files differ
diff --git a/redhat/main/tdebase/tdm.fc24.pp b/redhat/main/tdebase/tdm.fc24.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc24.pp
Binary files differ
diff --git a/redhat/main/tdebase/tdm.fc25.pp b/redhat/main/tdebase/tdm.fc25.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc25.pp
Binary files differ
diff --git a/redhat/main/tdebase/tdm.fc26.pp b/redhat/main/tdebase/tdm.fc26.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc26.pp
Binary files differ
diff --git a/redhat/main/tdebase/tdm.fc27.pp b/redhat/main/tdebase/tdm.fc27.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc27.pp
Binary files differ
diff --git a/redhat/main/tdebase/tdm.fc28.pp b/redhat/main/tdebase/tdm.fc28.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc28.pp
Binary files differ
diff --git a/redhat/main/tdebase/tdm.service.fc21 b/redhat/main/tdebase/tdm.service.fc21
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc21
@@ -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.fc22 b/redhat/main/tdebase/tdm.service.fc22
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc22
@@ -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.fc23 b/redhat/main/tdebase/tdm.service.fc23
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc23
@@ -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.fc24 b/redhat/main/tdebase/tdm.service.fc24
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc24
@@ -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.fc25 b/redhat/main/tdebase/tdm.service.fc25
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc25
@@ -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.fc26 b/redhat/main/tdebase/tdm.service.fc26
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc26
@@ -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.fc27 b/redhat/main/tdebase/tdm.service.fc27
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc27
@@ -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.fc28 b/redhat/main/tdebase/tdm.service.fc28
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc28
@@ -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/trinity-tdebase-rpmlintrc b/redhat/main/tdebase/trinity-tdebase-rpmlintrc
index ad8188f40..8d22f2fc6 100644
--- a/redhat/main/tdebase/trinity-tdebase-rpmlintrc
+++ b/redhat/main/tdebase/trinity-tdebase-rpmlintrc
@@ -1 +1,3 @@
setBadness('permissions-file-setuid-bit', 0)
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec
index 9060e0f44..5256a254d 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdebindings (version R14.0.0)
+# spec file for package tdebindings (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,16 +12,23 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
+# Required for PCLinuxOS: removes the ldflag '--no-undefined'
+%if 0%{?pclinuxos}
+%define _disable_ld_no_undefined 1
+%endif
+
# 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 tdebindings
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -35,11 +42,6 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
# Special note for RHEL4:
# You must create symlink 'libgcj.so' manually because it does not exist by default.
# E.g:
@@ -50,7 +52,7 @@
Name: trinity-%{tde_pkg}
Summary: TDE bindings to non-C++ languages
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@@ -67,6 +69,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -119,16 +122,18 @@ BuildRequires: mozilla-xulrunner20-devel
BuildRequires: openssl-devel
# GTK1 support
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 5
%define with_gtk1 1
BuildRequires: glib-devel
BuildRequires: gtk+-devel
%endif
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+%if 0%{?with_gtk1}
%define with_gtk1 1
BuildRequires: glib-devel
BuildRequires: gtk+-devel
%endif
+%endif
%if 0%{?mdkversion} == 201100
%define with_gtk1 1
BuildRequires: %{_lib}glib1.2-devel
@@ -174,17 +179,35 @@ BuildRequires: ruby >= 1.8
%if 0%{?fedora} >= 19
BuildRequires: rubypick
%endif
+
+# Check for Ruby library directory
%if "%{?ruby_libarchdir}" != ""
%define ruby_arch %{?ruby_libarchdir}
%else
+%if "%{?rb_archdir}" != ""
+%define ruby_arch %{?rb_archdir}
+%else
+%if "%{%ruby_archdir}" != ""
+%define ruby_arch %{?ruby_archdir}
+%else
%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}
+%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')}
+%endif
+%endif
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+%define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')
%endif
%if "%{?ruby_libdir}" != ""
%define ruby_rubylibdir %{?ruby_libdir}
%else
+%if "%{?rb_libdir}" != ""
+%define ruby_rubylibdir %{?rb_libdir}
+%else
%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')}
%endif
+%endif
# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
@@ -200,16 +223,22 @@ BuildRequires: gcc-java
# PCLinuxOS use SUN's Java
%if 0%{?pclinuxos}
-BuildRequires: java-1.6.0-sun
-BuildRequires: java-1.6.0-sun-devel
+BuildRequires: java-devel
%else
# Others use OpenJDK
BuildRequires: java-openjdk
BuildRequires: java-devel >= 1.4.2
-%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220 || 0%{?mgaversion} >= 3 || 0%{?rhel} >= 7
+%if 0%{?suse_version} >= 1320
+BuildRequires: java-1_8_0-openjdk-devel
+%endif
+%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5
+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
BuildRequires: java-1.7.0-openjdk-devel
-%else
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
BuildRequires: java-1.6.0-openjdk-devel
%endif
@@ -246,7 +275,7 @@ Requires: trinity-tdebindings-java = %{version}-%{release}
Requires: trinity-libsmoketqt = %{version}-%{release}
Requires: trinity-libsmoketde = %{version}-%{release}
Requires: perl-dcop = %{version}-%{release}
-Requires: trinity-python-dcop = %{version}-%{release}
+Requires: python-dcop = %{version}-%{release}
Requires: trinity-libkjsembed1 = %{version}-%{release}
Requires: trinity-kjscmd = %{version}-%{release}
Requires: trinity-juic = %{version}-%{release}
@@ -338,12 +367,6 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/libjavadcop.la
%{tde_libdir}/libjavadcop.so
-%post -n trinity-libdcop3-jni
-/sbin/ldconfig || :
-
-%postun -n trinity-libdcop3-jni
-/sbin/ldconfig || :
-
##########
%package -n trinity-libqt3-java
@@ -389,12 +412,6 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/jni/libqtjava.so.*
%doc qtjava/ChangeLog
-%post -n trinity-libqt3-jni
-/sbin/ldconfig || :
-
-%postun -n trinity-libqt3-jni
-/sbin/ldconfig || :
-
##########
%package -n trinity-libqt3-jni-devel
@@ -489,12 +506,6 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{tde_libdir}/libsmoketqt.so.*
-%post -n trinity-libsmoketqt
-/sbin/ldconfig || :
-
-%postun -n trinity-libsmoketqt
-/sbin/ldconfig || :
-
##########
%package -n trinity-libsmoketqt-devel
@@ -522,12 +533,6 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/libsmoketqt.so
%{tde_libdir}/libsmoketqt.la
-%post -n trinity-libsmoketqt-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libsmoketqt-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libsmoketde
@@ -548,12 +553,6 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{tde_libdir}/libsmoketde.so.*
-%post -n trinity-libsmoketde
-/sbin/ldconfig || :
-
-%postun -n trinity-libsmoketde
-/sbin/ldconfig || :
-
##########
%package -n trinity-libsmoketde-devel
@@ -580,12 +579,6 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/libsmoketde.so
%{tde_libdir}/libsmoketde.la
-%post -n trinity-libsmoketde-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libsmoketde-devel
-/sbin/ldconfig || :
-
##########
%package -n perl-dcop
@@ -616,12 +609,15 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
##########
-%package -n trinity-python-dcop
+%package -n python-dcop
Summary: DCOP bindings for Python
Group: System/Libraries
Requires: python
-%description -n trinity-python-dcop
+Obsoletes: trinity-python-dcop < %{version}-%{release}
+Provides: trinity-python-dcop = %{version}-%{release}
+
+%description -n python-dcop
This package contains the shared libraries necessary to run and
develop Python programs using the Python DCOP bindings
libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
@@ -629,7 +625,7 @@ communicating with running TDE applications.
This package is part of the official TDE bindings module.
-%files -n trinity-python-dcop
+%files -n python-dcop
%defattr(-,root,root,-)
%{python_sitearch}/pcop.la
%{python_sitearch}/pcop.so
@@ -677,18 +673,6 @@ This package is part of the official TDE bindings module.
%{tde_datadir}/services/javascript.desktop
%doc kjsembed/docs/ChangeLog
-%post -n trinity-libkjsembed1
-/sbin/ldconfig ||:
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-%postun -n trinity-libkjsembed1
-/sbin/ldconfig ||:
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
##########
%package -n trinity-libkjsembed-devel
@@ -714,12 +698,6 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/libkjsembed.la
%{tde_docdir}/trinity-libkjsembed-devel/
-%post -n trinity-libkjsembed-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkjsembed-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-kjscmd
@@ -740,12 +718,6 @@ This package is part of the official TDE bindings module.
%{tde_tdelibdir}/libjsconsoleplugin.la
%{tde_tdelibdir}/libjsconsoleplugin.so
-%post -n trinity-kjscmd
-update-desktop-database >& /dev/null ||:
-
-%postun -n trinity-kjscmd
-update-desktop-database >& /dev/null ||:
-
##########
%package -n trinity-juic
@@ -796,12 +768,6 @@ This package is part of the official TDE bindings module.
%{ruby_arch}/korundum.so*
%doc korundum/ChangeLog
-%post -n trinity-libkorundum0-ruby
-/sbin/ldconfig || :
-
-%postun -n trinity-libkorundum0-ruby
-/sbin/ldconfig || :
-
##########
%package -n trinity-libqt0-ruby
@@ -833,12 +799,6 @@ This package is part of the official TDE bindings module.
%{ruby_arch}/tqui.la
%doc qtruby/ChangeLog
-%post -n trinity-libqt0-ruby
-/sbin/ldconfig || :
-
-%postun -n trinity-libqt0-ruby
-/sbin/ldconfig || :
-
##########
%if 0
@@ -877,12 +837,6 @@ xpart_notepad is a small XPart editor. Use it to understand how to use XPart.
%{tde_datadir}/services/xp_notepad.desktop
%doc xparts/xpart_notepad/README
-%post -n trinity-xpart-notepad
-/sbin/ldconfig || :
-
-%postun -n trinity-xpart-notepad
-/sbin/ldconfig || :
-
##########
%if 0%{?with_gtk1}
@@ -898,11 +852,6 @@ This package contains the xparts library for GTK.
%{tde_libdir}/libgtkxparts.so.*
%{tde_libdir}/libgtkxparts.la
-%post -n trinity-libgtkxparts1
-/sbin/ldconfig || :
-
-%postun -n trinity-libgtkxparts1
-/sbin/ldconfig || :
%endif
##########
@@ -922,12 +871,6 @@ This package contains the xparts library for TDE.
%{tde_libdir}/libtdexparts.so.*
%{tde_libdir}/libtdexparts.la
-%post -n trinity-libtdexparts
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdexparts
-/sbin/ldconfig || :
-
##########
%package -n trinity-libxparts-devel
@@ -949,12 +892,6 @@ This package contains the development files for Xparts library.
%endif
%{tde_libdir}/libtdexparts.so
-%post -n trinity-libxparts-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libxparts-devel
-/sbin/ldconfig || :
-
##########
%package xparts-extras
@@ -991,12 +928,6 @@ This package contains the DCOP bindings for C.
%defattr(-,root,root,-)
%{tde_libdir}/libdcopc.so.*
-%post -n trinity-libdcop-c
-/sbin/ldconfig || :
-
-%postun -n trinity-libdcop-c
-/sbin/ldconfig || :
-
###########
%package -n trinity-libdcop-c-devel
@@ -1013,12 +944,6 @@ This package contains the development files for DCOP bindings for C.
%{tde_libdir}/libdcopc.la
%{tde_tdeincludedir}/dcopc/
-%post -n trinity-libdcop-c-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libdcop-c-devel
-/sbin/ldconfig || :
-
##########
%package devel
@@ -1042,7 +967,7 @@ Requires: trinity-libqt3-jni-devel = %{version}-%{release}
Requires: trinity-libtrinity-jni-devel = %{version}-%{release}
%description devel
-Development files for the TDE bindings.
+This package contains the development files for the TDE bindings.
%files devel
%defattr(-,root,root,-)
@@ -1064,21 +989,38 @@ exit 1
# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" -e "s|rb_frame_this_func|rb_frame_last_func|g"
+%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \
+ -i "korundum/rubylib/korundum/Korundum.cpp" \
+ -e "s|rb_frame_this_func|rb_frame_last_func|g"
+%endif
+
+# Another strange FTBFS in RHEL 5
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+%__sed -i "xparts/xpart_notepad/shell_xparthost.cpp" \
+ -i "xparts/xpart_notepad/xp_notepad.cpp" \
+ -e "/TDEApplication/ s| );|, true, true, true);|"
%endif
# Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so')
%__sed -i "xparts/Makefile.am" \
- -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
+ -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
+
+# Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd'
+%if 0%{?fedora} >= 28
+%__sed -i "kjsembed/tdescript/swaptabs.js" \
+ -i "kjsembed/stdlib/cmdline.js" \
+ -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|"
+%endif
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__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 TDEDIR=%{tde_prefix}
unset JAVA_HOME ||:
%{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
@@ -1092,20 +1034,23 @@ if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then
fi
# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
+if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-if [ -d /usr/evolution28 ]; then
+if [ -d "/usr/evolution28" ]; then
export PATH="/usr/evolution28/bin:${PATH}"
export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
fi
# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h
-%if 0%{?suse_version} >= 1310
+%if 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320
EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
%endif
+%if 0%{?suse_version} >= 1330
+EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
+%endif
-# Warning: GCC visibility causes FTBFS [Bug #1285]
+# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -1136,8 +1081,7 @@ 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"
+sed -i "Makefile" -e "s|/usr/share/man|%{tde_mandir}|g"
%__make OPTIMIZE="$RPM_OPT_FLAGS" ||:
popd
@@ -1201,5 +1145,3 @@ fi
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec
index 3627cac01..1b0e5cd2f 100644
--- a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec
+++ b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -35,11 +35,6 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
# Special note for RHEL4:
# You must create symlink 'libgcj.so' manually because it does not exist by default.
# E.g:
@@ -50,7 +45,7 @@
Name: trinity-%{tde_pkg}
Summary: TDE bindings to non-C++ languages
Version: %{tde_version}
-Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@@ -68,20 +63,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-# [tdebindings] Fix RUBY path ending with '/' causing fail to install
-Patch1: tdebindings-3.5.13.2-fix_ruby_path.patch
-
-# [tdebindings] Fix ruby 2.x detection
-Patch2: tdebindings-3.5.13.2-fix_ruby2_detection.patch
-
-# [tdebindings] Fix automake 1.13 build issue
-Patch3: admin-fix-parallel-test.diff
-
-# [kdebindings] Fix FTBFS in dcopjava/bindings
-Patch4: kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch
-
-# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL5
-Patch5: kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch
+%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch}
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -139,7 +121,7 @@ BuildRequires: openssl-devel
BuildRequires: glib-devel
BuildRequires: gtk+-devel
%endif
-%if 0%{?with_rhel} && 0%{?with_gtk1}
+%if 0%{?rhel} == 5
%define with_gtk1 1
BuildRequires: glib-devel
BuildRequires: gtk+-devel
@@ -270,12 +252,13 @@ Requires: trinity-libqt0-ruby = %{version}-%{release}
TDE/DCOP bindings to non-C++ languages
%files
+%defattr(-,root,root,-)
##########
%package java
Summary: TDE Java bindings metapackage [Trinity]
-Group: Environment/Libraries
+Group: System/Libraries
Requires: trinity-libdcop3-java = %{version}-%{release}
Requires: trinity-libdcop3-jni = %{version}-%{release}
Requires: trinity-libqt3-java = %{version}-%{release}
@@ -296,7 +279,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libdcop3-java
Summary: DCOP bindings for Java [Trinity]
-Group: Environment/Libraries
+Group: System/Libraries
Requires: trinity-libdcop3-jni = %{version}-%{release}
@@ -315,7 +298,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libdcop3-java-devel
Summary: DCOP bindings for Java (dcopidl2java program) [Trinity]
-Group: Development/Libraries
+Group: Development/Languages/Java
Requires: trinity-libdcop3-java = %{version}-%{release}
%description -n trinity-libdcop3-java-devel
@@ -334,7 +317,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libdcop3-jni
Summary: DCOP bindings for Java ( Native libraries ) [Trinity]
-Group: Environment/Libraries
+Group: System/Libraries
%description -n trinity-libdcop3-jni
This package contains the shared libraries and scripts necessary to
@@ -359,7 +342,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libqt3-java
Summary: Java bindings for Qt [Trinity]
-Group: Environment/Libraries
+Group: System/Libraries
Requires: trinity-libdcop3-jni = %{version}-%{release}
Requires: trinity-libqt3-jni = %{version}-%{release}
Requires: trinity-juic = %{version}-%{release}
@@ -383,7 +366,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libqt3-jni
Summary: Java bindings for Qt ( Native libraries ) [Trinity]
-Group: Environment/Libraries
+Group: System/Libraries
%description -n trinity-libqt3-jni
This package contains the shared libraries necessary to run Java
@@ -400,11 +383,17 @@ This package is part of the official TDE bindings module.
%{tde_libdir}/jni/libqtjava.so.*
%doc qtjava/ChangeLog
+%post -n trinity-libqt3-jni
+/sbin/ldconfig || :
+
+%postun -n trinity-libqt3-jni
+/sbin/ldconfig || :
+
##########
%package -n trinity-libqt3-jni-devel
Summary: Development files fo Java bindings for Qt ( Native libraries ) [Trinity]
-Group: Development/Libraries
+Group: Development/Languages/Java
Requires: trinity-libqt3-jni = %{version}-%{release}
%description -n trinity-libqt3-jni-devel
@@ -420,8 +409,8 @@ This package is part of the official TDE bindings module.
##########
%package -n trinity-libtrinity-java
-Summary: tdelibs bindings for Java [Trinity]
-Group: Environment/Libraries
+Summary: Tdelibs bindings for Java [Trinity]
+Group: System/Libraries
Requires: trinity-libtrinity-jni = %{version}-%{release}
@@ -442,8 +431,8 @@ This package is part of the official TDE bindings module.
##########
%package -n trinity-libtrinity-jni
-Summary: tdelibs bindings for java ( Native libraries ) [Trinity]
-Group: Environment/Libraries
+Summary: Tdelibs bindings for java ( Native libraries ) [Trinity]
+Group: System/Libraries
%description -n trinity-libtrinity-jni
This package contains the shared libraries necessary to run Java
@@ -462,7 +451,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libtrinity-jni-devel
Summary: Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
-Group: Development/Libraries
+Group: Development/Languages/Java
Requires: trinity-libtrinity-jni = %{version}-%{release}
%description -n trinity-libtrinity-jni-devel
@@ -478,7 +467,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libsmokeqt1
Summary: SMOKE Binding Library to Qt
-Group: Environment/Libraries
+Group: System/Libraries
%description -n trinity-libsmokeqt1
The "Scripting Meta Object Kompiler Engine" library is used by
@@ -501,7 +490,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libsmokeqt-devel
Summary: SMOKE Binding Library to Qt - Development Files
-Group: Development/Libraries
+Group: Development/Languages/Other
Requires: trinity-libsmokeqt1 = %{version}-%{release}
%description -n trinity-libsmokeqt-devel
@@ -531,7 +520,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libsmoketde
Summary: SMOKE Binding Library to TDE
-Group: Environment/Libraries
+Group: System/Libraries
Obsoletes: trinity-libsmokekde1 < %{version}-%{release}
Provides: trinity-libsmokekde1 = %{version}-%{release}
@@ -557,7 +546,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libsmoketde-devel
Summary: SMOKE Binding Library to TDE - Development Files
-Group: Development/Libraries
+Group: Development/Languages/Other
Requires: trinity-libsmoketde = %{version}-%{release}
Obsoletes: trinity-libsmokekde-devel < %{version}-%{release}
@@ -587,17 +576,25 @@ This package is part of the official TDE bindings module.
##########
-%package -n trinity-perl-dcop
+%package -n perl-dcop
Summary: DCOP Bindings for Perl
-Group: Development/Libraries/Perl
+Group: System/Libraries
+%if 0%{?suse_version}
+Requires: perl-base
+%else
+Requires: perl
+%endif
Obsoletes: trinity-kdebindings-dcopperl < %{version}-%{release}
Provides: trinity-kdebindings-dcopperl = %{version}-%{release}
-%description -n trinity-perl-dcop
+Obsoletes: trinity-perl-dcop < %{version}-%{release}
+Provides: trinity-perl-dcop = %{version}-%{release}
+
+%description -n perl-dcop
Perl bindings to the DCOP interprocess communication protocol used by TDE
-%files -n trinity-perl-dcop
+%files -n perl-dcop
%defattr(-,root,root,-)
%{perl_vendorarch}/auto/DCOP/
%{perl_vendorarch}/DCOP.pm
@@ -607,13 +604,15 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
##########
-%package -n trinity-python-dcop
+%package -n python-dcop
Summary: DCOP bindings for Python
-Group: Environment/Libraries
+Group: System/Libraries
Requires: python
-#Provides: %{name}-dcoppython = %{version}-%{release}
-%description -n trinity-python-dcop
+Obsoletes: trinity-python-dcop < %{version}-%{release}
+Provides: trinity-python-dcop = %{version}-%{release}
+
+%description -n python-dcop
This package contains the shared libraries necessary to run and
develop Python programs using the Python DCOP bindings
libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
@@ -621,7 +620,7 @@ communicating with running TDE applications.
This package is part of the official TDE bindings module.
-%files -n trinity-python-dcop
+%files -n python-dcop
%defattr(-,root,root,-)
%{python_sitearch}/pcop.la
%{python_sitearch}/pcop.so
@@ -631,7 +630,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libkjsembed1
Summary: Embedded JavaScript library
-Group: Environment/Libraries
+Group: System/Libraries
%description -n trinity-libkjsembed1
This package contains the shared libraries necessary to run programs
@@ -685,7 +684,7 @@ update-desktop-database >& /dev/null ||:
%package -n trinity-libkjsembed-devel
Summary: Embedded JavaScript library (Development files)
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libkjsembed1 = %{version}-%{release}
%description -n trinity-libkjsembed-devel
@@ -716,7 +715,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-kjscmd
Summary: A script interpreter using the TDE JavaScript library
-Group: Environment/Libraries
+Group: System/Libraries
%description -n trinity-kjscmd
This package contains the kjscmd program, which is a standalone
@@ -742,7 +741,7 @@ update-desktop-database >& /dev/null ||:
%package -n trinity-juic
Summary: The Qt Java UI Compiler
-Group: Environment/Libraries
+Group: Development/Languages/Java
Requires: trinity-libqt3-java = %{version}-%{release}
%description -n trinity-juic
@@ -763,7 +762,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libkorundum0-ruby
Summary: TDE bindings for Ruby [Trinity]
-Group: Environment/Libraries
+Group: System/Libraries
Requires: trinity-libqt0-ruby = %{version}-%{release}
%description -n trinity-libkorundum0-ruby
@@ -782,6 +781,7 @@ This package is part of the official TDE bindings module.
%{tde_bindir}/krubyinit
%{tde_bindir}/rbkconfig_compiler
%{ruby_rubylibdir}/Korundum.rb
+%dir %{ruby_rubylibdir}/KDE
%{ruby_rubylibdir}/KDE/korundum.rb
%{ruby_arch}/korundum.la
%{ruby_arch}/korundum.so*
@@ -797,7 +797,7 @@ This package is part of the official TDE bindings module.
%package -n trinity-libqt0-ruby
Summary: Qt bindings for Ruby [Trinity]
-Group: Development/Languages/Other
+Group: System/Libraries
Requires: ruby
%description -n trinity-libqt0-ruby
@@ -835,10 +835,10 @@ This package is part of the official TDE bindings module.
%if 0
%package -n trinity-kmozilla
Summary: Kmozilla for TDE
-Group: Development/Languages/Other
+Group: System/Libraries
%description -n trinity-kmozilla
-%{summary}
+This package contains the kmozilla library fro TDE.
%files -n trinity-kmozilla
%defattr(-,root,root,-)
@@ -853,7 +853,7 @@ Group: Development/Languages/Other
%package -n trinity-xpart-notepad
Summary: A small XPart editor
-Group: Development/Languages/Other
+Group: Productivity/Scientific/Math
%description -n trinity-xpart-notepad
xpart_notepad is a small XPart editor. Use it to understand how to use XPart.
@@ -882,7 +882,7 @@ Summary: Xparts library for GTK
Group: Development/Languages/Other
%description -n trinity-libgtkxparts1
-%{summary}
+This package contains the xparts library for GTK.
%files -n trinity-libgtkxparts1
%defattr(-,root,root,-)
@@ -906,7 +906,7 @@ Obsoletes: trinity-libkdexparts1 < %{version}-%{release}
Provides: trinity-libkdexparts1 = %{version}-%{release}
%description -n trinity-libtdexparts
-%{summary}
+This package contains the xparts library for TDE.
%files -n trinity-libtdexparts
%defattr(-,root,root,-)
@@ -930,7 +930,7 @@ Requires: trinity-libgtkxparts1 = %{version}-%{release}
Requires: trinity-libtdexparts = %{version}-%{release}
%description -n trinity-libxparts-devel
-%{summary}
+This package contains the development files for Xparts library.
%files -n trinity-libxparts-devel
%defattr(-,root,root,-)
@@ -973,10 +973,10 @@ This package is part of the official TDE bindings module.
%package -n trinity-libdcop-c
Summary: DCOP bindings for C [Trinity]
-Group: Development/Languages/Other
+Group: System/Libraries
%description -n trinity-libdcop-c
-%{summary}
+This package contains the DCOP bindings for C.
%files -n trinity-libdcop-c
%defattr(-,root,root,-)
@@ -992,11 +992,11 @@ Group: Development/Languages/Other
%package -n trinity-libdcop-c-devel
Summary: DCOP bindings for C, development files [Trinity]
-Group: Development/Languages/Other
+Group: Development/Languages/C and C++
Requires: trinity-libdcop-c = %{version}-%{release}
%description -n trinity-libdcop-c-devel
-%{summary}
+This package contains the development files for DCOP bindings for C.
%files -n trinity-libdcop-c-devel
%defattr(-,root,root,-)
@@ -1033,9 +1033,10 @@ Requires: trinity-libqt3-jni-devel = %{version}-%{release}
Requires: trinity-libtrinity-jni-devel = %{version}-%{release}
%description devel
-Development files for the TDE bindings.
+This package contains the development files for the TDE bindings.
%files devel
+%defattr(-,root,root,-)
##########
@@ -1047,10 +1048,7 @@ Development files for the TDE bindings.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .rubypath
-%patch2 -p1 -b .ruby2
-%patch3 -p1 -b .automake113
-%patch4 -p1 -b .dcopjavaldflags
+%{?tde_patch:%patch1 -p1}
%if "%{?perl_vendorarch}" == ""
exit 1
@@ -1066,7 +1064,7 @@ exit 1
-e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -1157,21 +1155,21 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
# Installs juic
%__install -D -m 755 qtjava/designer/juic/bin/juic %{?buildroot}%{tde_bindir}/juic
%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common
-%__install qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common
-%__install qtjava/designer/juic/common/*.xsl %{?buildroot}%{tde_datadir}/juic/common
+%__install -m 644 qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common
+%__install -m 644 qtjava/designer/juic/common/*.xsl %{?buildroot}%{tde_datadir}/juic/common
%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/java
-%__install qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java
-%__install qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java
-%__install qtjava/designer/juic/juic.xsl %{?buildroot}%{tde_datadir}/juic
+%__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
# kjsembed sample files
%__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__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
@@ -1195,8 +1193,3 @@ fi
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc b/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index e31a8b741..94434b8ed 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeedu (version R14.0.0)
+# spec file for package tdeedu (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,10 +21,13 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeedu
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -35,17 +38,12 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Summary: Educational/Edutainment applications
Group: System/GUI/Other
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -61,6 +59,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -77,12 +76,12 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
+BuildRequires: gcc-c++
+BuildRequires: fdupes
+
# PYTHON support
BuildRequires: python-devel
BuildRequires: python
-BuildRequires: gcc-c++
-BuildRequires: desktop-file-utils
-BuildRequires: fdupes
# BOOST support
BuildRequires: boost-devel
@@ -94,6 +93,15 @@ BuildRequires: ocaml(compiler)
BuildRequires: ocaml
%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
+%define with_kig 0
+%else
+%define with_kig 1
+%endif
+%endif
+
Obsoletes: trinity-kdeedu < %{version}-%{release}
Provides: trinity-kdeedu = %{version}-%{release}
Obsoletes: trinity-kdeedu-libs < %{version}-%{release}
@@ -163,7 +171,7 @@ Group: System/GUI/Other
%description data
This package contains shared data necessary for running the
-educational applications provided with KDE (the K Desktop
+educational applications provided with TDE (the Trinity Desktop
Environment).
This package is part of Trinity, as a component of the TDE education module.
@@ -205,20 +213,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz
%{tde_tdedocdir}/HTML/en/blinken/
-%post -n trinity-blinken
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-blinken
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kalzium
@@ -255,20 +249,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz
%{tde_tdedocdir}/HTML/en/kalzium/
-%post -n trinity-kalzium
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kalzium
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kalzium-data
@@ -277,7 +257,7 @@ Group: System/GUI/Other
%description -n trinity-kalzium-data
This package contains architecture-independent data files for
-Kalzium, the KDE periodic table application. This includes pictures
+Kalzium, the TDE periodic table application. This includes pictures
of various chemical equipment and of samples of several elements, in
addition to the actual chemical data.
@@ -321,20 +301,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz
%{tde_tdedocdir}/HTML/en/kanagram/
-%post -n trinity-kanagram
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kanagram
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kbruch
@@ -360,20 +326,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png
%{tde_tdedocdir}/HTML/en/kbruch/
-%post -n trinity-kbruch
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbruch
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-keduca
@@ -403,20 +355,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/services/keduca_part.desktop
%{tde_tdedocdir}/HTML/en/keduca/
-%post -n trinity-keduca
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-keduca
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kgeography
@@ -443,20 +381,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/kgeography.png
%{tde_tdedocdir}/HTML/en/kgeography
-%post -n trinity-kgeography
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgeography
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kgeography-data
@@ -465,7 +389,7 @@ Group: System/GUI/Other
%description -n trinity-kgeography-data
This package contains architecture-independent data files for
-KGeography, the geography learning tool for KDE. This includes map
+KGeography, the geography learning tool for TDE. This includes map
and flag images.
See the kgeography package for further information.
@@ -498,7 +422,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-khangman
%defattr(-,root,root,-)
-%{tde_datadir}/config/khangmanrc
+%{tde_confdir}/khangmanrc
%{tde_bindir}/khangman
%{tde_tdeappdir}/khangman.desktop
%{tde_datadir}/apps/khangman/
@@ -507,24 +431,10 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz
%{tde_tdedocdir}/HTML/en/khangman/
-%post -n trinity-khangman
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-khangman
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kig
-Summary: Interactive geometry program for KDE
+Summary: Interactive geometry program for TDE
Group: System/GUI/Other
Requires: trinity-tdeedu-data = %{version}-%{release}
@@ -550,8 +460,8 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-kig
%defattr(-,root,root,-)
-%{tde_datadir}/config/magic/cabri.magic
-%{tde_datadir}/config/magic/drgeo.magic
+%{tde_confdir}/magic/cabri.magic
+%{tde_confdir}/magic/drgeo.magic
%{tde_bindir}/kig
%{tde_bindir}/pykig.py*
%{tde_tdelibdir}/tdefile_drgeo.la
@@ -561,7 +471,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_tdelibdir}/libkigpart.la
%{tde_tdelibdir}/libkigpart.so
%{tde_tdeappdir}/kig.desktop
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?with_kig}
%{tde_datadir}/apps/katepart/syntax/python-kig.xml
%endif
%{tde_datadir}/apps/kig/
@@ -578,20 +488,8 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/services/tdefile_kig.desktop
%{tde_datadir}/services/kig_part.desktop
%{tde_tdedocdir}/HTML/en/kig/
-
-%post -n trinity-kig
-for i in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kig
-for i in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+%{tde_confdir}/magic/cabri.magic.mgc
+%{tde_confdir}/magic/drgeo.magic.mgc
##########
@@ -602,7 +500,7 @@ Requires: trinity-tdeedu-data = %{version}-%{release}
#Requires: ttf-kochi-gothic | ttf-kochi-mincho
%description -n trinity-kiten
-Kiten is a Japanese reference and study tool for KDE. It is an
+Kiten is a Japanese reference and study tool for TDE. It is an
application with multiple functions. Firstly, it is a convenient
English to Japanese and Japanese to English dictionary. Secondly, it
is a Kanji dictionary, with multiple ways to look up specific
@@ -619,20 +517,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/kiten.png
%{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz
-%post -n trinity-kiten
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kiten
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-klatin
@@ -667,20 +551,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz
%{tde_tdedocdir}/HTML/en/klatin/
-%post -n trinity-klatin
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klatin
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-klettres
@@ -702,7 +572,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-klettres
%defattr(-,root,root,-)
-%{tde_datadir}/config/klettresrc
+%{tde_confdir}/klettresrc
%{tde_bindir}/klettres
%{tde_tdeappdir}/klettres.desktop
%{tde_datadir}/config.kcfg/klettres.kcfg
@@ -710,20 +580,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz
%{tde_tdedocdir}/HTML/en/klettres/
-%post -n trinity-klettres
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klettres
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-klettres-data
@@ -732,7 +588,7 @@ Group: System/GUI/Other
%description -n trinity-klettres-data
This package contains architecture-independent data files for
-KLettres, the foreign alphabet tutor for KDE. This includes sound
+KLettres, the foreign alphabet tutor for TDE. This includes sound
files and graphics.
See the klettres package for further information.
@@ -751,7 +607,7 @@ Group: System/GUI/Other
Requires: trinity-tdeedu-data = %{version}-%{release}
%description -n trinity-kmplot
-KmPlot is a mathematical function plotter for KDE. It has a powerful
+KmPlot is a mathematical function plotter for TDE. It has a powerful
built-in parser. You can plot different functions simultaneously and
combine them to build new functions.
@@ -780,20 +636,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/services/kmplot_part.desktop
%{tde_tdedocdir}/HTML/en/kmplot/
-%post -n trinity-kmplot
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmplot
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kpercentage
@@ -820,20 +662,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz
%{tde_tdedocdir}/HTML/en/kpercentage/
-%post -n trinity-kpercentage
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpercentage
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kstars
@@ -844,7 +672,7 @@ Requires: trinity-kstars-data = %{version}-%{release}
Requires: trinity-indi = %{version}-%{release}
%description -n trinity-kstars
-KStars is a graphical desktop planetarium for KDE. It depicts an
+KStars is a graphical desktop planetarium for TDE. It depicts an
accurate simulation of the night sky, including stars,
constellations, star clusters, nebulae, galaxies, all planets, the
Sun, the Moon, comets and asteroids. You can see the sky as it
@@ -860,7 +688,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-kstars
%defattr(-,root,root,-)
-%{tde_datadir}/config/kstarsrc
+%{tde_confdir}/kstarsrc
%{tde_bindir}/kstars
%{tde_tdeappdir}/kstars.desktop
%{tde_datadir}/config.kcfg/kstars.kcfg
@@ -868,20 +696,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz
%{tde_tdedocdir}/HTML/en/kstars/
-%post -n trinity-kstars
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kstars
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kstars-data
@@ -890,7 +704,7 @@ Group: System/GUI/Other
%description -n trinity-kstars-data
This package contains architecture-independent data files for KStars,
-the graphical desktop planetarium for KDE. This includes star
+the graphical desktop planetarium for TDE. This includes star
catalogues and astronomical images.
See the kstars package for further information.
@@ -930,20 +744,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz
%{tde_tdedocdir}/HTML/en/ktouch/
-%post -n trinity-ktouch
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktouch
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kturtle
@@ -981,20 +781,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/kturtle.png
%{tde_tdedocdir}/HTML/en/kturtle/
-%post -n trinity-kturtle
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kturtle
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kverbos
@@ -1024,20 +810,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz
%{tde_tdedocdir}/HTML/en/kverbos/
-%post -n trinity-kverbos
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kverbos
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kvoctrain
@@ -1067,7 +839,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-kvoctrain
%defattr(-,root,root,-)
-%{tde_datadir}/config/kvoctrainrc
+%{tde_confdir}/kvoctrainrc
%{tde_bindir}/kvoctrain
%{tde_bindir}/spotlight2kvtml
%{tde_libdir}/libkvoctraincore.so.*
@@ -1080,22 +852,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png
%{tde_tdedocdir}/HTML/en/kvoctrain/
-%post -n trinity-kvoctrain
-/sbin/ldconfig || :
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kvoctrain
-/sbin/ldconfig || :
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kwordquiz
@@ -1108,7 +864,7 @@ KWordQuiz is a flashcard-based tool that helps you to master new
vocabularies. It may be a language or any other kind of terminology.
KWordQuiz can open several types of vocabulary data. Supported are
-kvtml files used by other KDE programs such as KVocTrain, wql files
+kvtml files used by other TDE programs such as KVocTrain, wql files
used by WordQuiz for Windows, csv files with comma-separated text,
and xml.gz files created by Pauker (http://pauker.sourceforge.net).
@@ -1116,7 +872,7 @@ This package is part of Trinity, as a component of the TDE education module.
%files -n trinity-kwordquiz
%defattr(-,root,root,-)
-%{tde_datadir}/config/kwordquizrc
+%{tde_confdir}/kwordquizrc
%{tde_bindir}/kwordquiz
%{tde_tdeappdir}/kwordquiz.desktop
%{tde_datadir}/apps/kwordquiz/
@@ -1128,20 +884,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/mimelnk/application/x-kwordquiz.desktop
%{tde_tdedocdir}/HTML/en/kwordquiz/
-%post -n trinity-kwordquiz
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kwordquiz
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-libtdeedu3
@@ -1149,7 +891,7 @@ Summary: Library for use with Trinity educational apps
Group: System/GUI/Other
%description -n trinity-libtdeedu3
-The KDE-based library libtdeedu is used with educational
+The TDE-based library libtdeedu is used with educational
applications. It currently provides support for data plotting and
vocabulary items (including a parser for kvtml vocabulary files).
@@ -1162,12 +904,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_libdir}/libtdeeduplot.so.*
%{tde_libdir}/libtdeeduui.so.*
-%post -n trinity-libtdeedu3
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdeedu3
-/sbin/ldconfig || :
-
##########
%package -n trinity-libtdeedu-devel
@@ -1176,7 +912,7 @@ Group: Development/Libraries/Other
Requires: trinity-libtdeedu3 = %{version}-%{release}
%description -n trinity-libtdeedu-devel
-The KDE-based library libtdeedu is used with educational
+The TDE-based library libtdeedu is used with educational
applications. It currently provides support for data plotting and
vocabulary items (including a parser for kvtml vocabulary files).
@@ -1196,13 +932,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_libdir}/libtdeeduplot.la
%{tde_libdir}/libtdeeduplot.so
-%post -n trinity-libtdeedu-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdeedu-devel
-/sbin/ldconfig || :
-
-
##########
%package -n trinity-libkiten1
@@ -1211,7 +940,7 @@ Group: System/GUI/Other
#Requires: kanjidic
%description -n trinity-libkiten1
-Kiten is a Japanese reference/study tool for KDE. The library
+Kiten is a Japanese reference/study tool for TDE. The library
libkiten contains portions of Kiten that may be useful for other
applications. These portions include dictionary, character lookup
and widget classes.
@@ -1234,20 +963,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_datadir}/icons/locolor/16x16/actions/edit_add.png
%{tde_datadir}/icons/locolor/16x16/actions/edit_remove.png
-%post -n trinity-libkiten1
-for i in crystalsvg locolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libkiten1
-for i in crystalsvg locolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkiten-devel
@@ -1257,7 +972,7 @@ Requires: trinity-libkiten1 = %{version}-%{release}
Requires: trinity-tdelibs-devel >= %{version}
%description -n trinity-libkiten-devel
-Kiten is a Japanese reference/study tool for KDE. The library
+Kiten is a Japanese reference/study tool for TDE. The library
libkiten contains portions of Kiten that may be useful for other
applications. These portions include dictionary, character lookup
and widget classes.
@@ -1273,12 +988,6 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_libdir}/libkiten.la
%{tde_libdir}/libkiten.so
-%post -n trinity-libkiten-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkiten-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-indi
@@ -1341,12 +1050,6 @@ This package contains the development files for tdeedu.
%{tde_libdir}/libkvoctraincore.la
%{tde_libdir}/libkvoctraincore.so
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -1359,14 +1062,20 @@ This package contains the development files for tdeedu.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+# 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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__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}"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
@@ -1391,7 +1100,7 @@ fi
--enable-rpath \
--disable-gcc-hidden-visibility \
\
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?with_kig}
--enable-kig-python-scripting \
%else
--disable-kig-python-scripting \
@@ -1441,5 +1150,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec b/redhat/main/tdeedu/tdeedu-3.5.13.2.spec
index 3c9a88fce..336316c10 100644
--- a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec
+++ b/redhat/main/tdeedu/tdeedu-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
%define tde_version 3.5.13.2
# TDE specific building variables
@@ -22,7 +17,7 @@
Name: trinity-tdeedu
Summary: Educational/Edutainment applications
Version: %{tde_version}
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
License: GPLv2
Group: Amusements/Games
@@ -1314,7 +1309,7 @@ Provides: trinity-kdeedu-devel = %{version}-%{release}
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -1370,8 +1365,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc b/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames-14.0.0.spec
index 3f721ce66..993f41a18 100644
--- a/redhat/main/tdegames/tdegames-14.0.0.spec
+++ b/redhat/main/tdegames/tdegames-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdegames (version R14.0.0)
+# spec file for package tdegames (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,10 +21,13 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdegames
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -34,16 +37,11 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-Name: trinity-tdegames
+Name: trinity-%{tde_pkg}
Summary: Trinity Desktop Environment - Games
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@@ -60,18 +58,38 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: libtool
+# IDN support
+BuildRequires: libidn-devel
+
+# GAMIN support
+# Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires: gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+# ACL support
+BuildRequires: libacl-devel
+
+# ATTR support
+BuildRequires: libattr-devel
+
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
@@ -82,6 +100,9 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
+# GLIB2 support
+BuildRequires: glib2-devel
+
Obsoletes: trinity-kdegames < %{version}-%{release}
Provides: trinity-kdegames = %{version}-%{release}
Obsoletes: trinity-kdegames-libs < %{version}-%{release}
@@ -152,6 +173,7 @@ TDE desktop.
%files devel
%defattr(-,root,root,-)
+%{tde_datadir}/cmake/libtdegames.cmake
##########
@@ -176,20 +198,6 @@ This package is part of TDE, and a component of the TDE games module.
%{tde_datadir}/icons/crystalsvg/*/actions/roll.png
%{tde_datadir}/icons/crystalsvg/*/actions/highscore.png
-%post -n trinity-libtdegames1
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdegames1
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-libtdegames-devel
@@ -254,22 +262,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/apps/atlantik/
%{tde_tdedocdir}/HTML/en/atlantik/
-%post -n trinity-atlantik
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-atlantik
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-atlantik-devel
@@ -294,12 +286,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_libdir}/libatlantikui.so
%{tde_libdir}/libatlantikui.la
-%post -n trinity-atlantik-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-atlantik-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-kasteroids
@@ -325,20 +311,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/config.kcfg/kasteroids.kcfg
%{tde_tdedocdir}/HTML/en/kasteroids/
-%post -n trinity-kasteroids
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kasteroids
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-katomic
@@ -361,20 +333,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/katomic
%{tde_tdedocdir}/HTML/en/katomic/
-%post -n trinity-katomic
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-katomic
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kbackgammon
@@ -399,20 +357,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png
%{tde_tdedocdir}/HTML/en/kbackgammon/
-%post -n trinity-kbackgammon
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbackgammon
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kbattleship
@@ -436,20 +380,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/kbattleship
%{tde_tdedocdir}/HTML/en/kbattleship/
-%post -n trinity-kbattleship
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbattleship
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kblackbox
@@ -474,20 +404,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/kblackbox
%{tde_tdedocdir}/HTML/en/kblackbox/
-%post -n trinity-kblackbox
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kblackbox
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kbounce
@@ -522,20 +438,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/kbounce
%{tde_tdedocdir}/HTML/en/kbounce/
-%post -n trinity-kbounce
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbounce
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kenolaba
@@ -562,20 +464,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/kenolaba
%{tde_tdedocdir}/HTML/en/kenolaba/
-%post -n trinity-kenolaba
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kenolaba
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kfouleggs
@@ -599,20 +487,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png
%{tde_tdedocdir}/HTML/en/kfouleggs/
-%post -n trinity-kfouleggs
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfouleggs
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kgoldrunner
@@ -645,20 +519,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/kgoldrunner
%{tde_tdedocdir}/HTML/en/kgoldrunner/
-%post -n trinity-kgoldrunner
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgoldrunner
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kjumpingcube
@@ -684,20 +544,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/config.kcfg/kjumpingcube.kcfg
%{tde_tdedocdir}/HTML/en/kjumpingcube/
-%post -n trinity-kjumpingcube
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kjumpingcube
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-klickety
@@ -719,20 +565,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/apps/klickety/
%{tde_tdedocdir}/HTML/en/klickety/
-%post -n trinity-klickety
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klickety
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-klines
@@ -763,20 +595,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/icons/hicolor/*/apps/klines.png
%{tde_tdedocdir}/HTML/en/klines/
-%post -n trinity-klines
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klines
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kmahjongg
@@ -799,20 +617,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/config.kcfg/kmahjongg.kcfg
%{tde_tdedocdir}/HTML/en/kmahjongg/
-%post -n trinity-kmahjongg
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmahjongg
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kmines
@@ -839,20 +643,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/kmines
%{tde_tdedocdir}/HTML/en/kmines/
-%post -n trinity-kmines
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmines
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-knetwalk
@@ -875,20 +665,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_tdeappdir}/knetwalk.desktop
%{tde_tdedocdir}/HTML/en/knetwalk/
-%post -n trinity-knetwalk
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knetwalk
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kolf
@@ -903,7 +679,7 @@ This package is part of Trinity, and a component of the TDE games module.
%files -n trinity-kolf
%defattr(-,root,root,-)
-%{tde_datadir}/config/magic/kolf.magic
+%{tde_confdir}/magic/kolf.magic
%{tde_datadir}/apps/kolf/
%{tde_bindir}/kolf
%{tde_tdeappdir}/kolf.desktop
@@ -917,22 +693,7 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_libdir}/libkolf.so.1
%{tde_libdir}/libkolf.so.1.2.0
%{tde_tdedocdir}/HTML/en/kolf/
-
-%post -n trinity-kolf
-/sbin/ldconfig || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kolf
-/sbin/ldconfig || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+%{tde_confdir}/magic/kolf.magic.mgc
##########
@@ -953,12 +714,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_libdir}/libkolf.la
%{tde_libdir}/libkolf.so
-%post -n trinity-kolf-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kolf-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-konquest
@@ -980,20 +735,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/konquest
%{tde_tdedocdir}/HTML/en/konquest/
-%post -n trinity-konquest
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-konquest
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kpat
@@ -1014,20 +755,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/kpat
%{tde_tdedocdir}/HTML/en/kpat/
-%post -n trinity-kpat
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpat
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kpoker
@@ -1048,20 +775,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/kpoker
%{tde_tdedocdir}/HTML/en/kpoker/
-%post -n trinity-kpoker
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpoker
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kreversi
@@ -1091,20 +804,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/icons/hicolor/*/apps/kreversi.png
%{tde_tdedocdir}/HTML/en/kreversi/
-%post -n trinity-kreversi
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kreversi
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ksame
@@ -1127,20 +826,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_tdeappdir}/ksame.desktop
%{tde_tdedocdir}/HTML/en/ksame/
-%post -n trinity-ksame
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksame
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kshisen
@@ -1164,20 +849,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/kshisen
%{tde_tdedocdir}/HTML/en/kshisen/
-%post -n trinity-kshisen
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kshisen
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ksirtet
@@ -1205,20 +876,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/config.kcfg/ksirtet.kcfg
%{tde_tdedocdir}/HTML/en/ksirtet/
-%post -n trinity-ksirtet
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksirtet
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ksmiletris
@@ -1240,20 +897,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/ksmiletris
%{tde_tdedocdir}/HTML/en/ksmiletris/
-%post -n trinity-ksmiletris
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksmiletris
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ksnake
@@ -1275,20 +918,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/ksnake
%{tde_tdedocdir}/HTML/en/ksnake/
-%post -n trinity-ksnake
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksnake
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ksokoban
@@ -1324,20 +953,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_bindir}/ksokoban
%{tde_tdedocdir}/HTML/en/ksokoban/
-%post -n trinity-ksokoban
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksokoban
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kspaceduel
@@ -1363,20 +978,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/config.kcfg/kspaceduel.kcfg
%{tde_tdedocdir}/HTML/en/kspaceduel/
-%post -n trinity-kspaceduel
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kspaceduel
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ktron
@@ -1398,20 +999,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/config.kcfg/ktron.kcfg
%{tde_tdedocdir}/HTML/en/ktron/
-%post -n trinity-ktron
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktron
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ktuberling
@@ -1446,20 +1033,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_datadir}/mimelnk/application/x-tuberling.desktop
%{tde_tdedocdir}/HTML/en/ktuberling/
-%post -n trinity-ktuberling
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktuberling
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-twin4
@@ -1490,20 +1063,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_tdeappdir}/twin4.desktop
%{tde_tdedocdir}/HTML/en/twin4/
-%post -n trinity-twin4
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-twin4
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-lskat
@@ -1531,20 +1090,6 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_tdeappdir}/lskat.desktop
%{tde_tdedocdir}/HTML/en/lskat/
-%post -n trinity-lskat
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-lskat
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -1557,52 +1102,51 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/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 TDEDIR="%{tde_prefix}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -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 \
+ -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- --disable-setgid
-
-# WTF hack for RHEL4
-%if 0%{?rhel} == 4
-mkdir atlantik/libatlantic/.libs
-ln -s . atlantik/libatlantic/.libs/.libs
-%endif
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
# Updates applications categories for openSUSE
%if 0%{?suse_version}
@@ -1649,5 +1193,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdegames/tdegames-3.5.13.2.spec b/redhat/main/tdegames/tdegames-3.5.13.2.spec
index a362c1407..0b457e10a 100644
--- a/redhat/main/tdegames/tdegames-3.5.13.2.spec
+++ b/redhat/main/tdegames/tdegames-3.5.13.2.spec
@@ -1,50 +1,81 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdegames (version 3.5.13-SRU)
+#
+# 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 1
%define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdegames
+%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/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
-
-Name: trinity-tdegames
+Name: trinity-%{tde_pkg}
Summary: Trinity Desktop Environment - Games
Version: %{tde_version}
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
+Group: System/GUI/Other
+URL: http://www.trinitydesktop.org/
-License: GPLv2
-Group: Amusements/Games
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+#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
+BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
+
BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: fdupes
BuildRequires: libtool
-BuildRequires: qt3-devel >= 3.3.8.d
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
+# 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
Obsoletes: trinity-kdegames < %{version}-%{release}
Provides: trinity-kdegames = %{version}-%{release}
@@ -99,8 +130,7 @@ ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
-License: LGPLv2
+Group: Amusements/Games/Other
Requires: %{name} = %{version}-%{release}
Requires: trinity-tdelibs-devel >= %{tde_version}
@@ -112,8 +142,6 @@ Obsoletes: trinity-kdegames-devel < %{version}-%{release}
Provides: trinity-kdegames-devel = %{version}-%{release}
%description devel
-%{summary}.
-
Install %{name}-devel if you wish to develop or compile games for the
TDE desktop.
@@ -124,7 +152,7 @@ TDE desktop.
%package -n trinity-libtdegames1
Summary: Trinity games library and common files
-Group: Amusements/Games
+Group: Amusements/Games/Other
%description -n trinity-libtdegames1
This library provides a common infrastructure for several of the
@@ -137,10 +165,11 @@ This package is part of TDE, and a component of the TDE games module.
%files -n trinity-libtdegames1
%defattr(-,root,root,-)
%{tde_libdir}/libkdegames.so.*
+%dir %{tde_datadir}/apps/kdegames
+%dir %{tde_datadir}/apps/kdegames/pics
%{tde_datadir}/apps/kdegames/pics/star.png
%{tde_datadir}/icons/crystalsvg/*/actions/roll.png
%{tde_datadir}/icons/crystalsvg/*/actions/highscore.png
-#%{tde_tdedocdir}/HTML/en/%{name}-%{version}-apidocs/
%post -n trinity-libtdegames1
for f in crystalsvg ; do
@@ -160,7 +189,7 @@ done
%package -n trinity-libtdegames-devel
Summary: Trinity games library headers
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libtdegames1 = %{version}-%{release}
%description -n trinity-libtdegames-devel
@@ -180,7 +209,7 @@ This package is part of Trinity, and a component of the TDE games module.
%package card-data
Summary: Card decks for Trinity games
-Group: Amusements/Games
+Group: Amusements/Games/Other
%description card-data
Several different collections of card images for use by TDE games.
@@ -189,13 +218,13 @@ This package is part of Trinity, and a component of the TDE games module.
%files card-data
%defattr(-,root,root,-)
-%{tde_datadir}/apps/carddecks/*
+%{tde_datadir}/apps/carddecks/
##########
%package -n trinity-atlantik
Summary: TDE client for Monopoly-like network games
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-atlantik
This is a TDE client for playing Monopoly-like boardgames on the
@@ -240,7 +269,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-atlantik-devel
Summary: Development files for Atlantik
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-atlantik = %{version}-%{release}
%description -n trinity-atlantik-devel
@@ -270,7 +299,7 @@ This package is part of Trinity, and a component of the TDE games module.
%package -n trinity-kasteroids
Summary: Asteroids for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-kasteroids
You know this game. It is based on Warwick Allison's QwSpriteField
@@ -309,7 +338,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-katomic
Summary: Atomic Entertainment game for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Strategy/Other
%description -n trinity-katomic
This is a puzzle game, in which the object is to assemble a molecule
@@ -345,7 +374,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kbackgammon
Summary: A Backgammon game for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-kbackgammon
KBackgammon is a backgammon program for Trinity. It is based on the
@@ -383,7 +412,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kbattleship
Summary: Battleship game for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-kbattleship
This is an implementation of the Battleship game. Each player tries
@@ -420,7 +449,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kblackbox
Summary: A simple logical game for the Trinity project
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-kblackbox
KBlackBox is a game of hide and seek played on an grid of boxes. Your
@@ -458,7 +487,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kbounce
Summary: Jezzball clone for the K Desktop Environment
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-kbounce
This is a clone of the popular Jezzball game originally created by
@@ -506,7 +535,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kenolaba
Summary: Enolaba board game for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-kenolaba
kenolaba is a simple board strategy game that is played by two
@@ -546,7 +575,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kfouleggs
Summary: A TDE clone of the Japanese PuyoPuyo game
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-kfouleggs
KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
@@ -583,7 +612,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kgoldrunner
Summary: A Trinity clone of the Loderunner arcade game
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-kgoldrunner
KGoldrunner, a game of action and puzzle solving. Run through the
@@ -629,7 +658,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kjumpingcube
Summary: Tactical one or two player game
-Group: Amusements/Games
+Group: Amusements/Games/Strategy/Other
%description -n trinity-kjumpingcube
KJumpingCube is a simple tactical game. You can play it against the
@@ -668,7 +697,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-klickety
Summary: A Clickomania-like game for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-klickety
Klickety is an adaptation of the (perhaps) well-known Clickomania
@@ -682,8 +711,7 @@ This package is part of Trinity, and a component of the TDE games module.
%{tde_tdeappdir}/klickety.desktop
%{tde_datadir}/icons/hicolor/*/apps/klickety.png
%{tde_datadir}/icons/crystalsvg/*/actions/endturn.png
-%{tde_datadir}/apps/klickety/klicketyui.rc
-%{tde_datadir}/apps/klickety/eventsrc
+%{tde_datadir}/apps/klickety/
%{tde_tdedocdir}/HTML/en/klickety/
%post -n trinity-klickety
@@ -704,7 +732,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-klines
Summary: Color lines for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Strategy/Other
%description -n trinity-klines
KLines is a simple game. It is played by one player, so there is only
@@ -747,8 +775,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kmahjongg
-Summary: the classic mahjongg game for Trinity project
-Group: Amusements/Games
+Summary: The classic mahjongg game for Trinity project
+Group: Amusements/Games/Board/Other
%description -n trinity-kmahjongg
Your mission in this game is to remove all tiles from the game board. A
@@ -784,7 +812,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kmines
Summary: Minesweeper for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-kmines
KMines is the classic Minesweeper game. You must uncover all the
@@ -824,7 +852,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-knetwalk
Summary: A game for system administrators
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-knetwalk
This game presents the player with a rectangular field consisting of
@@ -859,7 +887,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kolf
Summary: Minigolf game for TDE
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-kolf
This is a minigolf game for TDE that allows you to go through different
@@ -904,7 +932,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kolf-devel
Summary: Development files for Kolf
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-kolf = %{version}-%{release}
%description -n trinity-kolf-devel
@@ -929,7 +957,7 @@ This package is part of Trinity, and a component of the TDE games module.
%package -n trinity-konquest
Summary: TDE based GNU-Lactic Konquest game
-Group: Amusements/Games
+Group: Amusements/Games/Strategy/Other
%description -n trinity-konquest
This the TDE version of Gnu-Lactic Konquest, a multi-player strategy
@@ -964,7 +992,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kpat
Summary: Trinity solitaire patience game
-Group: Amusements/Games
+Group: Amusements/Games/Board/Card
%description -n trinity-kpat
KPatience is a collection of 14 card games. All the games are single
@@ -998,7 +1026,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kpoker
Summary: Trinity based Poker clone
-Group: Amusements/Games
+Group: Amusements/Games/Board/Card
%description -n trinity-kpoker
KPoker is a TDE compliant clone of those highly addictive pocket
@@ -1032,7 +1060,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kreversi
Summary: Reversi for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-kreversi
Reversi is a simple strategy game that is played by two
@@ -1075,7 +1103,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-ksame
Summary: SameGame for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Strategy/Other
%description -n trinity-ksame
KSame is a simple game. It's played by one player, so there is only
@@ -1089,7 +1117,7 @@ This package is part of Trinity, and a component of the TDE games module.
%defattr(-,root,root,-)
%{tde_bindir}/ksame
%{tde_datadir}/icons/hicolor/*/apps/ksame.png
-%{tde_datadir}/apps/ksame/*
+%{tde_datadir}/apps/ksame/
%{tde_tdeappdir}/ksame.desktop
%{tde_tdedocdir}/HTML/en/ksame/
@@ -1111,7 +1139,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kshisen
Summary: Shisen-Sho for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-kshisen
KShisen-Sho is a single-player-game similar to Mahjongg and uses the
@@ -1148,7 +1176,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-ksirtet
Summary: Tetris and Puyo-Puyo games for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-ksirtet
This program is a clone of the well known game Tetris. You must fit
@@ -1189,7 +1217,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-ksmiletris
Summary: Tetris like game for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-ksmiletris
This is a game with falling blocks composed of different types of
@@ -1224,7 +1252,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-ksnake
Summary: Snake Race for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-ksnake
Snake Race is a game of speed and agility. You are a hungry snake and
@@ -1259,7 +1287,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-ksokoban
Summary: Sokoban game for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Strategy/Other
%description -n trinity-ksokoban
The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
@@ -1308,7 +1336,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kspaceduel
Summary: Arcade two-player space game for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-kspaceduel
KSpaceduel is an space arcade game for two players.
@@ -1347,7 +1375,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-ktron
Summary: Tron clone for the K Desktop Environment
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-ktron
The object of the game is to avoid running into walls, your own tail,
@@ -1382,7 +1410,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-ktuberling
Summary: Potato Guy for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Action/Arcade
%description -n trinity-ktuberling
KTuberling is a game intended for small children. Of course, it may
@@ -1430,7 +1458,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-twin4
Summary: Connect Four clone for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Other
%description -n trinity-twin4
Four wins is a game for two players. Each player is represented by a
@@ -1474,7 +1502,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-lskat
Summary: Lieutnant Skat card game for Trinity
-Group: Amusements/Games
+Group: Amusements/Games/Board/Card
%description -n trinity-lskat
Lieutnant Skat (from German Offiziersskat) is a card game for two
@@ -1513,7 +1541,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -1524,12 +1552,13 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
# Do not build against any "/usr" installed KDE
@@ -1537,7 +1566,7 @@ export KDEDIR="%{tde_prefix}"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%configure \
@@ -1571,17 +1600,48 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kasteroids Game ArcadeGame
+%suse_update_desktop_file -r KGoldrunner Game ArcadeGame
+%suse_update_desktop_file -r ksnake Game ArcadeGame
+%suse_update_desktop_file -r kspaceduel Game ArcadeGame
+%suse_update_desktop_file -r ktron Game ArcadeGame
+%suse_update_desktop_file -r kfouleggs Game BlocksGame
+%suse_update_desktop_file -r ksirtet Game BlocksGame
+%suse_update_desktop_file -r klickety Game BoardGame
+%suse_update_desktop_file -r ksmiletris Game BlocksGame
+%suse_update_desktop_file -r ktuberling Game KidsGame
+%suse_update_desktop_file -r atlantik Game BoardGame
+%suse_update_desktop_file -r kbackgammon Game BoardGame
+%suse_update_desktop_file -r kbattleship Game BoardGame
+%suse_update_desktop_file -r kblackbox Game BoardGame
+%suse_update_desktop_file -r kenolaba Game BoardGame
+%suse_update_desktop_file -r kmahjongg Game BoardGame
+%suse_update_desktop_file -r kreversi Game BoardGame
+%suse_update_desktop_file -r kshisen Game BoardGame
+%suse_update_desktop_file -r kwin4 Game BoardGame
+%suse_update_desktop_file -r kpat Game CardGame
+%suse_update_desktop_file -r kpoker Game CardGame
+%suse_update_desktop_file -r lskat Game CardGame
+%suse_update_desktop_file -r katomic Game LogicGame
+%suse_update_desktop_file -r kjumpingcube Game LogicGame
+%suse_update_desktop_file -r klines Game LogicGame
+%suse_update_desktop_file -r -G "Tactical Game" knetwalk Game LogicGame
+%suse_update_desktop_file -r kmines Game LogicGame
+%suse_update_desktop_file -r konquest Game LogicGame
+%suse_update_desktop_file -r ksame Game LogicGame
+%suse_update_desktop_file -r ksokoban Game LogicGame
+%suse_update_desktop_file -r kbounce Game LogicGame
+%suse_update_desktop_file -r kolf Game SportsGame
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}"
+
%clean
%__rm -rf %{buildroot}
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdegames/trinity-tdegames-rpmlintrc b/redhat/main/tdegames/trinity-tdegames-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdegames/trinity-tdegames-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
index c63d352a4..578aa0d02 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdegraphics (version R14.0.0)
+# spec file for package tdegraphics (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,15 +12,18 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdegraphics
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -30,15 +33,10 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity Desktop Environment - Graphics Applications
Group: Productivity/Graphics/Viewers
URL: http://www.trinitydesktop.org/
@@ -56,6 +54,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -98,8 +97,11 @@ BuildRequires: libtiff-devel
# PCRE support
BuildRequires: pcre-devel
+# ACL support
+BuildRequires: libacl-devel
+
# GIF support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?fedora} >= 28
BuildRequires: giflib-devel
%else
BuildRequires: libungif-devel
@@ -193,10 +195,15 @@ BuildRequires: libdrm-devel
# OPENEXR support
BuildRequires: OpenEXR-devel
-# poppler
+# POPPLER support
+%define with_pdf 1
+%if 0%{?with_pdf}
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} >= 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
BuildRequires: poppler-devel >= 0.12
-#BuildRequires: poppler-qt-devel >= 0.12
+%endif
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}poppler-devel
@@ -204,11 +211,11 @@ BuildRequires: %{_lib}poppler-devel
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
BuildRequires: trinity-poppler-devel >= 0.12
-BuildRequires: trinity-poppler-qt3-devel >= 0.12
+%endif
%endif
# LCMS support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?rhel} >= 7
BuildRequires: liblcms-devel
%else
BuildRequires: lcms-devel
@@ -217,6 +224,9 @@ BuildRequires: lcms-devel
# FRIBIDI support
BuildRequires: fribidi-devel
+# OPENSSL support
+BuildRequires: openssl-devel
+
# kamera
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
%define build_kamera 1
@@ -258,7 +268,9 @@ Requires: trinity-ksvg = %{version}-%{release}
Requires: trinity-kview = %{version}-%{release}
Requires: trinity-kviewshell = %{version}-%{release}
Requires: trinity-libkscan = %{version}-%{release}
+%if 0%{?with_pdf}
Requires: trinity-libpoppler-tqt = %{version}-%{release}
+%endif
%description
Graphics applications for the Trinity Desktop Environment, including
@@ -294,20 +306,6 @@ Group: Hardware/Camera
This is a digital camera io_slave for TDE which uses gphoto2 and libgpio
to allow access to your camera's pictures with the URL camera:/
-%post -n trinity-kamera
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kamera
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
%files -n trinity-kamera
%defattr(-,root,root,-)
%{tde_tdelibdir}/kcm_kamera.la
@@ -346,20 +344,6 @@ picker.
%{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
%{tde_tdedocdir}/HTML/en/kcoloredit/
-%post -n trinity-kcoloredit
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcoloredit
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package kfile-plugins
@@ -390,8 +374,10 @@ tags, etc. all from within the file manager).
%{tde_tdelibdir}/tdefile_jpeg.so
%{tde_tdelibdir}/tdefile_pcx.la
%{tde_tdelibdir}/tdefile_pcx.so
+%if 0%{?with_pdf}
%{tde_tdelibdir}/tdefile_pdf.la
%{tde_tdelibdir}/tdefile_pdf.so
+%endif
%{tde_tdelibdir}/tdefile_png.la
%{tde_tdelibdir}/tdefile_png.so
%{tde_tdelibdir}/tdefile_pnm.la
@@ -419,7 +405,9 @@ tags, etc. all from within the file manager).
%{tde_datadir}/services/tdefile_ico.desktop
%{tde_datadir}/services/tdefile_jpeg.desktop
%{tde_datadir}/services/tdefile_pcx.desktop
+%if 0%{?with_pdf}
%{tde_datadir}/services/tdefile_pdf.desktop
+%endif
%{tde_datadir}/services/tdefile_png.desktop
%{tde_datadir}/services/tdefile_pnm.desktop
%{tde_datadir}/services/tdefile_ps.desktop
@@ -452,20 +440,6 @@ This program and KPart allow the user to display *.DVI files from TeX.
%{tde_datadir}/services/kdvimultipage.desktop
%{tde_tdedocdir}/HTML/en/kdvi/
-%post -n trinity-kdvi
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdvi
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kfax
@@ -485,20 +459,6 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
%{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
%{tde_tdedocdir}/HTML/en/kfax/
-%post -n trinity-kfax
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfax
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kfaxview
@@ -525,22 +485,6 @@ kfax application once it reproduces all of kfax's features.
%{tde_datadir}/services/kfaxmultipage_tiff.desktop
%{tde_tdedocdir}/HTML/en/kfaxview/
-%post -n trinity-kfaxview
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kfaxview
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
##########
%package -n trinity-kgamma
@@ -564,20 +508,6 @@ Homepage: http://kgamma.berlios.de/index2.php
%{tde_datadir}/icons/hicolor/*/apps/kgamma.png
%{tde_tdedocdir}/HTML/en/kgamma/
-%post -n trinity-kgamma
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgamma
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kghostview
@@ -608,22 +538,6 @@ online.
%{tde_datadir}/services/kghostview_part.desktop
%{tde_tdedocdir}/HTML/en/kghostview/
-%post -n trinity-kghostview
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kghostview
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
##########
%package -n trinity-tdeiconedit
@@ -644,20 +558,6 @@ TDEIconedit allows you easily to create and edit icons.
%{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png
%{tde_tdedocdir}/HTML/en/tdeiconedit/
-%post -n trinity-tdeiconedit
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdeiconedit
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%if 0%{?build_kmrml}
@@ -693,14 +593,6 @@ MRML server.
%{tde_datadir}/services/mrml.protocol
%{tde_datadir}/services/mrml_part.desktop
-%post -n trinity-kmrml
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kmrml
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
%endif
##########
@@ -733,20 +625,6 @@ Homepage: http://kolourpaint.sourceforge.net
%{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
%{tde_tdedocdir}/HTML/en/kolourpaint/
-%post -n trinity-kolourpaint
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kolourpaint
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kooka
@@ -773,16 +651,10 @@ Homepage: http://kooka.kde.org/
%{tde_bindir}/kooka
%{tde_tdeappdir}/kooka.desktop
%{tde_datadir}/apps/kooka/
-%{tde_datadir}/config/kookarc
+%{tde_confdir}/kookarc
%{tde_datadir}/icons/hicolor/*/apps/kooka.png
%{tde_tdedocdir}/HTML/en/kooka/
-%post -n trinity-kooka
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kooka
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kpdf
@@ -808,20 +680,6 @@ application.
%{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
%{tde_datadir}/services/kpdf_part.desktop
-%post -n trinity-kpdf
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpdf
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kpovmodeler
@@ -855,22 +713,6 @@ Homepage: http://www.kpovmodeler.org
%{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
%doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
-%post -n trinity-kpovmodeler
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kpovmodeler
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
##########
%package -n trinity-kruler
@@ -889,20 +731,6 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
%{tde_datadir}/icons/hicolor/*/apps/kruler.png
%{tde_tdedocdir}/HTML/en/kruler/
-%post -n trinity-kruler
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kruler
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ksnapshot
@@ -922,20 +750,6 @@ The images can then be saved in a variety of formats.
%{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
%{tde_tdedocdir}/HTML/en/ksnapshot/
-%post -n trinity-ksnapshot
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksnapshot
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ksvg
@@ -967,12 +781,6 @@ application.
%{tde_datadir}/services/svgthumbnail.desktop
%{tde_datadir}/servicetypes/ksvgrenderer.desktop
-%post -n trinity-ksvg
-/sbin/ldconfig || :
-
-%postun -n trinity-ksvg
-/sbin/ldconfig || :
-
##########
%package -n trinity-kview
@@ -1029,22 +837,6 @@ as well.
%{tde_datadir}/servicetypes/kimageviewercanvas.desktop
%{tde_tdedocdir}/HTML/en/kview/
-%post -n trinity-kview
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kview
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
##########
%package -n trinity-kviewshell
@@ -1081,20 +873,6 @@ DjVu images.
%{tde_datadir}/services/djvumultipage.desktop
%{tde_datadir}/servicetypes/tdemultipage.desktop
-%post -n trinity-kviewshell
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-kviewshell
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkscan
@@ -1115,20 +893,6 @@ It provides an easy-to-use library, which allows you to access your scanner
%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
%{tde_datadir}/services/scanservice.desktop
-%post -n trinity-libkscan
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libkscan
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkscan-devel
@@ -1144,14 +908,9 @@ This package contains development files for Trinity's scanner library.
%{tde_libdir}/libkscan.la
%{tde_libdir}/libkscan.so
-%post -n trinity-libkscan-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkscan-devel
-/sbin/ldconfig || :
-
##########
+%if 0%{?with_pdf}
%package -n trinity-libpoppler-tqt
Summary: TQt support for Poppler
Group: Productivity/Graphics/Viewers
@@ -1167,15 +926,11 @@ This library is used by the Trinity graphics file plugins for PDF support.
%files -n trinity-libpoppler-tqt
%defattr(-,root,root,-)
%{tde_libdir}/libpoppler-tqt.so.*
-
-%post -n trinity-libpoppler-tqt
-/sbin/ldconfig || :
-
-%postun -n trinity-libpoppler-tqt
-/sbin/ldconfig || :
+%endif
##########
+%if 0%{?with_pdf}
%package -n trinity-libpoppler-tqt-devel
Summary: Development files for TQt support for Poppler
Group: Development/Libraries/Other
@@ -1197,12 +952,7 @@ This package contains the development files needed to compile applications again
%{tde_libdir}/libpoppler-tqt.la
%{tde_libdir}/libpoppler-tqt.so
%{tde_libdir}/pkgconfig/poppler-tqt.pc
-
-%post -n trinity-libpoppler-tqt-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libpoppler-tqt-devel
-/sbin/ldconfig || :
+%endif
##########
@@ -1215,7 +965,9 @@ Provides: trinity-kdegraphics-devel = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: trinity-libkscan-devel = %{version}-%{release}
+%if 0%{?with_pdf}
Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
+%endif
%description devel
This package contains the development files needed to compile
@@ -1251,12 +1003,6 @@ applications against tdegraphics libraries.
# cmake
%{tde_datadir}/cmake/*
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -1275,6 +1021,15 @@ applications against tdegraphics libraries.
# Fix applications icons
%__sed -i "kooka/kooka.desktop" -e "s|^Icon=.*|Icon=kooka|"
+# Fix FTBFS in RHEL 5
+%if 0%{?rhel} && 0%{?rhel} <= 5
+%__sed -i "kpdf/xpdf/aconf.h" \
+ -e "s|#define HAVE_MKSTEMPS 1|#define HAVE_MKSTEMPS 0|"
+%__sed -i "tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt" \
+ -e "/link_directories/ s|$|\n \${POPPLER_LIBRARY_DIRS}|" \
+ -e "/{POPPLER_INCLUDE_DIRS/ s|$|\n \${POPPLER_INCLUDE_DIRS}/..|"
+%endif
+
%build
unset QTDIR QTINC QTLIB
@@ -1304,6 +1059,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-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} \
@@ -1313,7 +1069,7 @@ fi
%{?with_paper:-DWITH_LIBPAPER=ON} \
-DWITH_TIFF=ON \
-DWITH_OPENEXR=ON \
- -DWITH_PDF=ON \
+ -DWITH_PDF=%{?with_pdf:ON}%{?!with_pdf:OFF} \
-DBUILD_ALL=ON \
-DBUILD_KUICKSHOW=OFF \
%{!?build_kmrml:-DBUILD_KMRML=OFF} \
@@ -1362,5 +1118,3 @@ popd
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14.0.0
diff --git a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec
index f75915f34..a625a2b6a 100644
--- a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec
+++ b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
%define tde_version 3.5.13.2
# TDE specific building variables
@@ -22,7 +17,7 @@
Name: trinity-tdegraphics
Version: %{tde_version}
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}
License: GPL
Summary: Trinity Desktop Environment - Graphics Applications
@@ -1335,11 +1330,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc b/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 4071cb33c..2a7aa0446 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdelibs (version R14.0.0)
+# spec file for package tdelibs (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,10 +21,13 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdelibs
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -34,15 +37,10 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE Libraries
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@@ -60,7 +58,10 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1: trinity-tdelibs-rpmlintrc
+Source1: %{name}-rpmlintrc
+
+Patch0: tdelibs-14.0.1.patch
+Patch1: tdelibs-14.1.0.patch
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
@@ -83,7 +84,10 @@ BuildRequires: trinity-filesystem >= %{tde_version}
Requires: trinity-arts >= %{tde_epoch}:1.5.10
Requires: trinity-filesystem >= %{tde_version}
+%if 0%{?mgaversion} >= 6
+%else
Requires: fileshareset >= 2.0
+%endif
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
@@ -121,6 +125,9 @@ BuildRequires: libtiff-devel
# OPENSSL support
BuildRequires: openssl-devel
+# ACL support
+BuildRequires: libacl-devel
+
# GLIB2 support
BuildRequires: glib2-devel
@@ -160,7 +167,10 @@ BuildRequires: bzip2-devel
%endif
# UTEMPTER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}utempter-devel
+%endif
+%if 0%{?rhel} >=5 || 0%{?fedora}
BuildRequires: libutempter-devel
%endif
%if 0%{?rhel} == 4
@@ -171,13 +181,13 @@ BuildRequires: utempter-devel
%endif
# HSPELL support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_hspell 1
BuildRequires: hspell-devel
%endif
# JASPER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_jasper 1
%if 0%{?suse_version}
BuildRequires: libjasper-devel
@@ -205,9 +215,12 @@ Requires: avahi
%endif
# OPENEXR support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_openexr 1
BuildRequires: OpenEXR-devel
+%if 0%{?pclinuxos}
+BuildRequires: libpthread-stubs
+%endif
%endif
# LIBTOOL
@@ -253,15 +266,25 @@ BuildRequires: xz-devel
%endif
# Certificates support
-%if 0%{?fedora} == 18 || 0%{?fedora} == 19
-%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
+%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: ca-certificates
Requires: ca-certificates
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6
+%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+%endif
+%if 0%{?fedora} == 18 || 0%{?fedora} == 19
+%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+Requires: rootcerts
+%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+%else
%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
Requires: openssl
%endif
+%endif
%if 0%{?rhel} == 5
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
Requires: openssl
@@ -298,16 +321,15 @@ Requires: %{cacert}
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%define xt_devel libXt-devel
%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define xt_devel libxt-devel
+%endif
%{?xt_devel:BuildRequires: %{xt_devel}}
### New features in TDE R14
# LIBMAGIC support
-%if 0%{?rhel} == 5
-BuildRequires: file
-%else
BuildRequires: file-devel
-%endif
# NETWORKMANAGER support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
@@ -336,10 +358,12 @@ BuildRequires: libudev-devel
# UDISKS support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6
+%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310
%define with_udisks 1
BuildRequires: udisks-devel
Requires: udisks
%endif
+%endif
# PMOUNT support
#Requires: pmount
@@ -350,8 +374,12 @@ Requires: udisks
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
BuildRequires: libudisks2-devel
%else
+%if 0%{?suse_version} >= 1550
+BuildRequires: libudisks2-0-devel
+%else
BuildRequires: udisks2-devel
%endif
+%endif
Requires: udisks2
%endif
@@ -372,6 +400,43 @@ Requires: upower
%define with_systemd 1
%endif
+# PCSCLITE support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}pcsclite-devel
+%else
+BuildRequires: pcsc-lite-devel
+%endif
+
+# PKCS11 support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}pkcs11-helper-devel
+%else
+BuildRequires: pkcs11-helper-devel
+%endif
+
+# OPENSC support
+BuildRequires: opensc
+
+# CRYPTSETUP support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}cryptsetup-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libcryptsetup-devel
+%endif
+%if 0%{?rhel} >= 7 || 0%{?fedora}
+BuildRequires: cryptsetup-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+BuildRequires: cryptsetup-luks-devel
+%endif
+
+# ELFICON support
+%if 0
+%define with_elficon 1
+BuildRequires: libr-devel >= 0.6.0
+%endif
+
%description
Libraries for the Trinity Desktop Environment:
@@ -452,7 +517,6 @@ kimgio (image manipulation).
%{tde_datadir}/applnk/tdeio_iso.desktop
%{tde_datadir}/apps/*
%exclude %{tde_datadir}/apps/ksgmltools2/
-%{tde_datadir}/config/*
%{tde_datadir}/emoticons/*
%{tde_datadir}/icons/crystalsvg/
%{tde_datadir}/icons/default.tde
@@ -464,6 +528,9 @@ kimgio (image manipulation).
%{tde_tdedocdir}/HTML/en/common/*
%{tde_tdedocdir}/HTML/en/tdespell/
+# Global Trinity configuration
+%config %{tde_confdir}
+
# Some setuid binaries need special care
%if 0%{?suse_version}
%verify(not mode) %{tde_bindir}/kgrantpty
@@ -492,8 +559,6 @@ if [ -d "%{tde_datadir}/locale/all_languages" ]; then
fi
%post
-/sbin/ldconfig || :
-
%if 0%{?suse_version}
# Sets permissions on setuid files (openSUSE specific)
%set_permissions %{tde_bindir}/kgrantpty
@@ -501,9 +566,6 @@ fi
%set_permissions %{tde_bindir}/start_tdeinit
%endif
-%postun
-/sbin/ldconfig || :
-
##########
%package devel
@@ -542,12 +604,6 @@ applications for TDE.
%{tde_datadir}/cmake/tdelibs.cmake
%{tde_libdir}/pkgconfig/tdelibs.pc
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -558,6 +614,15 @@ 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
+%__sed -i "tdecore/kinstance.h" \
+ -i "tdecore/tdeglobal.h" \
+ -e "/#ifdef __TDE_HAVE_TDEHWLIB/,/#endif/d"
+%endif
%build
@@ -588,6 +653,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
@@ -606,8 +672,8 @@ fi
%{?!with_jasper:-DWITH_JASPER=OFF} \
%{?!with_openexr:-DWITH_OPENEXR=OFF} \
-DWITH_UTEMPTER=ON \
- %{?!with_elficon:-DWITH_ELFICON=OFF} \
%{?!with_avahi:-DWITH_AVAHI=OFF} \
+ %{?!with_elficon:-DWITH_ELFICON=OFF} \
%{?!with_pcre:-DWITH_PCRE=OFF} \
%{?!with_inotify:-DWITH_INOTIFY=OFF} \
%{?!with_gamin:-DWITH_GAMIN=OFF} \
@@ -619,10 +685,14 @@ fi
%{?!with_upower:-DWITH_UPOWER=OFF} \
%{?!with_udisks:-DWITH_UDISKS=OFF} \
%{?!with_udisks2:-DWITH_UDISKS2=OFF} \
+ -DWITH_UDEVIL=OFF \
-DWITH_CONSOLEKIT=ON \
%{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \
-DWITH_SUDO_TDESU_BACKEND=OFF \
-DWITH_OLD_XDG_STD=OFF \
+ -DWITH_PCSC=ON \
+ -DWITH_PKCS=ON \
+ -DWITH_CRYPTSETUP=ON \
%{?!with_lzma:-DWITH_LZMA=OFF} \
-DWITH_LIBBFD=OFF \
%{?!with_xrandr:-DWITH_XRANDR=OFF} \
@@ -679,5 +749,3 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.patch b/redhat/main/tdelibs/tdelibs-14.0.1.patch
new file mode 100644
index 000000000..ab309f841
--- /dev/null
+++ b/redhat/main/tdelibs/tdelibs-14.0.1.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000..c4812b447
--- /dev/null
+++ b/redhat/main/tdelibs/tdelibs-14.1.0.patch
@@ -0,0 +1,13 @@
+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-3.5.13.2.spec b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
index 61cbf5344..7775f4908 100644
--- a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -29,20 +29,18 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_sbindir %{tde_prefix}/sbin
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
Version: %{tde_version}
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE Libraries
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@@ -62,6 +60,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: trinity-tdelibs-rpmlintrc
+%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch}
+
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
Obsoletes: trinity-kdelibs < %{version}-%{release}
@@ -95,6 +95,11 @@ BuildRequires: fdupes
BuildRequires: update-desktop-files
%endif
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
# KRB5 support
BuildRequires: krb5-devel
@@ -166,21 +171,18 @@ BuildRequires: utempter-devel
%endif
# HSPELL support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_hspell 1
BuildRequires: hspell-devel
%endif
# JASPER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_jasper 1
%if 0%{?suse_version}
BuildRequires: libjasper-devel
%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}jasper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: jasper-devel
%endif
%endif
@@ -190,7 +192,7 @@ BuildRequires: jasper-devel
%define with_avahi 1
BuildRequires: libavahi-tqt-devel >= 1:0.6.30
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}avahi-client-devel
+BuildRequires: avahi-client-devel
Requires: %{_lib}avahi-client3
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
@@ -200,7 +202,7 @@ Requires: avahi
%endif
# OPENEXR support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_openexr 1
BuildRequires: OpenEXR-devel
%endif
@@ -208,7 +210,7 @@ BuildRequires: OpenEXR-devel
# LIBTOOL
BuildRequires: libtool
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}ltdl-devel
+BuildRequires: libltdl-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libtool-ltdl-devel
@@ -240,7 +242,7 @@ Requires: xorg-x11
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
%define with_lzma 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}lzma-devel
+BuildRequires: liblzma-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: xz-devel
@@ -248,12 +250,12 @@ BuildRequires: xz-devel
%endif
# Certificates support
-%if 0%{?rhel} >= 6 || 0%{?fedora}
+%if 0%{?fedora} == 18 || 0%{?fedora} == 19
%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
BuildRequires: ca-certificates
Requires: ca-certificates
%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20
%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
Requires: openssl
%endif
@@ -266,6 +268,9 @@ Requires: openssl
BuildRequires: ca-certificates
Requires: ca-certificates
%endif
+%if "%{cacert}" != ""
+Requires: %{cacert}
+%endif
# XRANDR support
# On RHEL5, xrandr library is too old.
@@ -276,7 +281,7 @@ Requires: ca-certificates
# XCOMPOSITE support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
-%define xcomposite_devel %{_lib}xcomposite-devel
+%define xcomposite_devel libxcomposite-devel
%else
%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
%endif
@@ -290,10 +295,12 @@ Requires: ca-certificates
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%define xt_devel libXt-devel
%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define xt_devel libxt-devel
+%endif
%{?xt_devel:BuildRequires: %{xt_devel}}
-
%description
Libraries for the Trinity Desktop Environment:
TDE Libraries included: tdecore (TDE core library), tdeui (user interface),
@@ -419,12 +426,12 @@ fi
%package devel
Summary: TDE Libraries (Development files)
Group: Development/Libraries/X11
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{tde_epoch}:%{version}-%{release}
-Obsoletes: tdelibs-devel < %{version}-%{release}
-Provides: tdelibs-devel = %{version}-%{release}
-Obsoletes: trinity-kdelibs-devel < %{version}-%{release}
-Provides: trinity-kdelibs-devel = %{version}-%{release}
+Obsoletes: tdelibs-devel < %{tde_epoch}:%{version}-%{release}
+Provides: tdelibs-devel = %{tde_epoch}:%{version}-%{release}
+Obsoletes: trinity-kdelibs-devel < %{tde_epoch}:%{version}-%{release}
+Provides: trinity-kdelibs-devel = %{tde_epoch}:%{version}-%{release}
Requires: qt3-devel >= 3.3.8d
Requires: libtqt4-devel = %{tde_epoch}:4.2.0
@@ -459,7 +466,7 @@ applications for TDE.
##########
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -467,6 +474,7 @@ applications for TDE.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
%build
@@ -544,7 +552,7 @@ fi
# Fix 'tderesources.desktop' (openSUSE only)
%if 0%{?suse_version}
-%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
+%suse_update_desktop_file -r kresources Qt X-TDE-settings-desktop
%endif
# Remove setuid bit on some binaries.
@@ -571,16 +579,3 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_kdeinit"
%changelog
-* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4
-- Remove integrated fileshareset.
-- Update dependencies.
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-- Fix XDG menu
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
index 7df2d7387..cd73a0285 100644
--- a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
+++ b/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
@@ -1,3 +1,4 @@
setBadness('suse-dbus-unauthorized-service', 0)
setBadness('permissions-file-setuid-bit', 0)
setBadness('non-position-independent-executable', 0)
+setBadness('library-without-ldconfig-postun', 0)
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
new file mode 100644
index 000000000..44fd60fab
--- /dev/null
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
@@ -0,0 +1,1145 @@
+#
+# 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-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
new file mode 100644
index 000000000..086f7ec9f
--- /dev/null
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
@@ -0,0 +1,1158 @@
+#
+# 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
+Source1: %{name}-rpmlintrc
+
+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: cmake
+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
+%if 0%{?opensuse_bs} == 0
+%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
+%endif
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+# ACL support
+BuildRequires: libacl-devel
+
+# ATTR support
+BuildRequires: libattr-devel
+
+%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}}
+
+# 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}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DBIN_INSTALL_DIR="%{tde_bindir}" \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DDOC_INSTALL_DIR="%{tde_docdir}" \
+ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_ALSA=ON \
+ -DWITH_ARTS_AKODE=ON \
+ -DWITH_ARTS_AUDIOFILE=ON \
+ -DWITH_ARTS_MPEGLIB=ON \
+ -DWITH_ARTS_XINE=ON \
+ -DWITH_CDPARANOIA=ON \
+ -DWITH_FLAC=ON \
+ -DWITH_GSTREAMER=ON \
+ -DWITH_KSCD_CDDA=ON \
+ -DWITH_LAME=%{?with_lame:ON}%{!?with_lame:OFF} \
+ -DWITH_MUSICBRAINZ=%{?with_musicbrainz:ON}%{!?with_musicbrainz:OFF} \
+ -DWITH_TAGLIB=%{?with_taglib:ON}%{!?with_taglib:OFF} \
+ -DWITH_THEORA=ON \
+ -DWITH_VORBIS=ON \
+ -DBUILD_ALL=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{?buildroot}
+%__make install DESTDIR="%{?buildroot}" -C build
+
+# 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
index c27d6ce15..90fb9141a 100644..120000
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -1,1321 +1 @@
-#
-# spec file for package tdemultimedia (version R14.0.0)
-#
-# 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
-%define tde_version 14.0.0
-%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
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-
-Name: trinity-%{tde_pkg}
-Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
-Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-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
-%if 0%{?with_akode}
-BuildRequires: trinity-akode-devel
-%{?with_mad:BuildRequires: trinity-akode-libmad}
-%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
-
-# 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}
-%if 0%{?pclinuxos}
-BuildRequires: libgstreamer0.10-devel
-%else
-BuildRequires: %{_lib}gstreamer0.10-devel
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: gstreamer-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: gstreamer-0_10-devel
-%endif
-
-# X11 Libraries
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xxf86dga-devel
-BuildRequires: %{_lib}xxf86vm-devel
-%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} == 18 || 0%{?fedora} == 19 || 0%{?with_xine}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# LAME support
-%if 0%{?opensuse_bs} == 0
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?with_lame}
-%define with_lame 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: liblame-devel
-%else
-BuildRequires: %{_lib}lame-devel
-%endif
-%endif
-
-%if 0%{?suse_version}
-BuildRequires: libmp3lame-devel
-%endif
-
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: lame-devel
-%endif
-
-%endif
-%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/
-
-%post -n trinity-artsbuilder
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-artsbuilder
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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/
-
-%post -n trinity-juk
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-juk
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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/
-
-%post -n trinity-kaboodle
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaboodle
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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/
-
-%post -n trinity-kaudiocreator
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaudiocreator
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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
-
-%post tdeio-plugins
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun tdeio-plugins
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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/
-
-%post -n trinity-tdemid
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdemid
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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/
-
-%post -n trinity-kmix
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmix
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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/
-
-%post -n trinity-krec
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-krec
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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/
-
-%post -n trinity-kscd
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kscd
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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_mad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
-
-%post -n trinity-libarts-akode
-/sbin/ldconfig
-
-%postun -n trinity-libarts-akode
-/sbin/ldconfig
-%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
-
-%post -n trinity-libarts-audiofile
-/sbin/ldconfig
-
-%postun -n trinity-libarts-audiofile
-/sbin/ldconfig
-
-##########
-
-%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
-
-%post -n trinity-libarts-mpeglib
-/sbin/ldconfig
-
-%postun -n trinity-libarts-mpeglib
-/sbin/ldconfig
-%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
-
-%post -n trinity-libarts-xine
-/sbin/ldconfig
-
-%postun -n trinity-libarts-xine
-/sbin/ldconfig
-%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/
-
-%post -n trinity-libkcddb
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-libkcddb
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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
-
-%post -n trinity-mpeglib
-/sbin/ldconfig
-
-%postun -n trinity-mpeglib
-/sbin/ldconfig
-
-%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/
-
-%post -n trinity-noatun
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-noatun
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%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
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%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/config/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_includedir}/artsc:%{tde_tdeincludedir}/arts" \
- \
- --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}
-
-%__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/cdaudio_unmount.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
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
+tdemultimedia-14.0.0-cmake.spec \ No newline at end of file
diff --git a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
index 21a6019f3..397314c05 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdemultimedia (version 3.5.13.2)
+# spec file for package tdemultimedia (version 3.5.13-SRU)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -34,17 +34,12 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
Version: %{tde_version}
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-Group: Applications/Multimedia
+Release: %{?!preversion:6}%{?preversion:0_%{preversion}}%{?dist}
+Group: Productivity/Multimedia/Sound/Utilities
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -70,21 +65,21 @@ Provides: trinity-kdemultimedia-extras = %{version}-%{release}
Obsoletes: trinity-kdemultimedia-extras-libs < %{version}-%{release}
Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release}
-
-BuildRequires: trinity-arts-devel >= 1:1.5.10
+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}
+%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
@@ -96,10 +91,10 @@ BuildRequires: taglib-devel
# AKODE support
%if 0%{?with_akode}
BuildRequires: trinity-akode-devel
-%{?with_mad:BuildRequires: trinity-akode-libmad}
+%{?with_libmad:BuildRequires: trinity-akode-libmad}
%endif
-BuildRequires: desktop-file-utils
+# ZLIB support
BuildRequires: zlib-devel
# MUSICBRAINZ support
@@ -173,7 +168,7 @@ BuildRequires: libXxf86vm-devel
%endif
# XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?with_xine}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?with_xine}
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
@@ -192,7 +187,7 @@ BuildRequires: libxine-devel
# LAME support
%if 0%{?opensuse_bs} == 0
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?with_lame}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel}
%define with_lame 1
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -230,7 +225,7 @@ 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}
-Requires: trinity-mpeglib = %{version}-%{release}
+%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}}
Requires: trinity-noatun = %{version}-%{release}
@@ -255,7 +250,7 @@ TDE, including:
%package -n trinity-artsbuilder
Summary: Synthesizer designer for aRts
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/Sound/Mixers
Requires: trinity-kicker >= %{tde_version}
%description -n trinity-artsbuilder
@@ -436,7 +431,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-juk
Summary: Music organizer and player for Trinity
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/Sound/Players
%description -n trinity-juk
JuK (pronounced "jook") is a jukebox and music manager for the TDE
@@ -484,7 +479,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kaboodle
Summary: Light, embedded media player for Trinity
-Group: Applications/Multimedia
+Group: System/GUI/Other
%if 0%{?with_xine}
Requires: trinity-libarts-xine = %{version}-%{release}
@@ -524,7 +519,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kaudiocreator
Summary: CD ripper and audio encoder frontend for Trinity
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/CD/Grabbers
Requires: %{name}-tdeio-plugins = %{version}-%{release}
Requires: vorbis-tools
@@ -568,7 +563,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package kfile-plugins
Summary: An au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/Sound/Utilities
%description kfile-plugins
au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
@@ -613,7 +608,7 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
%package kappfinder-data
Summary: Multimedia data for kappfinder
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/Sound/Utilities
Requires: trinity-kappfinder >= %{tde_version}
Requires: trinity-tdebase-runtime-data-common >= %{tde_version}
@@ -631,7 +626,7 @@ This package provides data on multimedia applications for kappfinder.
%package tdeio-plugins
Summary: Enables the browsing of audio CDs under Konqueror
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/Sound/Utilities
Requires: trinity-tdebase-tdeio-plugins >= %{tde_version}
Obsoletes: trinity-tdemultimedia-kio-plugins < %{version}-%{release}
@@ -662,7 +657,8 @@ Konqueror and the audiocd:/ URL.
%{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/kioslave/audiocd.docbook
+%{tde_tdedocdir}/HTML/en/kioslave/
+%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png
%post tdeio-plugins
/sbin/ldconfig
@@ -676,7 +672,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-tdemid
Summary: MIDI/karaoke player for Trinity
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/Sound/Midi
Obsoletes: trinity-kmid < %{version}-%{release}
Provides: trinity-kmid = %{version}-%{release}
@@ -717,7 +713,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kmix
Summary: Sound mixer applet for Trinity
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/Sound/Mixers
Requires: trinity-kicker >= %{tde_version}
%description -n trinity-kmix
@@ -764,7 +760,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-krec
Summary: Sound recorder utility for Trinity
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/CD/Record
%description -n trinity-krec
This is a sound recording utility for Trinity.
@@ -818,7 +814,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kscd
Summary: Audio CD player for Trinity
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/CD/Players
%description -n trinity-kscd
This is Trinity's audio CD player.
@@ -855,7 +851,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%if 0%{?with_akode}
%package -n trinity-libarts-akode
Summary: Akode plugin for aRts
-Group: Environment/Libraries
+Group: Productivity/Multimedia/Other
%description -n trinity-libarts-akode
This package contains akode plugins for aRts.
@@ -873,7 +869,7 @@ This package contains akode plugins for aRts.
%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
# Requires MAD support
-%{?with_mad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
+%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
%post -n trinity-libarts-akode
/sbin/ldconfig
@@ -886,7 +882,7 @@ This package contains akode plugins for aRts.
%package -n trinity-libarts-audiofile
Summary: Audiofile plugin for aRts
-Group: Environment/Libraries
+Group: Productivity/Multimedia/Other
%description -n trinity-libarts-audiofile
This package contains audiofile plugins for aRts.
@@ -910,7 +906,7 @@ This package contains audiofile plugins for aRts.
%if 0%{?with_mpeg}
%package -n trinity-libarts-mpeglib
Summary: Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group: Environment/Libraries
+Group: Productivity/Multimedia/Other
%description -n trinity-libarts-mpeglib
This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
@@ -944,7 +940,7 @@ This is the arts (TDE Sound daemon) plugin.
%if 0%{?with_xine}
%package -n trinity-libarts-xine
Summary: ARTS plugin enabling xine support
-Group: Environment/Libraries
+Group: Productivity/Multimedia/Other
%description -n trinity-libarts-xine
This package contains aRts' xine plugin, allowing the use of the xine
@@ -974,7 +970,7 @@ multimedia engine though aRts.
%package -n trinity-libkcddb
Summary: CDDB library for Trinity
-Group: Environment/Libraries
+Group: Productivity/Multimedia/Other
Requires: trinity-kcontrol >= %{tde_version}
%description -n trinity-libkcddb
@@ -1001,10 +997,14 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
+%if 0%{?with_mpeg}
+
%package -n trinity-mpeglib
Summary: MP3 and MPEG-1 audio and video library
-Group: Environment/Libraries
+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
@@ -1019,9 +1019,7 @@ and WAV playback
%{tde_bindir}/yaf-tplay
%{tde_bindir}/yaf-vorbis
%{tde_bindir}/yaf-yuv
-%if 0%{?with_mpeg}
%{tde_libdir}/libmpeg-0.3.0.so
-%endif
%{tde_libdir}/libyafcore.so
%{tde_libdir}/libyafxplayer.so
@@ -1031,11 +1029,13 @@ and WAV playback
%postun -n trinity-mpeglib
/sbin/ldconfig
+%endif
+
##########
%package -n trinity-noatun
Summary: Media player for Trinity
-Group: Applications/Multimedia
+Group: Productivity/Multimedia/Video/Players
Requires: trinity-tdebase-bin >= %{tde_version}
# 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
@@ -1136,7 +1136,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package devel
Summary: Development files for %{name}, aRts and noatun plugins
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: %{name} = %{version}-%{release}
Requires: trinity-tdelibs-devel >= %{tde_version}
@@ -1197,8 +1197,10 @@ noatun plugins.
%{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
%post devel
/sbin/ldconfig
@@ -1208,7 +1210,7 @@ noatun plugins.
##########
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -1225,11 +1227,11 @@ noatun plugins.
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__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|"
+%__sed -i "kioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|"
%build
@@ -1263,16 +1265,19 @@ fi
\
--with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
\
- --with-cdparanoia \
- --with-flac \
- --with-theora \
--with-vorbis \
+ --without-ossaudio \
--with-alsa \
- --with-gstreamer \
+ --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_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \
+ --with-gstreamer \
+ --with-kscd-cdda \
+ --with-theora \
+ --with-flac \
%{?with_xine:--with-xine} %{!?with_xine:--without-xine}
%__make %{?_smp_mflags} || %__make
@@ -1285,28 +1290,30 @@ export PATH="%{tde_bindir}:${PATH}"
# Disable MPEG support entirely
%if 0%{?with_mpeg} == 0
- %__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
- %__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
- %__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
- %__rm %{?buildroot}%{tde_libdir}/libmpeg*
- %__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
+%__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 $RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64}/apps/
+%__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/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png;done
+for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.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 kmid AudioVideo Midi
%suse_update_desktop_file artsbuilder AudioVideo AudioVideoEditing
%suse_update_desktop_file artscontrol AudioVideo AudioVideoEditing
%suse_update_desktop_file kmix AudioVideo Mixer
@@ -1318,8 +1325,8 @@ popd
%suse_update_desktop_file audiocd
%endif
-# Symlinks duplicate files
-%fdupes -s "%{?buildroot}%{tde_datadir}"
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
%clean
@@ -1327,18 +1334,3 @@ popd
%changelog
-* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-5
-- Mageia 3: rebuild against Xine 1.2
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Rebuild with NDEBUG option
-- Fix XDG menu
-
-* Mon Jun 17 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Enable "LAME" support
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc b/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
index b73791a00..28717c158 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
@@ -1,5 +1,9 @@
+%if 0%{?fedora} >= 23
+%define _hardened_ldflags %nil
+%endif
+
#
-# spec file for package tdenetwork (version R14.0.0)
+# spec file for package tdenetwork (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +16,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,10 +25,13 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdenetwork
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -36,20 +43,20 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
# Avoids relinking, which breaks consolehelper
%define dont_relink 1
+%if "%{?tde_version}" == "14.0.4"
+%define with_aim 1
+%else
+%define with_aim 0
+%endif
Name: trinity-%{tde_pkg}
Summary: Trinity Desktop Environment - Network Applications
Group: Applications/Internet
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -196,6 +203,9 @@ BuildRequires: libv4l-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}v4l-devel
%endif
+%if 0%{?rhel} == 5
+BuildRequires: kernel-headers
+%endif
# XML support
BuildRequires: libxml2-devel
@@ -215,17 +225,15 @@ BuildRequires: speex-devel
#{?fedora:Requires(hint): qca-tls}
Requires: jasper
+# ACL support
+BuildRequires: libacl-devel
+
# MEANWHILE support
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
%define with_meanwhile 1
BuildRequires: meanwhile-devel
%endif
-# ORTP support
-#if 0%{?rhel} >= 6 || 0#{?fedora} >= 15
-#BuildRequires: ortp-devel
-#endif
-
# SPEEX support
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
%define with_speex 1
@@ -315,12 +323,6 @@ DCOP is the TDE interprocess communication protocol.
%{tde_bindir}/rssservice
%{tde_datadir}/services/rssservice.desktop
-%post -n trinity-dcoprss
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-dcoprss
-update-desktop-database 2> /dev/null || :
-
##########
%package devel
@@ -356,12 +358,6 @@ development-related files for the TDE network module.
%{tde_libdir}/librss.la
%{tde_libdir}/librss.so
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
##########
%package filesharing
@@ -392,18 +388,6 @@ NFS and Samba.
%{tde_tdedocdir}/HTML/en/kcontrol/fileshare/
%{tde_tdedocdir}/HTML/en/kcontrol/kcmsambaconf/
-%post filesharing
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun filesharing
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kdict
@@ -429,18 +413,6 @@ basic as well as advanced queries.
%{tde_datadir}/icons/hicolor/*/apps/kdict.*
%{tde_tdedocdir}/HTML/en/kdict
-%post -n trinity-kdict
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kdict
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package tdefile-plugins
@@ -463,12 +435,6 @@ dialog in konqueror and other file-handling applications.
%{tde_tdelibdir}/tdefile_torrent.so
%{tde_datadir}/services/tdefile_torrent.desktop
-%post tdefile-plugins
-update-desktop-database 2> /dev/null || :
-
-%postun tdefile-plugins
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kget
@@ -506,18 +472,6 @@ applications and Netscape.
%{tde_datadir}/sounds/KGet_Started.ogg
%{tde_tdedocdir}/HTML/en/kget
-%post -n trinity-kget
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kget
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-knewsticker
@@ -549,18 +503,6 @@ good news sources which provide such files.
%{tde_datadir}/services/kntsrcfilepropsdlg.desktop
%{tde_tdedocdir}/HTML/en/knewsticker
-%post -n trinity-knewsticker
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-knewsticker
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kopete
@@ -692,13 +634,8 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz
%{tde_datadir}/icons/crystalsvg/*/actions/newmessage.mng
%{tde_datadir}/icons/hicolor/*/actions/newmessage.mng
-%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
%{tde_datadir}/icons/crystalsvg/*/apps/icq_protocol.png
%{tde_datadir}/icons/crystalsvg/*/apps/irc_protocol.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png
%{tde_datadir}/icons/crystalsvg/*/actions/icq_away.png
%{tde_datadir}/icons/crystalsvg/*/actions/icq_connecting.mng
%{tde_datadir}/icons/crystalsvg/*/actions/icq_dnd.png
@@ -716,10 +653,6 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/icons/crystalsvg/*/actions/irc_op.png
%{tde_datadir}/icons/crystalsvg/*/actions/irc_server.png
%{tde_datadir}/icons/crystalsvg/*/actions/irc_voice.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_away.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng
-%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_online.png
%{tde_datadir}/icons/hicolor/*/actions/icq_away.png
%{tde_datadir}/icons/hicolor/*/actions/icq_connecting.mng
%{tde_datadir}/icons/hicolor/*/actions/icq_dnd.png
@@ -729,11 +662,9 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/icons/hicolor/*/actions/icq_occupied.png
%{tde_datadir}/icons/hicolor/*/actions/icq_offline.png
%{tde_datadir}/icons/hicolor/*/actions/icq_online.png
-%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png
%{tde_datadir}/icons/hicolor/*/apps/icq_protocol.png
%{tde_datadir}/mimelnk/application/x-icq.desktop
%{tde_datadir}/mimelnk/application/x-kopete-emoticons.desktop
-%{tde_datadir}/services/aim.protocol
%{tde_datadir}/services/chatwindow.desktop
%{tde_datadir}/services/emailwindow.desktop
%{tde_datadir}/services/jabberdisco.protocol
@@ -753,21 +684,20 @@ Support for more IM protocols can be added through a plugin system.
%{tde_datadir}/config.kcfg/motionawayconfig.kcfg
# smpp plugin for kopete
%{tde_datadir}/config.kcfg/smpppdcs.kcfg
-
-
-%post -n trinity-kopete
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-/sbin/ldconfig
-
-%postun -n trinity-kopete
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-/sbin/ldconfig
+# aim support is deprecated in TDE 14.1.0
+%if 0%{?with_aim}
+%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_away.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng
+%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_online.png
+%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png
+%{tde_datadir}/services/aim.protocol
+%endif
##########
@@ -812,18 +742,6 @@ designed to be used for sharing files with friends.
%{tde_datadir}/services/kpfpropertiesdialogplugin.desktop
%{tde_tdedocdir}/HTML/en/kpf
-%post -n trinity-kpf
-for f in crystalsvg ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kpf
-for f in crystalsvg ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kppp
@@ -866,6 +784,11 @@ track of the time spent online for you.
%{tde_datadir}/apps/kppp/
%{tde_datadir}/icons/hicolor/*/apps/kppp.png
%{tde_tdedocdir}/HTML/en/kppp/
+%if 0%{?suse_version} >= 1500
+%dir %{_sysconfdir}/ppp
+%endif
+%dir %{_sysconfdir}/ppp/peers
+%{_sysconfdir}/ppp/peers/kppp-options
%if 0%{?with_consolehelper}
%config(noreplace) /etc/security/console.apps/kppp3
@@ -876,21 +799,11 @@ track of the time spent online for you.
%endif
%post -n trinity-kppp
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
%if 0%{?suse_version}
# Sets permissions on setuid files (openSUSE specific)
%set_permissions %{tde_bindir}/kppp
%endif
-%postun -n trinity-kppp
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-krdc
@@ -917,18 +830,6 @@ Servers using RDP.
%{tde_tdedocdir}/HTML/en/tdeioslave/rdp/
%{tde_tdedocdir}/HTML/en/tdeioslave/vnc/
-%post -n trinity-krdc
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-krdc
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-krfb
@@ -964,18 +865,6 @@ task.
%{tde_datadir}/servicetypes/kinetdmodule.desktop
%{tde_tdedocdir}/HTML/en/krfb/
-%post -n trinity-krfb
-for f in crystalsvg hicolor locolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-krfb
-for f in crystalsvg hicolor locolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-ksirc
@@ -997,25 +886,10 @@ recommended package libio-socket-ssl-perl.
%{tde_tdelibdir}/ksirc.*
%{tde_tdeappdir}/ksirc.desktop
%{tde_datadir}/apps/ksirc/
-%config(noreplace) %{tde_datadir}/config/ksircrc
+%config(noreplace) %{tde_confdir}/ksircrc
%{tde_datadir}/icons/hicolor/*/apps/ksirc.*
%{tde_tdedocdir}/HTML/??/ksirc/
-%post -n trinity-ksirc
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-/sbin/ldconfig
-
-
-%postun -n trinity-ksirc
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-/sbin/ldconfig
-
##########
%package -n trinity-ktalkd
@@ -1023,6 +897,7 @@ Summary: Talk daemon for Trinity
Group: Applications/Internet
Requires: trinity-kcontrol >= %{tde_version}
Requires: trinity-tdebase-data >= %{tde_version}
+Requires: xinetd
%description -n trinity-ktalkd
KTalkd is an enhanced talk daemon - a program to handle incoming talk
@@ -1036,26 +911,15 @@ and shouldn't be run on a multi-user machine.
%{tde_bindir}/mail.local
%{tde_tdelibdir}/kcm_ktalkd.*
%{tde_tdeappdir}/kcmktalkd.desktop
-%config(noreplace) %{tde_datadir}/config/ktalkdrc
+%config(noreplace) %{tde_confdir}/ktalkdrc
%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
%{tde_datadir}/sounds/ktalkd.wav
+%dir %{_sysconfdir}/xinetd.d
%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
%{tde_tdedocdir}/HTML/en/ktalkd
-%post -n trinity-ktalkd
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-ktalkd
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%if "%{?_with_wifi:1}" == "1"
@@ -1084,18 +948,6 @@ wavelan card that uses the wireless extensions interface.
%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
%{tde_tdedocdir}/HTML/en/kwifimanager/
%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/
-
-%post -n trinity-kwifimanager
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kwifimanager
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
%endif
##########
@@ -1114,12 +966,6 @@ automatically when needed.
%{tde_libdir}/librss.so.*
%{tde_datadir}/cmake/librss.cmake
-%post -n trinity-librss
-/sbin/ldconfig
-
-%postun -n trinity-librss
-/sbin/ldconfig
-
##########
%package -n trinity-lisa
@@ -1152,12 +998,6 @@ but relying only on the TCP/IP protocol.
%{tde_bindir}/lisa
%{tde_bindir}/reslisa
-%post -n trinity-lisa
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-lisa
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kdnssd
@@ -1186,12 +1026,6 @@ A tdeioslave and tded module that provide Zeroconf support. Try
%{tde_tdelibdir}/kded_dnssdwatcher.so
%{tde_tdelibdir}/kded_dnssdwatcher.la
-%post -n trinity-kdnssd
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kdnssd
-update-desktop-database 2> /dev/null || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -1238,6 +1072,7 @@ fi
-DWITH_GCC_VISIBILITY=OFF \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@@ -1350,5 +1185,3 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
index 35dcfa815..aeebf5048 100644
--- a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
+++ b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
@@ -1,63 +1,99 @@
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-
-# If TDE is built iwn a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdenetwork (version 3.5.13-SRU)
+#
+# 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 1
%define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdenetwork
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
%define tde_sbindir %{tde_prefix}/sbin
-
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
-# Fedora review: http://bugzilla.redhat.com/195486
+Name: trinity-%{tde_pkg}
+Summary: Trinity Desktop Environment - Network Applications
+Group: Applications/Internet
+Version: %{tde_version}
+Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
+URL: http://www.trinitydesktop.org/
-## Conditional build:
-# RHEL6: xmms is outdated !
-#define _with_xmms --with-xmms
-%ifnarch s390 s390x
-%define _with_wifi --with-wifi
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
%endif
-Name: trinity-tdenetwork
-Version: %{tde_version}
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-Summary: Trinity Desktop Environment - Network Applications
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-License: GPLv2
-Group: Applications/Internet
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kppp.pamd
Source2: ktalk
+%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch}
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
BuildRequires: cmake >= 2.8
BuildRequires: gettext
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: coreutils
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
+
+# OPENSSL support
BuildRequires: openssl-devel
+
+# TLS support
BuildRequires: gnutls-devel
# SQLITE support
@@ -73,6 +109,16 @@ BuildRequires: sqlite-devel
BuildRequires: libgadu-devel
%endif
+# PCRE support
+BuildRequires: pcre-devel
+
+# GAMIN support
+# Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires: gamin-devel
+%endif
+
# XTST support
%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210
BuildRequires: libXtst-devel
@@ -81,13 +127,34 @@ BuildRequires: libXtst-devel
BuildRequires: libxtst-devel
%endif
+# XMU support
+%if 0%{?suse_version} == 1140
+BuildRequires: xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXmu-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
+BuildRequires: libxmu-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
+%endif
+
# Other stuff
%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-BuildRequires: libXmu-devel
BuildRequires: libXScrnSaver-devel
BuildRequires: libXxf86vm-devel
%endif
+# Fedora review: http://bugzilla.redhat.com/195486
+
+## Conditional build:
+# RHEL6: xmms is outdated !
+#define _with_xmms --with-xmms
+%ifnarch s390 s390x
+%define _with_wifi --with-wifi
+%endif
# Wifi support
%if "%{?_with_wifi:1}" == "1"
@@ -97,7 +164,7 @@ BuildRequires: wireless-tools-devel
%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
BuildRequires: %{_lib}iw29-devel
%endif
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 || 0%{?suse_version}
BuildRequires: wireless-tools
%endif
%if 0%{?suse_version} || 0%{?mgaversion} >= 3
@@ -112,7 +179,7 @@ BuildRequires: openslp-devel
%endif
%ifarch %{ix86}
-# BR: %{tde_includedir}/valgrind/valgrind.h
+# BR: /usr/include/valgrind/valgrind.h
BuildRequires: valgrind
%endif
@@ -151,9 +218,9 @@ BuildRequires: meanwhile-devel
%endif
# ORTP support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+#if 0%{?rhel} >= 6 || 0#{?fedora} >= 15
#BuildRequires: ortp-devel
-#%endif
+#endif
# SPEEX support
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
@@ -181,7 +248,7 @@ Provides: tdenetwork = %{version}-%{release}
Requires: trinity-dcoprss = %{version}-%{release}
Requires: %{name}-filesharing = %{version}-%{release}
Requires: trinity-kdict = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
+Requires: %{name}-tdefile-plugins = %{version}-%{release}
Requires: trinity-kget = %{version}-%{release}
Requires: trinity-knewsticker = %{version}-%{release}
Requires: trinity-kopete = %{version}-%{release}
@@ -204,7 +271,7 @@ Networking applications, including:
* dcoprss: RSS utilities for Trinity
* filesharing: Network filesharing configuration module for Trinity
* kdict: Dictionary client for Trinity
-* kfile-plugins: Torrent metainfo plugin for Trinity
+* tdefile-plugins: Torrent metainfo plugin for Trinity
* kget: downloader manager
* knewsticker: RDF newsticker applet
* kopete: chat client
@@ -268,17 +335,14 @@ Obsoletes: tdenetwork-devel < %{version}-%{release}
Provides: tdenetwork-devel = %{version}-%{release}
%description devel
-This is the development package which contains the headers for the KDE RSS
+This is the development package which contains the headers for the TDE RSS
library as well as the Kopete chat client, as well as miscellaneous
development-related files for the TDE network module.
%files devel
%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kopete/*.h
-%{tde_tdeincludedir}/kopete/ui/*.h
-%{tde_tdeincludedir}/rss/*.h
-%{tde_libdir}/libkdeinit_kdict.la
-%{tde_libdir}/libkdeinit_ksirc.la
+%{tde_tdeincludedir}/kopete/
+%{tde_tdeincludedir}/rss/
%{tde_libdir}/libkopete.la
%{tde_libdir}/libkopete.so
%{tde_libdir}/libkopete_msn_shared.la
@@ -320,6 +384,7 @@ NFS and Samba.
%{tde_tdelibdir}/kcm_kcmsambaconf.so
%{tde_tdeappdir}/fileshare.desktop
%{tde_tdeappdir}/kcmsambaconf.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kcmfileshare.png
%{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png
%{tde_datadir}/services/fileshare_propsdlgplugin.desktop
@@ -340,6 +405,7 @@ update-desktop-database 2> /dev/null || :
%package -n trinity-kdict
Summary: Dictionary client for Trinity
Group: Applications/Internet
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-kdict
KDict is an advanced TDE graphical client for the DICT Protocol, with full
@@ -373,35 +439,39 @@ update-desktop-database 2> /dev/null || :
##########
-%package kfile-plugins
+%package tdefile-plugins
Summary: Torrent metainfo plugin for Trinity
Group: Applications/Internet
Obsoletes: tdenetwork-kfile-plugins < %{version}-%{release}
Provides: tdenetwork-kfile-plugins = %{version}-%{release}
+Obsoletes: trinity-tdenetwork-kfile-plugins < %{version}-%{release}
+Provides: trinity-tdenetwork-kfile-plugins = %{version}-%{release}
-%description kfile-plugins
+%description tdefile-plugins
This package provides a metainformation plugin for bittorrent files.
-TDE uses kfile-plugins to provide metainfo tab in the files properties
+TDE uses tdefile-plugins to provide metainfo tab in the files properties
dialog in konqueror and other file-handling applications.
-%files kfile-plugins
+%files tdefile-plugins
%defattr(-,root,root,-)
%{tde_tdelibdir}/kfile_torrent.la
%{tde_tdelibdir}/kfile_torrent.so
%{tde_datadir}/services/kfile_torrent.desktop
-%post kfile-plugins
+%post tdefile-plugins
update-desktop-database 2> /dev/null || :
-%postun kfile-plugins
+%postun tdefile-plugins
update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kget
-Summary: download manager for Trinity
+Summary: Download manager for Trinity
Group: Applications/Internet
+Requires: trinity-tdebase-data >= %{tde_version}
+Requires: trinity-konqueror >= %{tde_version}
%description -n trinity-kget
KGet is a a download manager similar to GetRight or Go!zilla. It keeps
@@ -424,6 +494,7 @@ applications and Netscape.
%{tde_datadir}/icons/crystalsvg/*/actions/khtml_kget.png
%{tde_datadir}/icons/crystalsvg/*/apps/kget.png
%{tde_datadir}/icons/crystalsvg/*/mimetypes/kget_list.png
+%{tde_datadir}/icons/hicolor/*/apps/kget.png
%{tde_datadir}/mimelnk/application/x-kgetlist.desktop
%{tde_datadir}/sounds/KGet_Added.ogg
%{tde_datadir}/sounds/KGet_Finished.ogg
@@ -432,13 +503,13 @@ applications and Netscape.
%{tde_tdedocdir}/HTML/en/kget
%post -n trinity-kget
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
%postun -n trinity-kget
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
@@ -446,8 +517,9 @@ update-desktop-database 2> /dev/null || :
##########
%package -n trinity-knewsticker
-Summary: news ticker applet for Trinity
+Summary: News ticker applet for Trinity
Group: Applications/Internet
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-knewsticker
This is a news ticker applet for the Trinity panel. It can scroll news from
@@ -468,7 +540,7 @@ good news sources which provide such files.
%{tde_datadir}/apps/kconf_update/knewsticker.upd
%{tde_datadir}/apps/kconf_update/knt-0.1-0.2.pl
%{tde_datadir}/apps/kicker/applets/knewsticker.desktop
-%{tde_datadir}/apps/knewsticker/eventsrc
+%{tde_datadir}/apps/knewsticker/
%{tde_datadir}/icons/hicolor/*/apps/knewsticker.png
%{tde_datadir}/services/kntsrcfilepropsdlg.desktop
%{tde_tdedocdir}/HTML/en/knewsticker
@@ -488,13 +560,15 @@ update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kopete
-Summary: instant messenger for Trinity
+Summary: Instant messenger for Trinity
Group: Applications/Internet
-URL: http://kopete.kde.org
+Requires: trinity-tdebase-bin >= %{tde_version}
+Requires: trinity-tdebase-data >= %{tde_version}
+Requires: trinity-filesystem >= %{tde_version}
%description -n trinity-kopete
Kopete is an instant messenger program which can communicate with a variety
-of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber.
+of IM systems, such as Yahoo, ICQ, IRC and Jabber.
Support for more IM protocols can be added through a plugin system.
@@ -527,9 +601,9 @@ Support for more IM protocols can be added through a plugin system.
%{tde_libdir}/libkopete_videodevice.so.*
%{tde_tdeappdir}/kopete.desktop
%{tde_datadir}/apps/kconf_update/kopete-*
-%{tde_datadir}/apps/kopete
-%{tde_datadir}/apps/kopete_*/*.rc
-%{tde_datadir}/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
+%{tde_datadir}/apps/kopete/
+%{tde_datadir}/apps/kopete_*/
+%{tde_datadir}/apps/kopeterichtexteditpart/
%{tde_datadir}/config.kcfg/historyconfig.kcfg
%{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg
%{tde_datadir}/config.kcfg/kopete.kcfg
@@ -656,8 +730,10 @@ update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kopete-nowlistening
-Summary: Nowlistening (xmms) plugin for Kopete.
+Summary: Nowlistening (xmms) plugin for Kopete
Group: Applications/Internet
+Requires: trinity-kopete = %{tde_version}-%{tde_release}
+Requires: trinity-filesystem >= %{tde_version}
%description -n trinity-kopete-nowlistening
Kopete includes the "Now Listening" plug-in that can report what music you
@@ -678,6 +754,7 @@ noatun, kscd, juk, kaffeine and amarok.
%package -n trinity-kpf
Summary: Public fileserver for Trinity
Group: Applications/Internet
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-kpf
kpf provides simple file sharing using HTTP. kpf is strictly a public
@@ -708,7 +785,7 @@ update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kppp
-Summary: modem dialer and ppp frontend for Trinity
+Summary: Modem dialer and ppp frontend for Trinity
Group: Applications/Internet
Requires: ppp
@@ -733,7 +810,14 @@ track of the time spent online for you.
%files -n trinity-kppp
%defattr(-,root,root,-)
-%{?!with_consolehelper:%{tde_bindir}/kppp}
+%if 0%{?with_consolehelper} == 0
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%verify(not mode) %{tde_bindir}/kppp
+%else
+%attr(4711,root,root) %{tde_bindir}/kppp
+%endif
+%endif
%{tde_bindir}/kppplogview
%{tde_tdeappdir}/Kppp.desktop
%{tde_tdeappdir}/kppplogview.desktop
@@ -754,6 +838,10 @@ for f in hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
+%if 0%{?suse_version}
+# Sets permissions on setuid files (openSUSE specific)
+%set_permissions %{tde_bindir}/kppp
+%endif
%postun -n trinity-kppp
for f in hicolor ; do
@@ -780,18 +868,19 @@ Servers using RDP.
%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop
%{tde_datadir}/apps/krdc/
%{tde_datadir}/icons/crystalsvg/*/apps/krdc.png
+%{tde_datadir}/icons/hicolor/*/apps/krdc.png
%{tde_datadir}/services/rdp.protocol
%{tde_datadir}/services/vnc.protocol
%{tde_tdedocdir}/HTML/en/krdc/
%post -n trinity-krdc
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
%postun -n trinity-krdc
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
@@ -820,9 +909,10 @@ task.
%{tde_tdelibdir}/kded_kinetd.so
%{tde_tdeappdir}/kcmkrfb.desktop
%{tde_tdeappdir}/krfb.desktop
-%{tde_datadir}/apps/kinetd/eventsrc
+%{tde_datadir}/apps/kinetd/
%{tde_datadir}/apps/krfb
%{tde_datadir}/icons/crystalsvg/*/apps/krfb.png
+%{tde_datadir}/icons/hicolor/*/apps/krfb.png
%{tde_datadir}/icons/locolor/*/apps/krfb.png
%{tde_datadir}/services/kded/kinetd.desktop
%{tde_datadir}/services/kinetd_krfb.desktop
@@ -831,13 +921,13 @@ task.
%{tde_tdedocdir}/HTML/en/krfb/
%post -n trinity-krfb
-for f in crystalsvg locolor ; do
+for f in crystalsvg hicolor locolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
%postun -n trinity-krfb
-for f in crystalsvg locolor ; do
+for f in crystalsvg hicolor locolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
@@ -849,7 +939,7 @@ Summary: IRC client for Trinity
Group: Applications/Internet
%description -n trinity-ksirc
-KSirc is an IRC chat client for KDE. It supports scripting with Perl and has a
+KSirc is an IRC chat client for TDE. It supports scripting with Perl and has a
lot of compatibility with mIRC for general use.
If you want to connect to an IRC server via SSL, you will need to install the
@@ -887,6 +977,8 @@ update-desktop-database 2> /dev/null || :
%package -n trinity-ktalkd
Summary: Talk daemon for Trinity
Group: Applications/Internet
+Requires: trinity-kcontrol >= %{tde_version}
+Requires: trinity-tdebase-data >= %{tde_version}
%description -n trinity-ktalkd
KTalkd is an enhanced talk daemon - a program to handle incoming talk
@@ -901,20 +993,21 @@ and shouldn't be run on a multi-user machine.
%{tde_tdelibdir}/kcm_ktalkd.*
%{tde_tdeappdir}/kcmktalkd.desktop
%config(noreplace) %{tde_datadir}/config/ktalkdrc
-%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.*
+%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
+%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
%{tde_datadir}/sounds/ktalkd.wav
%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
%{tde_tdedocdir}/HTML/en/ktalkd
%post -n trinity-ktalkd
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
%postun -n trinity-ktalkd
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
@@ -925,6 +1018,7 @@ update-desktop-database 2> /dev/null || :
%package -n trinity-kwifimanager
Summary: Wireless lan manager for Trinity
Group: Applications/Internet
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-kwifimanager
KWiFiManager suite is a set of tools which allows you to manage your
@@ -944,7 +1038,7 @@ wavelan card that uses the wireless extensions interface.
%{tde_datadir}/apps/kwifimanager
%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png
%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
-%doc %{tde_tdedocdir}/HTML/en/kwifimanager
+%{tde_tdedocdir}/HTML/en/kwifimanager/
%post -n trinity-kwifimanager
for f in hicolor ; do
@@ -986,6 +1080,8 @@ automatically when needed.
%package -n trinity-lisa
Summary: LAN information server for Trinity
Group: Applications/Internet
+Requires: trinity-konqueror >= %{tde_version}
+Requires: trinity-tdebase-data >= %{tde_version}
%description -n trinity-lisa
LISa is intended to provide TDE with a kind of "network neighborhood"
@@ -1002,7 +1098,7 @@ but relying only on the TCP/IP protocol.
%{tde_datadir}/applnk/.hidden/kcmreslisa.desktop
%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop
%{tde_datadir}/apps/konqueror/dirtree/remote/lan.desktop
-%{tde_datadir}/apps/lisa/README
+%{tde_datadir}/apps/lisa/
%{tde_datadir}/apps/remoteview/lan.desktop
%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/
%{tde_tdedocdir}/HTML/en/lisa/
@@ -1024,7 +1120,7 @@ Summary: Zeroconf support for TDE
Group: Applications/Internet
%description -n trinity-kdnssd
-A kioslave and kded module that provide Zeroconf support. Try
+A tdeioslave and tded module that provide Zeroconf support. Try
"zeroconf:/" in Konqueror.
%files -n trinity-kdnssd
@@ -1053,7 +1149,7 @@ update-desktop-database 2> /dev/null || :
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -1061,6 +1157,15 @@ update-desktop-database 2> /dev/null || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
+
+# Workaround libiw detection failure on opensuse
+%if 0%{?suse_version}
+%__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|"
+%endif
+
+# Update icons for some control center modules
+%__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|"
%build
@@ -1085,6 +1190,7 @@ fi
-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 \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
@@ -1115,6 +1221,17 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+# Adds missing icons in 'hicolor' theme
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p %{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
+pushd %{buildroot}%{tde_datadir}/icons
+for i in {16,22,32,48}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kget.png hicolor/"$i"x"$i"/apps/kget.png ;done
+for i in {32,48}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krdc.png hicolor/"$i"x"$i"/apps/krdc.png ;done
+for i in {16,32,48}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krfb.png hicolor/"$i"x"$i"/apps/krfb.png ;done
+for i in {16,22,32,48,128}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/ktalkd.png hicolor/"$i"x"$i"/apps/ktalkd.png ;done
+for i in {16,22,32,48,64,128}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/share.png hicolor/"$i"x"$i"/apps/kcmfileshare.png ;done
+popd
+
%if 0%{?with_consolehelper}
# Run kppp through consolehelper, and rename it to 'kppp3'
%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
@@ -1130,28 +1247,62 @@ USER=root
PROGRAM=%{tde_sbindir}/kppp3
SESSION=true
EOF
+
# Renames 'kppp' as 'kppp3' in launch icon
%__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|"
%endif
+# Remove setuid bit on some binaries.
+if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then
+ chmod 0755 "%{?buildroot}%{tde_bindir}/kppp"
+fi
+
# ktalk
%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
# Avoids conflict with trinity-kvirc
%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
+# Icons from TDE Control Center should only be displayed in TDE
+for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
+ if grep -q "^Categories=.*X-KDE-settings" "${i}"; then
+ if ! grep -q "OnlyShowIn=KDE" "${i}" ; then
+ echo "OnlyShowIn=KDE;" >>"${i}"
+ fi
+ fi
+done
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kcmkrfb
+%suse_update_desktop_file fileshare
+%suse_update_desktop_file kopete Network InstantMessaging
+%suse_update_desktop_file ksirc Network IRCClient
+%suse_update_desktop_file Kppp Network Dialup
+%suse_update_desktop_file -r kppplogview System Monitor
+%suse_update_desktop_file kdict Office Dictionary
+%suse_update_desktop_file -r krdc System RemoteAccess
+%suse_update_desktop_file -r krfb System RemoteAccess
+%suse_update_desktop_file -r kget System TrayIcon
+%suse_update_desktop_file -r kwifimanager System Network
+%suse_update_desktop_file kcmwifi
+%suse_update_desktop_file -u knewsticker-standalone Network News
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
%clean
%__rm -rf %{buildroot}
-%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%verify_permissions -e %{tde_bindir}/kppp
+%endif
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-- Disable 'lisa' service
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+%changelog
diff --git a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc b/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc
index ad8188f40..8d22f2fc6 100644
--- a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc
+++ b/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc
@@ -1 +1,3 @@
setBadness('permissions-file-setuid-bit', 0)
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdepim/tdepim-14.0.0.patch b/redhat/main/tdepim/tdepim-14.0.0.patch
new file mode 100644
index 000000000..0770a8af9
--- /dev/null
+++ b/redhat/main/tdepim/tdepim-14.0.0.patch
@@ -0,0 +1,90 @@
+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-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec
index 6f8a7642c..bdedc6699 100644
--- a/redhat/main/tdepim/tdepim-14.0.0.spec
+++ b/redhat/main/tdepim/tdepim-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdepim (version R14.0.0)
+# spec file for package tdepim (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,10 +21,13 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdepim
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -34,11 +37,6 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
# KDEPIM specific features
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -53,7 +51,7 @@ BuildRequires: gnokii-devel
Name: trinity-%{tde_pkg}
Summary: Personal Information Management apps from the official Trinity release
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: Applications/Productivity
URL: http://www.trinitydesktop.org/
@@ -70,6 +68,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -91,6 +90,9 @@ BuildRequires: boost-devel
BuildRequires: pcre-devel
BuildRequires: libidn-devel
+# OPENSSL support
+BuildRequires: openssl-devel
+
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
@@ -108,15 +110,13 @@ BuildRequires: brp-check-trinity
BuildRequires: gamin-devel
%endif
-# CURL support
+# FLEX support
%if 0%{?fedora} >= 15
BuildRequires: flex-static
%endif
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-BuildRequires: trinity-libcurl-devel
-%else
+
+# CURL support
BuildRequires: curl-devel
-%endif
# GLIB2 support
BuildRequires: glib2-devel
@@ -141,28 +141,47 @@ BuildRequires: libXcomposite-devel
%endif
# XSCREENSAVER support
-# Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+# 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}
%define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: gnome-screensaver
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+BuildRequires: xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires: xscreensaver-extras-base
%endif
+BuildRequires: xscreensaver-gl-base
+BuildRequires: xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: libXScrnSaver-devel
+BuildRequires: xscreensaver
+BuildRequires: xscreensaver-data
+BuildRequires: xscreensaver-data-extra
+%endif
+
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xscrnsaver-devel
%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires: libXScrnSaver-devel
-%endif
-%if 0%{?suse_version} == 1140
BuildRequires: xscreensaver
+BuildRequires: xscreensaver-base
+BuildRequires: xscreensaver-extrusion
+BuildRequires: xscreensaver-gl
%endif
%endif
+# ACL support
+BuildRequires: libacl-devel
+
Requires: trinity-libtdepim = %{version}-%{release}
Requires: %{name}-kfile-plugins = %{version}-%{release}
@@ -207,6 +226,7 @@ This metapackage includes a collection of Personal Information Management
(PIM) applications provided with the official release of Trinity.
%files
+%defattr(-,root,root,-)
##########
@@ -289,22 +309,6 @@ thousands of internet feeds in a quick, efficient, and familiar way.
%{tde_tdedocdir}/HTML/en/akregator/
%{tde_tdedocdir}/HTML/en/tdeioslave/feed/
-%post -n trinity-akregator
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-akregator
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-akregator-devel
@@ -321,18 +325,12 @@ Requires: trinity-akregator = %{version}-%{release}
%{tde_libdir}/libakregatorprivate.la
%{tde_libdir}/libakregatorprivate.so
-%post -n trinity-akregator-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-akregator-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-kaddressbook
Summary: TDE addressbook application
Group: Applications/Communications
-Requires: trinity-kdebase-pim-ioslaves
+Requires: trinity-tdebase-tdeio-pim-plugins
Requires: %{name}-tderesources = %{version}-%{release}
%description -n trinity-kaddressbook
@@ -381,22 +379,6 @@ LDAP servers, and SQL databases.
%{tde_tdeincludedir}/kaddressbook/
%{tde_tdeincludedir}/tdeabc/
-%post -n trinity-kaddressbook
-/sbin/ldconfig || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaddressbook
-/sbin/ldconfig || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kaddressbook-devel
@@ -414,12 +396,6 @@ Requires: trinity-kaddressbook = %{version}-%{release}
%{tde_libdir}/libkaddressbook.la
%{tde_libdir}/libkaddressbook.so
-%post -n trinity-kaddressbook-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kaddressbook-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-kalarm
@@ -456,20 +432,6 @@ TDE-based, but will also run on other desktops.
%{tde_datadir}/icons/hicolor/*/apps/kalarm.png
%{tde_tdedocdir}/HTML/en/kalarm/
-%post -n trinity-kalarm
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kalarm
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kandy
@@ -496,20 +458,6 @@ Kandy is aimed at mobile phones with integrated (GSM) modems.
%{tde_datadir}/config.kcfg/kandy.kcfg
%{tde_tdedocdir}/HTML/en/kandy/
-%post -n trinity-kandy
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kandy
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-karm
@@ -535,22 +483,6 @@ time they spend on various tasks.
%{tde_datadir}/services/kontact/karmplugin.desktop
%{tde_tdedocdir}/HTML/en/karm/
-%post -n trinity-karm
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-karm
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-karm-devel
@@ -565,12 +497,6 @@ Group: Development/Libraries/Other
%{tde_libdir}/libkarm.so
%{tde_libdir}/libkarm.la
-%post -n trinity-karm-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-karm-devel
-/sbin/ldconfig || :
-
##########
%package kfile-plugins
@@ -747,12 +673,6 @@ tracking feature plans.
%{tde_tdelibdir}/tdeabc_xmlrpc.la
%{tde_tdelibdir}/tdeabc_xmlrpc.so
-%post tderesources
-/sbin/ldconfig || :
-
-%postun tderesources
-/sbin/ldconfig || :
-
##########
%package tderesources-devel
@@ -821,12 +741,6 @@ Provides: trinity-tdepim-kresources-devel = %{version}-%{release}
%{tde_libdir}/libknotesscalix.so
%{tde_tdeincludedir}/kpimprefs.h
-%post tderesources-devel
-/sbin/ldconfig || :
-
-%postun tderesources-devel
-/sbin/ldconfig || :
-
##########
%package wizards
@@ -868,12 +782,6 @@ Kolab, and SUSE Linux Openexchange servers.
%{tde_datadir}/config.kcfg/scalix.kcfg
%{tde_datadir}/config.kcfg/slox.kcfg
-%post wizards
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun wizards
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%if 0%{?with_kitchensync}
@@ -898,14 +806,6 @@ development (?). Kitchensync uses opensync.
%{tde_libdir}/libqopensync.so.*
%{tde_tdeappdir}/kitchensync.desktop
%{tde_datadir}/icons/hicolor/*/apps/kitchensync.png
-
-%post -n trinity-kitchensync
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kitchensync
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%endif
##########
@@ -949,27 +849,13 @@ keybox and for retrieving certificates from LDAP servers.
%{tde_tdedocdir}/HTML/en/kwatchgnupg/
%{tde_datadir}/icons/hicolor/*/apps/kleopatra.png
-%post -n trinity-kleopatra
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-kleopatra
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
##########
%package -n trinity-kmail
Summary: Trinity Email client
Group: Applications/Communications
Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: trinity-tdebase-tdeio-pim-plugins >= %{version}
+Requires: trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
# GPG support
%if 0%{?suse_version}
@@ -990,7 +876,7 @@ Requires: pinentry
Requires: procmail
Requires: trinity-kaddressbook = %{version}-%{release}
Requires: trinity-kleopatra = %{version}-%{release}
-Requires: trinity-tdebase-tdeio-pim-plugins >= %{version}-%{release}
+Requires: trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
Provides: imap-client, mail-reader
@@ -1004,8 +890,8 @@ mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3.
%files -n trinity-kmail
%defattr(-,root,root,-)
-%{tde_datadir}/config/kmail.antispamrc
-%{tde_datadir}/config/kmail.antivirusrc
+%{tde_confdir}/kmail.antispamrc
+%{tde_confdir}/kmail.antivirusrc
%{tde_bindir}/kmail
%{tde_bindir}/kmail_*.sh
%{tde_tdelibdir}/kcm_kmail.la
@@ -1061,22 +947,6 @@ mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3.
%{tde_libdir}/libkmailprivate.la
%{tde_tdedocdir}/HTML/en/kmail/
-%post -n trinity-kmail
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmail
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kmail-devel
@@ -1092,12 +962,6 @@ Group: Development/Libraries/Other
%{tde_tdeincludedir}/kmail/
%{tde_tdeincludedir}/kmail*.h
-%post -n trinity-kmail-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kmail-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-kmailcvt
@@ -1116,18 +980,6 @@ include Outlook Express, Evolution, and plain mbox.
%{tde_datadir}/apps/kmailcvt
%{tde_datadir}/icons/crystalsvg/*/apps/kmailcvt.png
-%post -n trinity-kmailcvt
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmailcvt
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
##########
%package -n trinity-knode
@@ -1157,22 +1009,6 @@ signatures.
%{tde_datadir}/services/kontact/knodeplugin.desktop
%{tde_tdedocdir}/HTML/en/knode/
-%post -n trinity-knode
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knode
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-knode-devel
@@ -1188,12 +1024,6 @@ Requires: trinity-knode = %{version}-%{release}
%{tde_libdir}/libknodecommon.la
%{tde_libdir}/libknodecommon.so
-%post -n trinity-knode-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-knode-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-knotes
@@ -1223,22 +1053,6 @@ program. The program supports printing and mailing your notes.
%{tde_datadir}/services/kontact/knotesplugin.desktop
%{tde_tdedocdir}/HTML/en/knotes/
-%post -n trinity-knotes
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knotes
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-knotes-devel
@@ -1257,12 +1071,6 @@ Requires: %{name}-tderesources-devel = %{version}-%{release}
%{tde_tdeincludedir}/KNotesAppIface.h
%{tde_tdeincludedir}/KNotesIface.h
-%post -n trinity-knotes-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-knotes-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-kode
@@ -1280,12 +1088,6 @@ described by RelaxNG schemes.
%{tde_bindir}/kxml_compiler
%{tde_libdir}/libkode.so.*
-%post -n trinity-kode
-/sbin/ldconfig || :
-
-%postun -n trinity-kode
-/sbin/ldconfig || :
-
##########
%package -n trinity-kode-devel
@@ -1301,12 +1103,6 @@ Requires: trinity-kode = %{version}-%{release}
%{tde_libdir}/libkode.la
%{tde_libdir}/libkode.so
-%post -n trinity-kode-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kode-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-konsolekalendar
@@ -1325,20 +1121,6 @@ frontend to manage your calendars.
%{tde_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png
%{tde_tdedocdir}/HTML/en/konsolekalendar/
-%post -n trinity-konsolekalendar
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-konsolekalendar
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kontact
@@ -1397,22 +1179,6 @@ scheduling, address book and other PIM functionality.
%{tde_datadir}/servicetypes/kontactplugin.desktop
%{tde_tdedocdir}/HTML/en/kontact/
-%post -n trinity-kontact
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kontact
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kontact-devel
@@ -1431,12 +1197,6 @@ Requires: trinity-kontact = %{version}-%{release}
%{tde_libdir}/libkpinterfaces.so
%{tde_tdeincludedir}/kontact/
-%post -n trinity-kontact-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kontact-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-korganizer
@@ -1482,6 +1242,7 @@ installed.
%{tde_datadir}/autostart/korgac.desktop
%{tde_datadir}/config.kcfg/korganizer.kcfg
%{tde_datadir}/icons/hicolor/*/apps/korganizer.png
+%dir %{tde_datadir}/services/kontact
%{tde_datadir}/services/kontact/korganizerplugin.desktop
%{tde_datadir}/services/kontact/journalplugin.desktop
%{tde_datadir}/services/kontact/todoplugin.desktop
@@ -1496,22 +1257,6 @@ installed.
%{tde_tdedocdir}/HTML/en/korganizer/
%{tde_tdedocdir}/HTML/en/tdeioslave/webcal/
-%post -n trinity-korganizer
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-korganizer
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-korganizer-devel
@@ -1537,12 +1282,6 @@ Requires: trinity-korganizer = %{version}-%{release}
%{tde_libdir}/libkorganizer_eventviewer.la
%{tde_libdir}/libkorganizer_eventviewer.so
-%post -n trinity-korganizer-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-korganizer-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-korn
@@ -1570,22 +1309,6 @@ Korn run a program once you click on the docked icon in Kicker.
%{tde_datadir}/icons/hicolor/*/apps/korn.png
%{tde_tdedocdir}/HTML/en/korn/
-%post -n trinity-korn
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-korn
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ktnef
@@ -1607,20 +1330,6 @@ mail servers and embed the mail properties as well as the actual attachments.
%{tde_datadir}/mimelnk/application/ms-tnef.desktop
%{tde_tdedocdir}/HTML/en/ktnef/
-%post -n trinity-ktnef
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktnef
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-libindex
@@ -1637,12 +1346,6 @@ This is the runtime package for programs that use the libindex library.
%defattr(-,root,root,-)
%{tde_libdir}/libindex.so.*
-%post -n trinity-libindex
-/sbin/ldconfig || :
-
-%postun -n trinity-libindex
-/sbin/ldconfig || :
-
##########
%package -n trinity-libindex-devel
@@ -1664,12 +1367,6 @@ library.
%{tde_libdir}/libindex.la
%{tde_libdir}/libindex.so
-%post -n trinity-libindex-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libindex-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkcal
@@ -1697,7 +1394,8 @@ This is the runtime package for programs that use the libkcal-trinity library.
%{tde_libdir}/libkcal.so.*
%{tde_libdir}/libkcal_resourceremote.so.*
%{tde_libdir}/libkholidays.so.*
-%{tde_datadir}/apps/libkholidays
+%{tde_datadir}/apps/libkholidays/
+%dir %{tde_datadir}/services/tderesources/kcal
%{tde_datadir}/services/tderesources/kcal/imap.desktop
%{tde_datadir}/services/tderesources/kcal/tdeabc.desktop
%{tde_datadir}/services/tderesources/kcal/local.desktop
@@ -1705,12 +1403,6 @@ This is the runtime package for programs that use the libkcal-trinity library.
%{tde_datadir}/services/tderesources/kcal/remote.desktop
%{tde_datadir}/services/tderesources/kcal_manager.desktop
-%post -n trinity-libkcal
-/sbin/ldconfig || :
-
-%postun -n trinity-libkcal
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkcal-devel
@@ -1738,12 +1430,6 @@ library.
%{tde_libdir}/libkholidays.la
%{tde_libdir}/libkholidays.so
-%post -n trinity-libkcal-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkcal-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libtdepim
@@ -1772,20 +1458,6 @@ This is the runtime package for programs that use the trinity-libtdepim library.
%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
-%post -n trinity-libtdepim
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdepim
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-libtdepim-devel
@@ -1807,12 +1479,6 @@ library.
%{tde_libdir}/libtdepim.la
%{tde_libdir}/libtdepim.so
-%post -n trinity-libtdepim-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdepim-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkgantt
@@ -1827,12 +1493,6 @@ This is the runtime package for programs that use the libkgantt-trinity library.
%{tde_libdir}/libkgantt.so.*
%{tde_datadir}/apps/kgantt
-%post -n trinity-libkgantt
-/sbin/ldconfig || :
-
-%postun -n trinity-libkgantt
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkgantt-devel
@@ -1851,12 +1511,6 @@ library.
%{tde_libdir}/libkgantt.la
%{tde_libdir}/libkgantt.so
-%post -n trinity-libkgantt-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkgantt-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkleopatra
@@ -1872,7 +1526,7 @@ This is the runtime package for programs that use the libkleopatra-trinity libra
%files -n trinity-libkleopatra
%defattr(-,root,root,-)
-%{tde_datadir}/config/libkleopatrarc
+%{tde_confdir}/libkleopatrarc
%{tde_libdir}/libgpgme++.so.*
%{tde_libdir}/libkleopatra.so.*
%{tde_libdir}/libkpgp.so.*
@@ -1883,20 +1537,6 @@ This is the runtime package for programs that use the libkleopatra-trinity libra
%{tde_datadir}/icons/crystalsvg/*/apps/gpg.png
%{tde_datadir}/icons/crystalsvg/*/apps/gpgsm.png
-%post -n trinity-libkleopatra
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libkleopatra
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkleopatra-devel
@@ -1926,12 +1566,6 @@ libkleopatra-trinity library.
%{tde_libdir}/libqgpgme.la
%{tde_libdir}/libqgpgme.so
-%post -n trinity-libkleopatra-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkleopatra-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkmime
@@ -1947,12 +1581,6 @@ an object tree.
%defattr(-,root,root,-)
%{tde_libdir}/libkmime.so.*
-%post -n trinity-libkmime
-/sbin/ldconfig || :
-
-%postun -n trinity-libkmime
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkmime-devel
@@ -1968,12 +1596,6 @@ Requires: trinity-libkmime = %{version}-%{release}
%{tde_libdir}/libkmime.la
%{tde_libdir}/libkmime.so
-%post -n trinity-libkmime-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkmime-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkpimexchange
@@ -1990,12 +1612,6 @@ library.
%{tde_tdelibdir}/resourcecalendarexchange.so
%{tde_libdir}/libkpimexchange.so.*
-%post -n trinity-libkpimexchange
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimexchange
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkpimexchange-devel
@@ -2017,12 +1633,6 @@ libkpimexchange-trinity library.
%{tde_libdir}/libkpimexchange.la
%{tde_libdir}/libkpimexchange.so
-%post -n trinity-libkpimexchange-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimexchange-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkpimidentities
@@ -2040,12 +1650,6 @@ library.
%defattr(-,root,root,-)
%{tde_libdir}/libkpimidentities.so.*
-%post -n trinity-libkpimidentities
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimidentities
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkpimidentities-devel
@@ -2061,12 +1665,6 @@ Requires: trinity-libkpimidentities = %{version}-%{release}
%{tde_libdir}/libkpimidentities.la
%{tde_libdir}/libkpimidentities.so
-%post -n trinity-libkpimidentities-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimidentities-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libksieve
@@ -2081,12 +1679,6 @@ This is the runtime package for programs that use the libksieve-trinity library.
%{tde_libdir}/libksieve.so.*
%{tde_tdedocdir}/HTML/en/tdeioslave/sieve/
-%post -n trinity-libksieve
-/sbin/ldconfig || :
-
-%postun -n trinity-libksieve
-/sbin/ldconfig || :
-
##########
%package -n trinity-libksieve-devel
@@ -2105,12 +1697,6 @@ library.
%{tde_libdir}/libksieve.la
%{tde_libdir}/libksieve.so
-%post -n trinity-libksieve-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libksieve-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libktnef
@@ -2129,12 +1715,6 @@ This is the runtime library for packages using the ktnef-trinity library.
%defattr(-,root,root,-)
%{tde_libdir}/libktnef.so.*
-%post -n trinity-libktnef
-/sbin/ldconfig || :
-
-%postun -n trinity-libktnef
-/sbin/ldconfig || :
-
##########
%package -n trinity-libktnef-devel
@@ -2158,12 +1738,6 @@ ktnef-trinity library.
%{tde_libdir}/libktnef.la
%{tde_libdir}/libktnef.so
-%post -n trinity-libktnef-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libktnef-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-libmimelib
@@ -2179,12 +1753,6 @@ This is the runtime package for programs that use the libmimelib-trinity library
%defattr(-,root,root,-)
%{tde_libdir}/libmimelib.so.*
-%post -n trinity-libmimelib
-/sbin/ldconfig || :
-
-%postun -n trinity-libmimelib
-/sbin/ldconfig || :
-
##########
%package -n trinity-libmimelib-devel
@@ -2204,12 +1772,6 @@ libmimelib library.
%{tde_libdir}/libmimelib.la
%{tde_libdir}/libmimelib.so
-%post -n trinity-libmimelib-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libmimelib-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-kmobile
@@ -2244,20 +1806,6 @@ dialing calls, phonebook, and phone status monitoring.
%{tde_libdir}/libkmobiledevice.so
%{tde_tdedocdir}/HTML/en/kmobile/
-%post -n trinity-kmobile
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmobile
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -2269,6 +1817,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+# Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl'
+if [ -x /usr/bin/perl ]; then
+ %__sed -i "korganizer/ical2vcal.in" -e "s|@PERL@|/usr/bin/perl|"
+fi
+
%build
unset QTDIR QTINC QTLIB
@@ -2299,6 +1852,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-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} \
@@ -2369,5 +1923,3 @@ popd
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdepim/tdepim-3.5.13.2.spec b/redhat/main/tdepim/tdepim-3.5.13.2.spec
index 193d5d800..0f50b7cdb 100644
--- a/redhat/main/tdepim/tdepim-3.5.13.2.spec
+++ b/redhat/main/tdepim/tdepim-3.5.13.2.spec
@@ -1,23 +1,39 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdepim (version 3.5.13-SRU)
+#
+# 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 1
%define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdepim
+%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/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
# KDEPIM specific features
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -26,46 +42,67 @@ BuildRequires: gnokii-devel
%endif
# TDEPIM optional features
-#define with_kitchensync 0
+#define with_kitchensync 1
-Name: trinity-tdepim
+Name: trinity-%{tde_pkg}
+Summary: Personal Information Management apps from the official Trinity release
Version: %{tde_version}
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-License: GPL
+Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
Group: Applications/Productivity
+URL: http://www.trinitydesktop.org/
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-Summary: Personal Information Management apps from the official Trinity release
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-# [tdepim] Missing LDFLAGS cause FTBFS on MGA2/MDV2011
-Patch14: kdepim-3.5.13-missing_ldflags.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
+BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-libcaldav-devel
-BuildRequires: trinity-libcarddav-devel
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: libcaldav-devel >= %{tde_epoch}:0.6.5
+BuildRequires: libcarddav-devel >= %{tde_epoch}:0.6.2
BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++
+BuildRequires: fdupes
+BuildRequires: desktop-file-utils
+BuildRequires: make
+
BuildRequires: gpgme-devel
BuildRequires: libgpg-error-devel
BuildRequires: flex
BuildRequires: libical-devel
BuildRequires: boost-devel
BuildRequires: pcre-devel
-BuildRequires: glib2-devel
-BuildRequires: gcc-c++
-BuildRequires: make
BuildRequires: libidn-devel
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# GAMIN support
+# Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires: gamin-devel
+%endif
+
# CURL support
%if 0%{?fedora} >= 15
BuildRequires: flex-static
@@ -76,6 +113,9 @@ BuildRequires: trinity-libcurl-devel
BuildRequires: curl-devel
%endif
+# GLIB2 support
+BuildRequires: glib2-devel
+
# SASL support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}sasl2-devel
@@ -162,12 +202,13 @@ This metapackage includes a collection of Personal Information Management
(PIM) applications provided with the official release of Trinity.
%files
+%defattr(-,root,root,-)
##########
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
+Group: Development/Libraries/Other
Obsoletes: tdepim-cmake < %{version}-%{release}
@@ -263,7 +304,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-akregator-devel
Summary: Development files for trinity-akregator
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-akregator = %{version}-%{release}
%description -n trinity-akregator-devel
@@ -286,7 +327,7 @@ Requires: trinity-akregator = %{version}-%{release}
%package -n trinity-kaddressbook
Summary: TDE addressbook application
Group: Applications/Communications
-Requires: trinity-kdebase-pim-ioslaves
+Requires: trinity-tdebase-pim-ioslaves
Requires: %{name}-tderesources = %{version}-%{release}
%description -n trinity-kaddressbook
@@ -355,7 +396,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kaddressbook-devel
Summary: Development files for trinity-kaddressbook
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-kaddressbook = %{version}-%{release}
%description -n trinity-kaddressbook-devel
@@ -446,6 +487,7 @@ Kandy is aimed at mobile phones with integrated (GSM) modems.
%{tde_datadir}/applnk/Utilities/kandy.desktop
%{tde_datadir}/apps/kandy/
%{tde_datadir}/icons/crystalsvg/*/apps/kandy.png
+%{tde_datadir}/icons/hicolor/*/apps/kandy.png
%{tde_datadir}/config.kcfg/kandy.kcfg
%{tde_tdedocdir}/HTML/en/kandy/
@@ -508,7 +550,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-karm-devel
Summary: Development files for karm
-Group: Development/Libraries
+Group: Development/Libraries/Other
%description -n trinity-karm-devel
%{summary}
@@ -671,6 +713,7 @@ tracking feature plans.
%{tde_datadir}/services/kresources/kcal/kcal_xmlrpc.desktop
%{tde_datadir}/services/kresources/kcal/kolab.desktop
%{tde_datadir}/services/kresources/kcal/scalix.desktop
+%dir %{tde_datadir}/services/kresources/knotes
%{tde_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop
%{tde_datadir}/services/kresources/knotes/kolabresource.desktop
%{tde_datadir}/services/kresources/knotes/scalix.desktop
@@ -705,7 +748,7 @@ tracking feature plans.
%package tderesources-devel
Summary: Development files for tderesources
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: %{name}-tderesources = %{version}-%{release}
Requires: libcaldav
Requires: libcarddav
@@ -894,12 +937,21 @@ keybox and for retrieving certificates from LDAP servers.
%{tde_datadir}/services/kleopatra_config_*.desktop
%{tde_tdedocdir}/HTML/en/kleopatra/
%{tde_tdedocdir}/HTML/en/kwatchgnupg/
+%{tde_datadir}/icons/hicolor/*/apps/kleopatra.png
%post -n trinity-kleopatra
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+for f in hicolor ; do
+ touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+ gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
+done
%postun -n trinity-kleopatra
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+for f in hicolor ; do
+ touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+ gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
+done
##########
@@ -1019,7 +1071,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kmail-devel
Summary: Development files for kmail
-Group: Development/Libraries
+Group: Development/Libraries/Other
%description -n trinity-kmail-devel
%{summary}
@@ -1115,7 +1167,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-knode-devel
Summary: Development files for trinity-knode
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-knode = %{version}-%{release}
%description -n trinity-knode-devel
@@ -1155,6 +1207,7 @@ program. The program supports printing and mailing your notes.
%{tde_datadir}/config.kcfg/knoteconfig.kcfg
%{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg
%{tde_datadir}/icons/hicolor/*/apps/knotes.png
+%dir %{tde_datadir}/services/kresources/knotes
%{tde_datadir}/services/kresources/knotes/imap.desktop
%{tde_datadir}/services/kresources/knotes/local.desktop
%{tde_datadir}/services/kresources/knotes_manager.desktop
@@ -1181,7 +1234,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-knotes-devel
Summary: Development files for knots
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-knotes = %{version}-%{release}
Requires: %{name}-tderesources-devel = %{version}-%{release}
@@ -1228,7 +1281,7 @@ described by RelaxNG schemes.
%package -n trinity-kode-devel
Summary: Development files for trinity-kode
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-kode = %{version}-%{release}
%description -n trinity-kode-devel
@@ -1316,8 +1369,8 @@ scheduling, address book and other PIM functionality.
%{tde_libdir}/libkpinterfaces.so.*
%{tde_tdeappdir}/Kontact.desktop
%{tde_tdeappdir}/kontactdcop.desktop
-%{tde_datadir}/apps/kontact
-%{tde_datadir}/apps/kontactsummary/kontactsummary_part.rc
+%{tde_datadir}/apps/kontact/
+%{tde_datadir}/apps/kontactsummary/
%{tde_datadir}/config.kcfg/kontact.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kontact.png
%{tde_datadir}/icons/crystalsvg/*/actions/kontact_*.png
@@ -1326,6 +1379,7 @@ scheduling, address book and other PIM functionality.
%{tde_datadir}/services/kcmkontactsummary.desktop
%{tde_datadir}/services/kcmkorgsummary.desktop
%{tde_datadir}/services/kcmsdsummary.desktop
+%dir %{tde_datadir}/services/kontact
%{tde_datadir}/services/kontact/newstickerplugin.desktop
%{tde_datadir}/services/kontact/specialdatesplugin.desktop
%{tde_datadir}/services/kontact/summaryplugin.desktop
@@ -1355,7 +1409,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kontact-devel
Summary: Development files for kontact
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-kontact = %{version}-%{release}
%description -n trinity-kontact-devel
@@ -1420,6 +1474,7 @@ installed.
%{tde_datadir}/autostart/korgac.desktop
%{tde_datadir}/config.kcfg/korganizer.kcfg
%{tde_datadir}/icons/hicolor/*/apps/korganizer.png
+%dir %{tde_datadir}/services/kontact
%{tde_datadir}/services/kontact/korganizerplugin.desktop
%{tde_datadir}/services/kontact/journalplugin.desktop
%{tde_datadir}/services/kontact/todoplugin.desktop
@@ -1453,7 +1508,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-korganizer-devel
Summary: Development files for korganizer
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-korganizer = %{version}-%{release}
%description -n trinity-korganizer-devel
@@ -1584,7 +1639,7 @@ This is the runtime package for programs that use the libindex library.
%package -n trinity-libindex-devel
Summary: Trinity indexing library [development]
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libindex = %{version}-%{release}
%description -n trinity-libindex-devel
@@ -1613,6 +1668,7 @@ library.
Summary: Trinity calendaring library
Group: Environment/Libraries
#Requires: %{name}-tderesources = %{version}-%{release}
+Requires: trinity-libkmime = %{version}-%{release}
%description -n trinity-libkcal
This library provides a C++ API for handling the vCalendar and iCalendar
@@ -1633,7 +1689,8 @@ This is the runtime package for programs that use the libkcal-trinity library.
%{tde_libdir}/libkcal.so.*
%{tde_libdir}/libkcal_resourceremote.so.*
%{tde_libdir}/libkholidays.so.*
-%{tde_datadir}/apps/libkholidays
+%{tde_datadir}/apps/libkholidays/
+%dir %{tde_datadir}/services/kresources/kcal
%{tde_datadir}/services/kresources/kcal/imap.desktop
%{tde_datadir}/services/kresources/kcal/kabc.desktop
%{tde_datadir}/services/kresources/kcal/local.desktop
@@ -1651,7 +1708,7 @@ This is the runtime package for programs that use the libkcal-trinity library.
%package -n trinity-libkcal-devel
Summary: Trinity calendaring library [development]
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libkcal = %{version}-%{release}
Requires: trinity-libtdepim-devel = %{version}-%{release}
Requires: trinity-libktnef-devel = %{version}-%{release}
@@ -1665,7 +1722,7 @@ library.
%files -n trinity-libkcal-devel
%defattr(-,root,root,-)
-%{tde_tdeincludedir}/libemailfunctions/idmapper.h
+%{tde_tdeincludedir}/libemailfunctions/
%{tde_tdeincludedir}/libkcal
%{tde_libdir}/libkcal.la
%{tde_libdir}/libkcal.so
@@ -1686,6 +1743,7 @@ library.
Summary: Trinity PIM library
Group: Environment/Libraries
Requires: trinity-libkcal = %{version}-%{release}
+Requires: trinity-libktnef = %{version}-%{release}
Obsoletes: libtdepim < %{version}-%{release}
Provides: libtdepim = %{version}-%{release}
@@ -1695,14 +1753,14 @@ This is the runtime package for programs that use the trinity-libtdepim library.
%files -n trinity-libtdepim
%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.la
-%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.so
+%{tde_tdelibdir}/plugins/designer/kdepimwidgets.la
+%{tde_tdelibdir}/plugins/designer/kdepimwidgets.so
%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.la
%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.so
-%{tde_libdir}/lib[kt]depim.so.*
-%{tde_datadir}/apps/[kt]depimwidgets
-%{tde_datadir}/apps/lib[kt]depim
-%{tde_datadir}/apps/[kt]depim
+%{tde_libdir}/libkdepim.so.*
+%{tde_datadir}/apps/kdepimwidgets
+%{tde_datadir}/apps/libkdepim
+%{tde_datadir}/apps/kdepim
%{tde_datadir}/config.kcfg/pimemoticons.kcfg
%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
@@ -1725,7 +1783,7 @@ done
%package -n trinity-libtdepim-devel
Summary: Trinity PIM library [development]
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libtdepim = %{version}-%{release}
Requires: trinity-tdelibs-devel >= %{version}
@@ -1772,7 +1830,7 @@ This is the runtime package for programs that use the libkgantt-trinity library.
%package -n trinity-libkgantt-devel
Summary: Trinity gantt charting library [development]
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libkgantt = %{version}-%{release}
Requires: trinity-libtdepim-devel = %{version}-%{release}
@@ -1836,7 +1894,7 @@ done
%package -n trinity-libkleopatra-devel
Summary: Trinity GnuPG interface libraries [development]
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libkleopatra = %{version}-%{release}
Requires: trinity-libtdepim-devel = %{version}-%{release}
@@ -1892,7 +1950,7 @@ an object tree.
%package -n trinity-libkmime-devel
Summary: Development files for libkmime
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libkmime = %{version}-%{release}
%description -n trinity-libkmime-devel
@@ -1913,7 +1971,7 @@ Requires: trinity-libkmime = %{version}-%{release}
%package -n trinity-libkpimexchange
Summary: Trinity PIM Exchange library
-Group: Environment/Libraries
+Group: Development/Libraries/Other
%description -n trinity-libkpimexchange
This is the runtime package for programs that use the libkpimexchange-trinity
@@ -1935,7 +1993,7 @@ library.
%package -n trinity-libkpimexchange-devel
Summary: Trinity PIM Exchange library [development]
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libkpimexchange = %{version}-%{release}
Requires: trinity-libkcal-devel = %{version}-%{release}
Requires: trinity-libtdepim-devel = %{version}-%{release}
@@ -1946,6 +2004,7 @@ libkpimexchange-trinity library.
%files -n trinity-libkpimexchange-devel
%defattr(-,root,root,-)
+%dir %{tde_tdeincludedir}/kdepim
%{tde_tdeincludedir}/kdepim/exchangeaccount.h
%{tde_tdeincludedir}/kdepim/exchangeclient.h
%{tde_libdir}/libkpimexchange.la
@@ -1984,7 +2043,7 @@ library.
%package -n trinity-libkpimidentities-devel
Summary: Development files for libkpimidentities
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libkpimidentities = %{version}-%{release}
%description -n trinity-libkpimidentities-devel
@@ -2024,7 +2083,7 @@ This is the runtime package for programs that use the libksieve-trinity library.
%package -n trinity-libksieve-devel
Summary: Trinity mail/news message filtering library [development]
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libksieve = %{version}-%{release}
Requires: trinity-libtdepim-devel = %{version}-%{release}
@@ -2072,7 +2131,7 @@ This is the runtime library for packages using the ktnef-trinity library.
%package -n trinity-libktnef-devel
Summary: KTNEF handler library [development]
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libktnef = %{version}-%{release}
Requires: trinity-libtdepim-devel = %{version}-%{release}
@@ -2122,7 +2181,7 @@ This is the runtime package for programs that use the libmimelib-trinity library
%package -n trinity-libmimelib-devel
Summary: Trinity mime library [development]
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-libmimelib = %{version}-%{release}
%description -n trinity-libmimelib-devel
@@ -2167,7 +2226,7 @@ dialing calls, phonebook, and phone status monitoring.
%{tde_datadir}/services/libkmobile_gammu.desktop
%{tde_datadir}/services/libkmobile_skeleton.desktop
%{tde_datadir}/servicetypes/libkmobile.desktop
-%{tde_datadir}/apps/kmobile/kmobileui.rc
+%{tde_datadir}/apps/kmobile/
%{tde_tdeappdir}/kmobile.desktop
%{tde_tdelibdir}/libkmobile_skeleton.la
%{tde_tdelibdir}/libkmobile_skeleton.so
@@ -2192,7 +2251,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -2200,7 +2259,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch14 -p1 -b .ldflags
# Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl'
if [ -x /usr/bin/perl ]; then
@@ -2230,6 +2288,7 @@ fi
-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 \
-DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
\
@@ -2269,17 +2328,39 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/akregator.desktop Network RSS-News
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/groupwarewizard.desktop Utility DesktopSettings X-TDE-Utilities-PIM
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kaddressbook.desktop
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kalarm.desktop Utility TimeUtility X-TDE-Utilities-PIM
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kandy.desktop Utility Telephony X-TDE-Utilities-Peripherals
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/karm.desktop Utility TimeUtility X-TDE-Utilities-PIM
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KNode.desktop
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/knotes.desktop Utility DesktopUtility X-TDE-Utilities-Desktop
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KMail.desktop
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/Kontact.desktop Office Core-Office
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/korganizer.desktop Office Calendar
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/KOrn.desktop Utility Applet X-TDE-More
+%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktnef.desktop Network Email
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kmobile.desktop Utility Telephony X-TDE-Utilities-Peripherals
+%if 0%{?with_kitchensync}
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kitchensync.desktop Utility X-SuSE-SyncUtility
+%endif
+%endif
+
+# Adds missing icons in 'hicolor' theme
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,32,48}; do %__cp crystalsvg/"$i"x"$i"/apps/kandy.png hicolor/"$i"x"$i"/apps/kandy.png ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kleopatra.png ;done
+popd
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
%clean
%__rm -rf %{?buildroot}
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdepim/trinity-tdepim-rpmlintrc b/redhat/main/tdepim/trinity-tdepim-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdepim/trinity-tdepim-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk-14.0.0.spec
index 341241738..788bd6107 100644
--- a/redhat/main/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/main/tdesdk/tdesdk-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdesdk (version R14.0.0)
+# spec file for package tdesdk (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,7 +21,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdesdk
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -35,17 +37,12 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Summary: The Trinity Software Development Kit (SDK)
Group: Development/Tools/Other
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -61,9 +58,10 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-perl-dcop >= {tde_version}
+BuildRequires: trinity-perl-dcop >= %{tde_version}
BuildRequires: trinity-tdepim-devel >= %{tde_version}
BuildRequires: cmake >= 2.8
@@ -81,6 +79,9 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# IDN support
BuildRequires: libidn-devel
@@ -122,6 +123,9 @@ BuildRequires: perl
BuildRequires: perl-podlators
%endif
+# OPENSSL support
+BuildRequires: openssl-devel
+
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
BuildRequires: %{_lib}binutils-devel
@@ -218,22 +222,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_mandir}/man1/cervisia.1*
%{tde_tdedocdir}/HTML/en/cervisia/
-%post -n trinity-cervisia
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-cervisia
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kapptemplate
@@ -378,22 +366,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/servicetypes/kbabeldict_module.desktop
%{tde_datadir}/servicetypes/kbabelfilter.desktop
-%post -n trinity-kbabel
-/sbin/ldconfig || :
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbabel
-/sbin/ldconfig || :
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kbabel-devel
@@ -424,12 +396,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_libdir}/libkbabeldictplugin.la
%{tde_libdir}/libkbabeldictplugin.so
-%post -n trinity-kbabel-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kbabel-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-kbugbuster
@@ -456,20 +422,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/services/tderesources/kcal/bugzilla.desktop
%{tde_tdedocdir}/HTML/en/kbugbuster/
-%post -n trinity-kbugbuster
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbugbuster
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-tdecachegrind
@@ -497,20 +449,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/mimelnk/application/x-tdecachegrind.desktop
%{tde_tdedocdir}/HTML/en/tdecachegrind/
-%post -n trinity-tdecachegrind
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdecachegrind
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-tdecachegrind-converters
@@ -600,12 +538,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_libdir}/libkstartperf.la
%{tde_bindir}/kstartperf
-%post misc
-/sbin/ldconfig || :
-
-%postun misc
-/sbin/ldconfig || :
-
##########
%package scripts
@@ -761,22 +693,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz
%{tde_tdedocdir}/HTML/en/kompare/
-%post -n trinity-kompare
-/sbin/ldconfig || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kompare
-/sbin/ldconfig || :
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kspy
@@ -801,12 +717,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_libdir}/libkspy.la
%{tde_libdir}/libkspy.so.*
-%post -n trinity-kspy
-/sbin/ldconfig || :
-
-%postun -n trinity-kspy
-/sbin/ldconfig || :
-
##########
%package -n trinity-kuiviewer
@@ -838,18 +748,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/services/kuiviewer_part.desktop
%{tde_tdedocdir}/HTML/en/kuiviewer/
-%post -n trinity-kuiviewer
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun -n trinity-kuiviewer
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
##########
%package -n trinity-libcvsservice0
@@ -880,12 +778,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_tdelibdir}/cvsservice.so
%{tde_datadir}/services/cvsservice.desktop
-%post -n trinity-libcvsservice0
-/sbin/ldconfig || :
-
-%postun -n trinity-libcvsservice0
-/sbin/ldconfig || :
-
##########
%package -n trinity-libcvsservice-devel
@@ -915,12 +807,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_libdir}/libtdeinit_cvsservice.la
%{tde_datadir}/cmake/cervisia.cmake
-%post -n trinity-libcvsservice-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libcvsservice-devel
-/sbin/ldconfig || :
-
##########
%package -n trinity-poxml
@@ -977,20 +863,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/mimelnk/application/x-umbrello.desktop
%{tde_tdedocdir}/HTML/en/umbrello/
-%post -n trinity-umbrello
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-umbrello
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%if 0%{?build_kioslave}
@@ -1039,11 +911,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_merge.svgz
%post tdeio-plugins
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
for proto in svn+file svn+http svn+https svn+ssh svn; do
update-alternatives --install \
%{tde_datadir}/services/${proto}.protocol \
@@ -1052,12 +919,6 @@ for proto in svn+file svn+http svn+https svn+ssh svn; do
10
done
-%postun tdeio-plugins
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
%preun tdeio-plugins
if [ $1 -eq 0 ]; then
for proto in svn+file svn+http svn+https svn+ssh svn; do
@@ -1096,12 +957,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_libdir}/libtdeunittestgui.la
%{tde_libdir}/libtdeunittestgui.so.*
-%post -n trinity-tdeunittest
-/sbin/ldconfig || :
-
-%postun -n trinity-tdeunittest
-/sbin/ldconfig || :
-
##########
%package devel
@@ -1163,6 +1018,11 @@ if ! rpm -E %%cmake|grep -q "cd build"; then
cd build
fi
+# FIXME PCLinuxOS: '/usr/bin/ld: cannot find -ltdeabc'
+%if 0%{?pclinuxos}
+export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L%{tde_libdir}"
+%endif
+
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
@@ -1246,5 +1106,3 @@ popd
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec
index 75172f4f7..33bcb9f87 100644
--- a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec
+++ b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec
@@ -1,49 +1,100 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdesdk (version 3.5.13-SRU)
+#
+# 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 1
%define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdesdk
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
-
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-Name: trinity-tdesdk
+Name: trinity-%{tde_pkg}
Summary: The Trinity Software Development Kit (SDK)
+Group: Development/Tools/Other
Version: %{tde_version}
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-
-License: GPLv2
-Group: User Interface/Desktops
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
URL: http://www.trinitydesktop.org/
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
+
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
+
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Patch1: tdesdk-3.5.13.2-fix_cervisia_pod.patch
+%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch}
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-perl-dcop >= %{tde_version}
+BuildRequires: trinity-tdepim-devel >= %{tde_version}
BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++
BuildRequires: libtool
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# IDN support
+BuildRequires: libidn-devel
+
+# GAMIN support
+# Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires: gamin-devel
+%endif
+
+# PCRE support
BuildRequires: pcre-devel
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
+
# for kbugbuster/libkcal
-BuildRequires: trinity-tdepim-devel >= %{version}
+BuildRequires: desktop-file-utils
+
+# DB4 support
%if 0%{?mgaversion} || 0%{?mdkversion}
#BuildRequires: %{_lib}db4.8-devel
%endif
@@ -53,16 +104,21 @@ BuildRequires: db4-devel
%if 0%{?suse_version}
BuildRequires: libdb-4_8-devel
%endif
-BuildRequires: desktop-file-utils
+
# kbabel, F-7+: flex >= 2.5.33-9
BuildRequires: flex
# umbrello
BuildRequires: libxslt-devel
BuildRequires: libxml2-devel
-BuildRequires: perl
BuildRequires: subversion-devel
BuildRequires: neon-devel
+# PERL support
+BuildRequires: perl
+%if 0%{?fedora} >= 19
+BuildRequires: perl-podlators
+%endif
+
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
BuildRequires: %{_lib}binutils-devel
@@ -99,11 +155,10 @@ Requires: trinity-kompare = %{version}-%{release}
Requires: trinity-kspy = %{version}-%{release}
Requires: trinity-kuiviewer = %{version}-%{release}
Requires: trinity-libcvsservice0 = %{version}-%{release}
-Requires: trinity-libcvsservice-devel = %{version}-%{release}
Requires: trinity-poxml = %{version}-%{release}
Requires: trinity-umbrello = %{version}-%{release}
%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{version}-%{release}}
-Requires: trinity-kunittest = %{version}-%{release}
+Requires: trinity-tdeunittest = %{version}-%{release}
%description
@@ -111,7 +166,7 @@ A collection of applications and tools used by developers, including:
* cervisia: a CVS frontend
* kbabel: PO file management
* kbugbuster: a tool to manage the TDE bug report system
-* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
+* tdecachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
* kompare: diff tool
* kuiviewer: displays designer's UI files
* umbrello: UML modeller and UML diagram tool
@@ -123,7 +178,7 @@ A collection of applications and tools used by developers, including:
%package -n trinity-cervisia
Summary: A graphical CVS front end for Trinity
-Group: Development/Utilities
+Group: Development/Tools/Version Control
%description -n trinity-cervisia
Cervisia is a TDE-based graphical front end for the CVS client.
@@ -147,7 +202,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_tdelibdir}/libcervisiapart.so
%{tde_tdeappdir}/cervisia.desktop
%{tde_datadir}/apps/cervisia/
-%{tde_datadir}/apps/cervisiapart/cervisiaui.rc
+%{tde_datadir}/apps/cervisiapart/
%{tde_datadir}/apps/kconf_update/cervisia.upd
%{tde_datadir}/apps/kconf_update/cervisia-change_repos_list.pl
%{tde_datadir}/apps/kconf_update/cervisia-normalize_cvsroot.pl
@@ -180,7 +235,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kapptemplate
Summary: Creates a framework to develop a Trinity application
-Group: Development/Utilities
+Group: Development/Languages/Other
%description -n trinity-kapptemplate
KAppTemplate is a shell script that will create the necessary
@@ -204,7 +259,7 @@ fi
%package -n trinity-kbabel
Summary: PO-file editing suite for Trinity
-Group: Development/Utilities
+Group: Development/Languages/Other
%description -n trinity-kbabel
This is a suite of programs for editing gettext message files (PO-files).
@@ -277,7 +332,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_tdeappdir}/catalogmanager.desktop
%{tde_tdeappdir}/kbabel.desktop
%{tde_tdeappdir}/kbabeldict.desktop
-%{tde_datadir}/apps/catalogmanager/catalogmanagerui.rc
+%{tde_datadir}/apps/catalogmanager/
%{tde_datadir}/apps/kbabel/
%{tde_datadir}/apps/kconf_update/kbabel-difftoproject.upd
%{tde_datadir}/apps/kconf_update/kbabel-project.upd
@@ -340,7 +395,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kbabel-devel
Summary: PO-file editing suite for Trinity (development files)
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: trinity-kbabel = %{version}-%{release}
%description -n trinity-kbabel-devel
@@ -375,8 +430,9 @@ This package is part of Trinity, and a component of the TDE SDK module.
##########
%package -n trinity-kbugbuster
-Summary: a front end for the Trinity bug tracking system
-Group: Development/Utilities
+Summary: A front end for the Trinity bug tracking system
+Group: Development/Languages/Other
+Requires: trinity-libkcal >= %{tde_version}
%description -n trinity-kbugbuster
KBugBuster is a GUI front end for the TDE bug tracking system.
@@ -414,11 +470,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-tdecachegrind
-Summary: visualisation tool for valgrind profiling output
-Group: Development/Utilities
+Summary: Visualisation tool for valgrind profiling output
+Group: Development/Languages/Other
%description -n trinity-tdecachegrind
-KCachegrind is a visualisation tool for the profiling data generated
+tdecachegrind is a visualisation tool for the profiling data generated
by calltree, a profiling skin for valgrind. Applications can be
profiled using calltree without being recompiled, and shared libraries
and plugin architectures are supported.
@@ -455,8 +511,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-tdecachegrind-converters
-Summary: format converters for KCachegrind profiling visualisation tool
-Group: Development/Utilities
+Summary: Format converters for tdecachegrind profiling visualisation tool
+Group: Development/Languages/Other
Requires: python
%if 0%{?suse_version} || 0%{?rhel} == 4
Requires: php
@@ -466,9 +522,9 @@ Requires: php-cli
%description -n trinity-tdecachegrind-converters
This is a collection of scripts for converting the output from
-different profiling tools into a format that KCachegrind can use.
+different profiling tools into a format that tdecachegrind can use.
-KCachegrind is a visualisation tool for the profiling data generated
+tdecachegrind is a visualisation tool for the profiling data generated
by calltree, a profiling skin for valgrind. Applications can be
profiled using calltree without being recompiled, and shared libraries
and plugin architectures are supported.
@@ -487,7 +543,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%package kfile-plugins
Summary: Trinity file dialog plugins for software development files
-Group: Environment/Libraries
+Group: Development/Languages/Other
%description kfile-plugins
This is a collection of plugins for the TDE file dialog. These plugins
@@ -512,8 +568,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
##########
%package misc
-Summary: various goodies from the Trinity Software Development Kit
-Group: Development/Libraries
+Summary: Various goodies from the Trinity Software Development Kit
+Group: Development/Languages/Other
%description misc
This package contains miscellaneous goodies provided with the official
@@ -529,7 +585,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%files misc
%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kprofilemethod.h
%{tde_tdelibdir}/kabcformat_kdeaccounts.la
%{tde_tdelibdir}/kabcformat_kdeaccounts.so
%{tde_tdelibdir}/plugins/styles/scheck.so
@@ -539,7 +594,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/kdepalettes/
%{tde_libdir}/libkstartperf.so.*
-%{tde_libdir}/libkstartperf.so
%{tde_libdir}/libkstartperf.la
%{tde_bindir}/kstartperf
@@ -553,7 +607,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/Utilities
+Group: Development/Languages/Other
Requires: python
%description scripts
@@ -651,8 +705,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
##########
%package -n trinity-kmtrace
-Summary: a Trinity memory leak tracer
-Group: Development/Utilities
+Summary: A Trinity memory leak tracer
+Group: Development/Languages/Other
Requires: less
%description -n trinity-kmtrace
@@ -667,17 +721,16 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_bindir}/kminspector
%{tde_bindir}/kmmatch
%{tde_bindir}/kmtrace
-%{tde_tdeincludedir}/ktrace.h
+%dir %{tde_libdir}/kmtrace
%{tde_libdir}/kmtrace/libktrace.la
%{tde_libdir}/kmtrace/libktrace.so
-%{tde_libdir}/kmtrace/libktrace_s.a
-%{tde_datadir}/apps/kmtrace/kde.excludes
+%{tde_datadir}/apps/kmtrace/
##########
%package -n trinity-kompare
-Summary: a Trinity GUI for viewing differences between files
-Group: Development/Utilities
+Summary: A Trinity GUI for viewing differences between files
+Group: Development/Languages/Other
%description -n trinity-kompare
Kompare is a graphical user interface for viewing the differences between
@@ -690,15 +743,13 @@ This package is part of Trinity, and a component of the TDE SDK module.
%defattr(-,root,root,-)
%{tde_bindir}/kompare
%{tde_libdir}/libkompareinterface.la
-%{tde_libdir}/libkompareinterface.so
%{tde_libdir}/libkompareinterface.so.*
%{tde_tdelibdir}/libkomparenavtreepart.la
%{tde_tdelibdir}/libkomparenavtreepart.so
%{tde_tdelibdir}/libkomparepart.la
%{tde_tdelibdir}/libkomparepart.so
%{tde_tdeappdir}/kompare.desktop
-%{tde_datadir}/apps/kompare/komparepartui.rc
-%{tde_datadir}/apps/kompare/kompareui.rc
+%{tde_datadir}/apps/kompare/
%{tde_datadir}/services/komparenavtreepart.desktop
%{tde_datadir}/services/komparepart.desktop
%{tde_datadir}/servicetypes/komparenavigationpart.desktop
@@ -726,8 +777,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kspy
-Summary: examines the internal state of a Qt/TDE app
-Group: Environment/Libraries
+Summary: Examines the internal state of a Qt/TDE app
+Group: Development/Languages/Other
Requires: trinity-tdelibs-devel
%description -n trinity-kspy
@@ -744,9 +795,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kspy
%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kspy.h
%{tde_libdir}/libkspy.la
-%{tde_libdir}/libkspy.so
%{tde_libdir}/libkspy.so.*
%post -n trinity-kspy
@@ -758,8 +807,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
##########
%package -n trinity-kuiviewer
-Summary: viewer for Qt Designer user interface files
-Group: Development/Utilities
+Summary: Viewer for Qt Designer user interface files
+Group: Development/Languages/Other
%description -n trinity-kuiviewer
KUIViewer is a utility to display and test the user interface (.ui) files
@@ -778,8 +827,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_tdelibdir}/quithumbnail.so
%{tde_tdelibdir}/quithumbnail.la
%{tde_tdeappdir}/kuiviewer.desktop
-%{tde_datadir}/apps/kuiviewer/kuiviewerui.rc
-%{tde_datadir}/apps/kuiviewerpart/kuiviewer_part.rc
+%{tde_datadir}/apps/kuiviewer/
+%{tde_datadir}/apps/kuiviewerpart/
%{tde_datadir}/icons/hicolor/*/apps/kuiviewer.png
%{tde_datadir}/icons/locolor/*/apps/kuiviewer.png
%{tde_datadir}/services/designerthumbnail.desktop
@@ -801,7 +850,7 @@ done
%package -n trinity-libcvsservice0
Summary: DCOP service for accessing CVS repositories
-Group: Environment/Libraries
+Group: Development/Languages/Other
Requires: cvs
%description -n trinity-libcvsservice0
@@ -836,8 +885,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
##########
%package -n trinity-libcvsservice-devel
-Summary: development files for CVS DCOP service
-Group: Development/Libraries
+Summary: Development files for CVS DCOP service
+Group: Development/Libraries/Other
Requires: trinity-libcvsservice0 = %{version}-%{release}
%description -n trinity-libcvsservice-devel
@@ -871,8 +920,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
##########
%package -n trinity-poxml
-Summary: tools for using PO-files to translate DocBook XML files
-Group: Development/Utilities
+Summary: Tools for using PO-files to translate DocBook XML files
+Group: Development/Languages/Other
%description -n trinity-poxml
This is a collection of tools that facilitate translating DocBook XML
@@ -895,7 +944,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%package -n trinity-umbrello
Summary: UML modelling tool and code generator
-Group: Development/Utilities
+Group: Development/Languages/Other
%description -n trinity-umbrello
Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
@@ -943,8 +992,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%if 0%{?build_kioslave}
%package tdeio-plugins
-Summary: subversion ioslave for Trinity
-Group: Environment/Libraries
+Summary: Subversion ioslave for Trinity
+Group: Development/Languages/Other
Requires: subversion
Obsoletes: trinity-tdesdk-kio-plugins < %{version}-%{release}
@@ -1018,57 +1067,78 @@ fi
##########
-%package -n trinity-kunittest
-Summary: unit testing library for Trinity
-Group: Development/Utilities
+%package -n trinity-tdeunittest
+Summary: Unit testing library for Trinity
+Group: Development/Languages/Other
+
+Obsoletes: trinity-kunittest < %{version}-%{release}
+Provides: trinity-kunittest = %{version}-%{release}
-%description -n trinity-kunittest
-KUnitTest is a small library that facilitates the writing of tests for
-TDE developers. There are two ways to use the KUnitTest library. One is
-to create dynamically loadable modules and use the kunittestmodrunner or
-kunittestguimodrunner programs to run the tests. The other is to use the
+%description -n trinity-tdeunittest
+tdeunittest is a small library that facilitates the writing of tests for
+TDE developers. There are two ways to use the tdeunittest library. One is
+to create dynamically loadable modules and use the tdeunittestmodrunner or
+tdeunittestguimodrunner programs to run the tests. The other is to use the
libraries to create your own testing application.
This package is part of Trinity, and a component of the TDE SDK module.
-%files -n trinity-kunittest
+%files -n trinity-tdeunittest
%defattr(-,root,root,-)
%{tde_bindir}/kunittest
%{tde_bindir}/kunittest_debughelper
%{tde_bindir}/kunittestmod
%{tde_bindir}/kunittestguimodrunner
%{tde_libdir}/libkunittestgui.la
-%{tde_libdir}/libkunittestgui.so
%{tde_libdir}/libkunittestgui.so.*
-%{tde_tdeincludedir}/kunittest/runnergui.h
-%post -n trinity-kunittest
+%post -n trinity-tdeunittest
/sbin/ldconfig || :
-%postun -n trinity-kunittest
+%postun -n trinity-tdeunittest
/sbin/ldconfig || :
##########
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: %{name} = %{version}-%{release}
Requires: trinity-kbabel-devel = %{version}-%{release}
+Requires: %{name}-misc = %{version}-%{release}
+Requires: trinity-kspy = %{version}-%{release}
+Requires: trinity-kmtrace = %{version}-%{release}
+Requires: trinity-tdeunittest = %{version}-%{release}
+Requires: trinity-libcvsservice-devel = %{version}-%{release}
+Requires: trinity-kompare = %{version}-%{release}
Obsoletes: trinity-kdesdk-devel < %{version}-%{release}
Provides: trinity-kdesdk-devel = %{version}-%{release}
%description devel
-%{summary}.
+This package contains the development files for tdesdk.
%files devel
%defattr(-,root,root,-)
+# misc
+%{tde_tdeincludedir}/kprofilemethod.h
+%{tde_libdir}/libkstartperf.so
+# kspy
+%{tde_tdeincludedir}/kspy.h
+%{tde_libdir}/libkspy.so
+# kmtrace
+%{tde_libdir}/kmtrace/libktrace_s.a
+%{tde_tdeincludedir}/ktrace.h
+# tdeunittest
+%{tde_libdir}/libkunittestgui.so
+%{tde_tdeincludedir}/kunittest/runnergui.h
+# kompare
+%{tde_libdir}/libkompareinterface.so
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -1077,7 +1147,7 @@ Provides: trinity-kdesdk-devel = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .cervisiapod
+%{?tde_patch:%patch1 -p1}
%build
@@ -1101,6 +1171,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
\
@@ -1144,17 +1215,36 @@ export PATH="%{tde_bindir}:${PATH}"
# Removes useless stuff
%__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules
+# Fix permissions
+chmod 644 %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/Doxyfile.global
+
+# Make kapptemplate archive
+pushd %{?buildroot}%{tde_datadir}/apps/kapptemplate
+mkdir kapptemplate
+mv admin appframework bin existing include kapp kpartapp kpartplugin kapptemplate/
+tar cfz kapptemplate.tar.gz kapptemplate
+rm -rf kapptemplate
+popd
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kuiviewer Development GUIDesigner
+%suse_update_desktop_file umbrello Development Design
+%suse_update_desktop_file kbugbuster Development Debugger
+%suse_update_desktop_file -u catalogmanager Development Translation
+%suse_update_desktop_file kbabel Development Translation
+%suse_update_desktop_file -u kbabeldict Development Translation
+%suse_update_desktop_file cervisia Development RevisionControl
+%suse_update_desktop_file kompare Development RevisionControl
+%suse_update_desktop_file kcachegrind Development Profiling
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
%clean
%__rm -rf %{buildroot}
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc b/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdetoys/tdetoys-14.0.0.spec b/redhat/main/tdetoys/tdetoys-14.0.0.spec
index 28f168bb5..26898ec16 100644
--- a/redhat/main/tdetoys/tdetoys-14.0.0.spec
+++ b/redhat/main/tdetoys/tdetoys-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdetoys (version R14.0.0)
+# spec file for package tdetoys (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -20,7 +20,9 @@
# Having KDE libraries may cause FTBFS here !
# TDE variables
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdetoys
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -33,16 +35,11 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Summary: Trinity Desktop Environment - Toys and Amusements
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: Amusements/Graphics
URL: http://www.trinitydesktop.org/
@@ -93,9 +90,16 @@ BuildRequires: libidn-devel
BuildRequires: gamin-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# PCRE support
BuildRequires: pcre-devel
+# OPENSSL support
+BuildRequires: openssl-devel
+
+
Obsoletes: trinity-kdetoys < %{version}-%{release}
Provides: trinity-kdetoys = %{version}-%{release}
@@ -155,16 +159,6 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_tdedocdir}/HTML/en/amor/
%doc AUTHORS COPYING README
-%post -n trinity-amor
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-amor
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-eyesapplet
@@ -229,14 +223,6 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_tdedocdir}/HTML/en/kmoon/
%doc AUTHORS COPYING README
-%post -n trinity-kmoon
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
##########
%package -n trinity-kodo
@@ -259,16 +245,6 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_tdedocdir}/HTML/en/kodo/
%doc AUTHORS COPYING README
-%post -n trinity-kodo
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kodo
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kteatime
@@ -298,16 +274,6 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_tdedocdir}/HTML/en/kteatime/
%doc AUTHORS COPYING README
-%post -n trinity-kteatime
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kteatime
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ktux
@@ -327,14 +293,6 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_datadir}/icons/hicolor/*/apps/ktux.png
%doc AUTHORS COPYING README
-%post -n trinity-ktux
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun -n trinity-ktux
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
##########
%package -n trinity-kweather
@@ -378,16 +336,6 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_tdedocdir}/HTML/en/kweather/
%doc AUTHORS COPYING README
-%post -n trinity-kweather
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kweather
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kworldclock
@@ -420,16 +368,6 @@ This package is part of Trinity, and a component of the TDE toys module.
%{tde_tdedocdir}/HTML/en/kworldclock/
%doc AUTHORS COPYING README
-%post -n trinity-kworldclock
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kworldclock
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -497,5 +435,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec b/redhat/main/tdetoys/tdetoys-3.5.13.2.spec
index aa31d8b07..28542f0b2 100644
--- a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec
+++ b/redhat/main/tdetoys/tdetoys-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
%define tde_version 3.5.13.2
# TDE specific building variables
@@ -24,7 +19,7 @@ Summary: Trinity Desktop Environment - Toys and Amusements
Name: trinity-tdetoys
Group: Amusements/Graphics
Version: %{tde_version}
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
License: GPLv2+
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
@@ -433,9 +428,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-
diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index 8186daa2f..51ba2ca49 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdeutils (version R14.0.0)
+# spec file for package tdeutils (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -20,10 +20,13 @@
# Having KDE libraries may cause FTBFS here !
# TDE variables
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdeutils
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -34,16 +37,11 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
Summary: TDE Utilities
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: Applications/System
URL: http://www.trinitydesktop.org/
@@ -63,6 +61,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: klaptop_acpi_helper.pam
Source2: klaptop_acpi_helper.console
Source3: kcmlaptoprc
+Source4: %{name}-rpmlintrc
Obsoletes: trinity-kdeutils < %{version}-%{release}
Provides: trinity-kdeutils = %{version}-%{release}
@@ -71,7 +70,9 @@ Provides: trinity-kdeutils-extras = %{version}-%{release}
Obsoletes: tdeutils < %{version}-%{release}
Provides: tdeutils = %{version}-%{release}
+BuildRequires: trinity-filesystem >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
@@ -120,9 +121,9 @@ BuildRequires: gamin-devel
BuildRequires: pcre-devel
# XMMS support
-#%if 0%{?fedora}
+#if 0#{?fedora}
#BuildRequires: xmms-devel
-#%endif
+#endif
# KLAPTOPDAEMON
# Not for RHEL 4!
@@ -130,8 +131,11 @@ BuildRequires: pcre-devel
%define build_klaptopdaemon 1
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
BuildRequires: libXScrnSaver-devel
@@ -145,6 +149,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
%endif
+# OPENSSL support
+BuildRequires: openssl-devel
+
# CONSOLEHELPER (usermode) support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_consolehelper 1
@@ -153,6 +160,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%define dont_relink 1
%endif
+%if "%{?tde_version}" == "14.1.0"
+%define build_tdefilereplace 1
+%endif
Requires: trinity-ark = %{version}-%{release}
Requires: trinity-kcalc = %{version}-%{release}
@@ -173,36 +183,39 @@ Requires: trinity-ksim = %{version}-%{release}
Requires: trinity-ktimer = %{version}-%{release}
Requires: trinity-tdewalletmanager = %{version}-%{release}
Requires: trinity-superkaramba = %{version}-%{release}
-
+%if 0%{?build_tdefilereplace}
+Requires: trinity-tdefilereplace = %{version}-%{release}
+%endif
%description
Utilities for the Trinity Desktop Environment, including:
- * ark (tar/gzip archive manager)
- * kcalc (scientific calculator)
- * kcharselect (character selector)
- * tdelirc (infrared control)
- * tdessh (ssh front end)
- * kdf (view disk usage)
- * kedit (simple text editor)
- * kfloppy (floppy formatting tool)
- * kgpg (gpg gui)
- * khexedit (hex editor)
- * kjots (note taker)
+* ark (tar/gzip archive manager)
+* kcalc (scientific calculator)
+* kcharselect (character selector)
+* tdelirc (infrared control)
+* tdessh (ssh front end)
+* kdf (view disk usage)
+* kedit (simple text editor)
+* kfloppy (floppy formatting tool)
+* kgpg (gpg gui)
+* khexedit (hex editor)
+* kjots (note taker)
%if 0%{?build_klaptopdaemon}
- * klaptopdaemon (battery monitoring and management for laptops);
+* klaptopdaemon (battery monitoring and management for laptops);
%endif
- * kmilo
- * kregexpeditor (regular expression editor)
- * ksim (system information monitor);
- * ktimer (task scheduler)
- * kwikdisk (removable media utility)
+* kmilo
+* kregexpeditor (regular expression editor)
+* ksim (system information monitor);
+* ktimer (task scheduler)
+* kwikdisk (removable media utility)
+* tdefilereplace: batch search and replace tool
%files
##########
%package -n trinity-ark
-Summary: graphical archiving tool for Trinity
+Summary: Graphical archiving tool for Trinity
Group: Applications/Utilities
#Requires: ncompress
Requires: unzip
@@ -222,7 +235,7 @@ from within Ark.
The program can handle various formats such as tar, gzip, bzip2, zip, rar and
lha (if appropriate command-line programs are installed).
-Ark can work closely with Konqueror in the KDE environment to handle archives,
+Ark can work closely with Konqueror in the TDE environment to handle archives,
if you install the Konqueror Integration plugin available in the konq-plugins
package.
@@ -242,26 +255,10 @@ package.
%{tde_datadir}/services/ark_part.desktop
%{tde_tdedocdir}/HTML/en/ark/
-%post -n trinity-ark
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ark
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kcalc
-Summary: calculator for Trinity
+Summary: Calculator for Trinity
Group: Applications/Utilities
%description -n trinity-kcalc
@@ -287,30 +284,15 @@ It provides:
%{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
%{tde_tdedocdir}/HTML/en/kcalc/
-%post -n trinity-kcalc
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcalc
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kcharselect
-Summary: character selector for Trinity
+Summary: Character selector for Trinity
Group: Applications/Utilities
+Requires: trinity-kicker
%description -n trinity-kcharselect
-A character set selector for TDE.
+This package contains kcharselect, a character set selector for TDE.
%files -n trinity-kcharselect
%defattr(-,root,root,-)
@@ -324,25 +306,12 @@ A character set selector for TDE.
%{tde_datadir}/icons/hicolor/*/apps/kcharselect.png
%{tde_tdedocdir}/HTML/en/kcharselect/
-%post -n trinity-kcharselect
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcharselect
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-tdelirc
-Summary: infrared control for Trinity
+Summary: Infrared control for Trinity
Group: Applications/Utilities
+Requires: trinity-filesystem
Obsoletes: trinity-kdelirc < %{version}-%{release}
Provides: trinity-kdelirc = %{version}-%{release}
@@ -365,6 +334,7 @@ This is a frontend for the LIRC suite to use infrared devices with TDE.
%{tde_datadir}/apps/profiles/konqueror.profile.xml
%{tde_datadir}/apps/profiles/noatun.profile.xml
%{tde_datadir}/apps/profiles/profile.dtd
+%dir %{tde_datadir}/apps/remotes
%{tde_datadir}/apps/remotes/RM-0010.remote.xml
%{tde_datadir}/apps/remotes/cimr100.remote.xml
%{tde_datadir}/apps/remotes/hauppauge.remote.xml
@@ -377,26 +347,10 @@ This is a frontend for the LIRC suite to use infrared devices with TDE.
%{tde_tdedocdir}/HTML/en/irkick/
%{tde_tdedocdir}/HTML/en/kcmlirc/
-%post -n trinity-tdelirc
-/sbin/ldconfig
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdelirc
-/sbin/ldconfig
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-tdessh
-Summary: ssh frontend for Trinity
+Summary: Ssh frontend for Trinity
Group: Applications/Utilities
%if 0%{?suse_version}
Requires: openssh
@@ -417,8 +371,9 @@ This package contains TDE's frontend for ssh.
##########
%package -n trinity-kdf
-Summary: disk space utility for Trinity
+Summary: Disk space utility for Trinity
Group: Applications/Utilities
+Requires: trinity-kcontrol
%description -n trinity-kdf
KDiskFree displays the available file devices (hard drive partitions, floppy
@@ -442,24 +397,10 @@ in a file manager.
%{tde_tdedocdir}/HTML/en/kdf/
%{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/
-%post -n trinity-kdf
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdf
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kedit
-Summary: basic text editor for Trinity
+Summary: Basic text editor for Trinity
Group: Applications/Utilities
%description -n trinity-kedit
@@ -477,31 +418,15 @@ reasonably fast start.
%{tde_tdelibdir}/kedit.so
%{tde_libdir}/libtdeinit_kedit.so
%{tde_tdeappdir}/KEdit.desktop
-%{tde_datadir}/apps/kedit/keditui.rc
+%{tde_datadir}/apps/kedit/
%{tde_datadir}/config.kcfg/kedit.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kedit.png
%{tde_tdedocdir}/HTML/en/kedit/
-%post -n trinity-kedit
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kedit
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kfloppy
-Summary: floppy formatter for Trinity
+Summary: Floppy formatter for Trinity
Group: Applications/Utilities
Requires: dosfstools
@@ -517,20 +442,6 @@ to format 3.5" and 5.25" floppy disks.
%{tde_datadir}/icons/hicolor/*/apps/kfloppy.png
%{tde_tdedocdir}/HTML/en/kfloppy/
-%post -n trinity-kfloppy
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfloppy
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kgpg
@@ -566,20 +477,6 @@ Features:
%{tde_datadir}/icons/hicolor/*/apps/kgpg.png
%{tde_tdedocdir}/HTML/en/kgpg/
-%post -n trinity-kgpg
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgpg
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-khexedit
@@ -601,32 +498,16 @@ support and other powerful features.
%{tde_libdir}/libkhexeditcommon.so.*
%{tde_tdeappdir}/khexedit.desktop
%{tde_datadir}/apps/khexedit/
-%{tde_datadir}/apps/khexedit2part/khexedit2partui.rc
+%{tde_datadir}/apps/khexedit2part/
%{tde_datadir}/icons/hicolor/*/apps/khexedit.png
%{tde_datadir}/services/kbyteseditwidget.desktop
%{tde_datadir}/services/khexedit2part.desktop
%{tde_tdedocdir}/HTML/en/khexedit/
-%post -n trinity-khexedit
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-khexedit
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kjots
-Summary: note taking utility for Trinity
+Summary: Note taking utility for Trinity
Group: Applications/Utilities
%description -n trinity-kjots
@@ -642,28 +523,14 @@ program included in the tkgoodstuff package.
%{tde_datadir}/icons/hicolor/*/apps/kjots.png
%{tde_tdedocdir}/HTML/en/kjots/
-%post -n trinity-kjots
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kjots
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%if 0%{?build_klaptopdaemon}
%package -n trinity-klaptopdaemon
-Summary: battery monitoring and management for laptops using Trinity
+Summary: Battery monitoring and management for laptops using Trinity
Group: Applications/Utilities
-Requires: pm-utils
+Requires: trinity-kcontrol
%if 0%{?with_consolehelper}
# package 'usermode' provides '/usr/bin/consolehelper-gtk'
@@ -708,30 +575,14 @@ power management, for laptops, from within TDE.
%{_sbindir}/klaptop_acpi_helper
%endif
-%config %{tde_datadir}/config/kcmlaptoprc
-
-%post -n trinity-klaptopdaemon
-/sbin/ldconfig
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klaptopdaemon
-/sbin/ldconfig
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+%config %{tde_confdir}/kcmlaptoprc
%endif
##########
%package -n trinity-kmilo
-Summary: laptop special keys support for Trinity
+Summary: Laptop special keys support for Trinity
Group: Applications/Utilities
%description -n trinity-kmilo
@@ -749,21 +600,18 @@ with special keys.
%{tde_tdelibdir}/kmilo_generic.so
%{tde_libdir}/libkmilo.so.*
%{tde_datadir}/services/kded/kmilod.desktop
+%dir %{tde_datadir}/services/kmilo
%{tde_datadir}/services/kmilo/kmilo_generic.desktop
+%dir %{tde_datadir}/servicetypes/kmilo
%{tde_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
-%post -n trinity-kmilo
-/sbin/ldconfig
-
-%postun -n trinity-kmilo
-/sbin/ldconfig
-
##########
%package -n trinity-kmilo-legacy
-Summary: non-standard plugins for KMilo
+Summary: Non-standard plugins for KMilo
Group: Applications/Utilities
Requires: trinity-kmilo = %{version}-%{release}
+Requires: trinity-kcontrol
%description -n trinity-kmilo-legacy
KMilo lets you use the special keys on some keyboards and laptops.
@@ -800,7 +648,7 @@ plugin, if you need this package please file a bug.
##########
%package -n trinity-kregexpeditor
-Summary: graphical regular expression editor plugin for Trinity
+Summary: Graphical regular expression editor plugin for Trinity
Group: Applications/Utilities
%description -n trinity-kregexpeditor
@@ -819,27 +667,12 @@ with TDE. It let you draw your regular expression in an unambiguous way.
%{tde_datadir}/services/kregexpeditorgui.desktop
%{tde_tdedocdir}/HTML/en/KRegExpEditor/
-%post -n trinity-kregexpeditor
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kregexpeditor
-/sbin/ldconfig
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-ksim
-Summary: system information monitor for Trinity
+Summary: System information monitor for Trinity
Group: Applications/Utilities
+Requires: trinity-kicker
%description -n trinity-ksim
KSim is a system monitor app which has its own plugin system with support
@@ -848,7 +681,7 @@ connections, power, etc.
%files -n trinity-ksim
%defattr(-,root,root,-)
-%config %{tde_datadir}/config/ksim_panelextensionrc
+%config %{tde_confdir}/ksim_panelextensionrc
%{tde_tdelibdir}/ksim_*.la
%{tde_tdelibdir}/ksim_*.so
%{tde_libdir}/libksimcore.so.*
@@ -858,24 +691,10 @@ connections, power, etc.
%{tde_datadir}/icons/crystalsvg/*/apps/ksim.png
%{tde_datadir}/icons/crystalsvg/*/devices/ksim_cpu.png
-%post -n trinity-ksim
-/sbin/ldconfig
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun -n trinity-ksim
-/sbin/ldconfig
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
##########
%package -n trinity-ktimer
-Summary: timer utility for Trinity
+Summary: Timer utility for Trinity
Group: Applications/Utilities
%description -n trinity-ktimer
@@ -890,24 +709,10 @@ command execution.
%{tde_datadir}/icons/hicolor/*/apps/ktimer.png
%{tde_tdedocdir}/HTML/en/ktimer/
-%post -n trinity-ktimer
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktimer
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-tdewalletmanager
-Summary: wallet manager for Trinity
+Summary: Wallet manager for Trinity
Group: Applications/Utilities
Obsoletes: trinity-kwalletmanager < %{version}-%{release}
@@ -932,24 +737,10 @@ keeps a master password to all wallets.
%{tde_datadir}/services/tdewalletmanager_show.desktop
%{tde_tdedocdir}/HTML/en/tdewallet/
-%post -n trinity-tdewalletmanager
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdewalletmanager
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-superkaramba
-Summary: a program based on karamba improving the eyecandy of TDE
+Summary: A program based on karamba improving the eyecandy of TDE
Group: Applications/Utilities
%description -n trinity-superkaramba
@@ -967,8 +758,8 @@ Here are just some examples of the things that can be done:
%files -n trinity-superkaramba
%defattr(-,root,root,-)
%{tde_bindir}/superkaramba
-%{tde_datadir}/applnk/Utilities/superkaramba.desktop
-%{tde_datadir}/apps/superkaramba/superkarambaui.rc
+%{tde_tdeappdir}/superkaramba.desktop
+%{tde_datadir}/apps/superkaramba/
%{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png
%{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
%{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
@@ -976,17 +767,40 @@ Here are just some examples of the things that can be done:
%{tde_datadir}/mimelnk/application/x-superkaramba.desktop
%{tde_tdedocdir}/HTML/en/superkaramba/
-%post -n trinity-superkaramba
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
+##########
-%postun -n trinity-superkaramba
-for f in crystalsvg ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
+%if 0%{?build_tdefilereplace}
+
+%package -n trinity-tdefilereplace
+Summary: Batch search-and-replace component for TDE
+Group: Applications/Utilities
+
+Obsoletes: trinity-kfilereplace < %{version}-%{release}
+Provides: trinity-kfilereplace = %{version}-%{release}
+
+%description -n trinity-tdefilereplace
+TDEFileReplace is an embedded component for TDE that acts as a batch
+search-and-replace tool. It allows you to replace one expression with
+another in many files at once.
+
+Note that at the moment TDEFileReplace does not come as a standalone
+application.
+
+This package is part of Trinity, as a component of the TDE utilities module.
+
+%files -n trinity-tdefilereplace
+%defattr(-,root,root,-)
+%{tde_bindir}/tdefilereplace
+%{tde_tdelibdir}/libtdefilereplacepart.la
+%{tde_tdelibdir}/libtdefilereplacepart.so
+%{tde_tdeappdir}/tdefilereplace.desktop
+%{tde_datadir}/apps/tdefilereplace/
+%{tde_datadir}/apps/tdefilereplacepart/
+%{tde_tdedocdir}/HTML/en/tdefilereplace/
+%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
+%{tde_datadir}/services/tdefilereplacepart.desktop
+
+%endif
##########
@@ -1003,7 +817,7 @@ Obsoletes: tdeutils-devel < %{version}-%{release}
Provides: tdeutils-devel = %{version}-%{release}
%description devel
-Development files for %{name}.
+This package contains the development files for tdeutils.
%files devel
%defattr(-,root,root,-)
@@ -1026,12 +840,6 @@ Development files for %{name}.
%{tde_libdir}/libkhexeditcommon.so
%{tde_datadir}/cmake/libksimcore.cmake
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -1043,6 +851,14 @@ Development files for %{name}.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%if 0%{?rhel} == 5
+# Reverts some older Python stuff
+%__sed -i "superkaramba/src/"*".cpp" \
+ -e "s|PyBytes_CheckExact|PyString_CheckExact|g" \
+ -e "s|PyBytes_AsString|PyString_AsString|g" \
+ -e "s|PyBytes_FromString|PyString_FromString|g" \
+%endif
+
%build
unset QTDIR QTINC QTLIB
@@ -1071,6 +887,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
@@ -1119,7 +936,7 @@ export PATH="%{tde_bindir}:${PATH}"
%endif
# klaptop settings file
-%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/config/kcmlaptoprc"
+%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_confdir}/kcmlaptoprc"
%else
@@ -1131,28 +948,34 @@ export PATH="%{tde_bindir}:${PATH}"
%endif
+# Fix desktop shortcut location
+%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file KEdit Utility TextEditor
-%suse_update_desktop_file superkaramba Utility DesktopUtility
-%suse_update_desktop_file KCharSelect Utility Accessibility
-%suse_update_desktop_file khexedit Utility Editor
-%suse_update_desktop_file Kjots Utility TimeUtility
-%suse_update_desktop_file ktimer Utility TimeUtility
-%suse_update_desktop_file kwikdisk System Applet
-%suse_update_desktop_file kdf System Filesystem
-%suse_update_desktop_file ark System Archiving
-%suse_update_desktop_file kcalc Utility Calculator
-%suse_update_desktop_file kgpg Utility Security
-%suse_update_desktop_file irkick Applet
-%suse_update_desktop_file tdewalletmanager Applet
-%suse_update_desktop_file kregexpeditor Utility Editor
+%suse_update_desktop_file KEdit Utility TextEditor
+%suse_update_desktop_file superkaramba Utility DesktopUtility
+%suse_update_desktop_file KCharSelect Utility Accessibility
+%suse_update_desktop_file khexedit Utility Editor
+%suse_update_desktop_file Kjots Utility TimeUtility
+%suse_update_desktop_file ktimer Utility TimeUtility
+%suse_update_desktop_file kwikdisk System Applet
+%suse_update_desktop_file kdf System Filesystem
+%suse_update_desktop_file ark System Archiving
+%suse_update_desktop_file kcalc Utility Calculator
+%suse_update_desktop_file kgpg Utility Security
+%suse_update_desktop_file irkick Applet
+%suse_update_desktop_file tdewalletmanager Applet
+%suse_update_desktop_file kregexpeditor Utility Editor
%suse_update_desktop_file kcmdf
%suse_update_desktop_file kcmlirc
%suse_update_desktop_file tdewalletconfig
%suse_update_desktop_file thinkpad
%suse_update_desktop_file kvaio
-%suse_update_desktop_file KFloppy System Filesystem
+%suse_update_desktop_file KFloppy System Filesystem
+%if 0%{?build_tdefilereplace}
+%suse_update_desktop_file -r tdefilereplace System FileManager
+%endif
%endif
# Icons from TDE Control Center should only be displayed in TDE
@@ -1164,11 +987,23 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
fi
done
+# Other TDE-only apps
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/thinkpad.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmlirc.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kvaio.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmdf.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/tdewalletconfig.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/khexedit.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kregexpeditor.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kgpg.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/Kjots.desktop"
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
%clean
%__rm -rf "%{?buildroot}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec
index b8ed9aa9f..13f1e9c46 100644
--- a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec
+++ b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
%define tde_version 3.5.13.2
# TDE specific building variables
@@ -22,7 +17,7 @@
Name: trinity-tdeutils
Version: %{tde_version}
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}
License: GPL
Summary: TDE Utilities
Group: Applications/System
@@ -1066,11 +1061,3 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc b/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop-14.0.0.spec
index 820d5af36..e958532c8 100644
--- a/redhat/main/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/main/tdevelop/tdevelop-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdevelop (version R14.0.0)
+# spec file for package tdevelop (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,10 +21,13 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdevelop
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -38,7 +41,7 @@
Name: trinity-%{tde_pkg}
Summary: Integrated Development Environment for C++/C
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Group: Development/Tools
URL: http://www.trinitydesktop.org/
@@ -55,6 +58,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
Requires: %{name}-libs = %{version}-%{release}
@@ -119,15 +123,25 @@ BuildRequires: subversion-devel
# NEON support
BuildRequires: neon-devel
-# LDAP support
+# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: openldap-devel
+%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
-%else
-BuildRequires: openldap-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires: openldap24-libs-devel
%endif
-# ACL support
+# LIBACL support
+%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libacl-devel
+%endif
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
%description
The TDevelop Integrated Development Environment provides many features
@@ -159,9 +173,11 @@ individual needs.
%{tde_bindir}/kdevdesigner
%{tde_bindir}/tdevelop
%{tde_bindir}/tdevelop-htdig
-%{tde_bindir}/kdevprj2tdevelop
+%{tde_bindir}/kdevprj2kdevelop
%{tde_bindir}/kdevprofileeditor
%{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
+%{tde_confdir}/kdevassistantrc
+%{tde_confdir}/tdeveloprc
%{tde_tdeappdir}/kdevassistant.desktop
%{tde_tdeappdir}/kdevdesigner.desktop
%{tde_tdeappdir}/tdevelop.desktop
@@ -447,7 +463,6 @@ individual needs.
%{tde_datadir}/apps/kdevdebugger/
%{tde_datadir}/apps/kdevdesigner/
%{tde_datadir}/apps/kdevdesignerpart/
-%{tde_datadir}/apps/kdevdesignerpart/
%{tde_datadir}/apps/kdevdiff/
%{tde_datadir}/apps/kdevdistpart/
%{tde_datadir}/apps/kdevdocumentation/
@@ -481,8 +496,6 @@ individual needs.
%{tde_datadir}/apps/kdevtrollproject/
%{tde_datadir}/apps/kdevvalgrind/
%{tde_datadir}/apps/tdeio_pydoc/
-%{tde_datadir}/config/kdevassistantrc
-%{tde_datadir}/config/tdeveloprc
%{tde_datadir}/desktop-directories/tde-development-tdevelop.directory
%{tde_tdedocdir}/HTML/en/tdevelop/
%{tde_libdir}/libd.so.0
@@ -498,20 +511,6 @@ individual needs.
%{tde_datadir}/services/kdevvisualboyadvance.desktop
%{tde_tdedocdir}/HTML/en/kdevdesigner/
-%post
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package devel
@@ -531,12 +530,6 @@ This package contains the development files for tdevelop.
%{tde_libdir}/lib*.la
%{tde_includedir}/*
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
##########
%package libs
@@ -587,12 +580,6 @@ This package contains the libraries needed for the tdevelop programs.
%{tde_libdir}/libprofileengine.so.0
%{tde_libdir}/libprofileengine.so.0.0.0
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -615,6 +602,12 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
+# openldap 2.4 includes (CentOS 5)
+if [ -d "/usr/include/openldap24" ]; then
+ RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
+fi
+
+
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
@@ -632,6 +625,7 @@ fi
-DWITH_GCC_VISIBILITY=OFF \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@@ -658,5 +652,3 @@ fi
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec
index 0a2cd496c..0186370c8 100644
--- a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec
+++ b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec
@@ -1,77 +1,121 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdevelop (version 3.5.13-SRU)
+#
+# 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 1
%define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdevelop
+%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/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
-Name: trinity-tdevelop
+Name: trinity-%{tde_pkg}
Summary: Integrated Development Environment for C++/C
Version: %{tde_version}
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-
-License: GPLv2
+Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
Group: Development/Tools
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
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
-Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-# [c_cpp_ref] Fix library directories detection
-Patch1: c_cpp_reference-2.0.2-config.patch
-# [c_cpp_ref] Fix installation of 'asm' files
-Patch4: c_cpp_reference-2.0.2-install.patch
+Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+BuildRequires: tqt3-apps-devel >= 3.5.0
+BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: trinity-tdesdk-devel >= %{tde_version}
+Obsoletes: trinity-kdevelop < %{version}-%{release}
+Provides: trinity-kdevelop = %{version}-%{release}
-Requires: make
-Requires: perl
-Requires: flex >= 2.5.4
-%if 0%{?rhel} || 0%{?fedora}
-Requires: qt3-designer >= 3.3.8.d
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires: %{_lib}qt3-devel >= 3.3.8.d
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
%endif
-%if 0%{?suse_version}
+
+BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++
+BuildRequires: fdupes
+BuildRequires: desktop-file-utils
+BuildRequires: make
+
+Requires: make
+Requires: perl
Requires: qt3-devel >= 3.3.8.d
+Requires: gettext
+Requires: ctags
+
+
+# LIBIDN support
+BuildRequires: libidn-devel
+
+# GAMIN support
+# Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires: gamin-devel
%endif
-Requires: gettext
-Requires: ctags
-BuildRequires: cmake >= 2.8
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdesdk-devel >= %{tde_version}
+# PCRE support
+BuildRequires: pcre-devel
+
+# DB4 support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: db4-devel
%endif
+
+# FLEX support
BuildRequires: flex
-# FIXME: No CVS support in tdevelop? This is going to suck...
-# Requires kdesdk3.
+Requires: flex >= 2.5.4
+
+# SVN support
BuildRequires: subversion-devel
+
+# NEON support
BuildRequires: neon-devel
# LDAP support
@@ -86,9 +130,6 @@ BuildRequires: openldap-devel
BuildRequires: libacl-devel
%endif
-Obsoletes: trinity-tdevelop < %{version}-%{release}
-Provides: trinity-tdevelop = %{version}-%{release}
-
%description
The TDevelop Integrated Development Environment provides many features
that developers need as well as providing a unified interface to programs
@@ -283,15 +324,15 @@ individual needs.
%{tde_tdelibdir}/libkdevvcsmanager.so
%{tde_datadir}/apps/kconf_update/
%{tde_datadir}/apps/kdevabbrev/
-%{tde_datadir}/apps/kdevadaproject/kdevadaproject.rc
-%{tde_datadir}/apps/kdevadasupport/kdevadasupport.rc
-%{tde_datadir}/apps/kdevantproject/kdevantproject.rc
-%{tde_datadir}/apps/kdevappoutputview/kdevmakeview.rc
+%{tde_datadir}/apps/kdevadaproject/
+%{tde_datadir}/apps/kdevadasupport/
+%{tde_datadir}/apps/kdevantproject/
+%{tde_datadir}/apps/kdevappoutputview/
%{tde_datadir}/apps/kdevappwizard/
-%{tde_datadir}/apps/kdevassistant/kdevassistantui.rc
-%{tde_datadir}/apps/kdevastyle/kdevpart_astyle.rc
-%{tde_datadir}/apps/kdevautoproject/kdevautoproject.rc
-%{tde_datadir}/apps/kdevbashsupport/kdevbashsupport.rc
+%{tde_datadir}/apps/kdevassistant/
+%{tde_datadir}/apps/kdevastyle/
+%{tde_datadir}/apps/kdevautoproject/
+%{tde_datadir}/apps/kdevbashsupport/
%{tde_datadir}/apps/kdevclassview/
%{tde_datadir}/apps/kdevcppsupport/
%{tde_datadir}/icons/hicolor/*/actions/breakpoint_add.png
@@ -401,50 +442,46 @@ individual needs.
%{tde_datadir}/servicetypes/kdevelopsourceformatter.desktop
%{tde_datadir}/servicetypes/kdevelopvcsintegrator.desktop
%{tde_datadir}/servicetypes/kdevelopversioncontrol.desktop
-%{tde_datadir}/apps/kdevcsharpsupport/kdevcsharpsupport.rc
-%{tde_datadir}/apps/kdevctags2/kdevpart_ctags2.rc
-%{tde_datadir}/apps/kdevcustomproject/kdevcustomproject.rc
+%{tde_datadir}/apps/kdevcsharpsupport/
+%{tde_datadir}/apps/kdevctags2/
+%{tde_datadir}/apps/kdevcustomproject/
%{tde_datadir}/apps/kdevdebugger/
-%{tde_datadir}/apps/kdevdesigner/kdevdesigner_shell.rc
-%{tde_datadir}/apps/kdevdesignerpart/kdevdesigner_part.rc
-%{tde_datadir}/apps/kdevdesignerpart/kdevdesigner_part_sh.rc
-%{tde_datadir}/apps/kdevdiff/kdevdiff.rc
-%{tde_datadir}/apps/kdevdistpart/kdevpart_distpart.rc
+%{tde_datadir}/apps/kdevdesigner/
+%{tde_datadir}/apps/kdevdesignerpart/
+%{tde_datadir}/apps/kdevdesignerpart/
+%{tde_datadir}/apps/kdevdiff/
+%{tde_datadir}/apps/kdevdistpart/
%{tde_datadir}/apps/kdevdocumentation/
-%{tde_datadir}/apps/kdevdoxygen/kdevdoxygen.rc
+%{tde_datadir}/apps/kdevdoxygen/
%{tde_datadir}/apps/kdevelop/
%{tde_datadir}/apps/kdevfilecreate/
-%{tde_datadir}/apps/kdevfilelist/kdevfilelist.rc
-%{tde_datadir}/apps/kdevfilter/kdevfilter.rc
-%{tde_datadir}/apps/kdevfortransupport/kdevfortransupport.rc
-%{tde_datadir}/apps/kdevfullscreen/kdevpart_fullscreen.rc
+%{tde_datadir}/apps/kdevfilelist/
+%{tde_datadir}/apps/kdevfilter/
+%{tde_datadir}/apps/kdevfortransupport/
+%{tde_datadir}/apps/kdevfullscreen/
%{tde_datadir}/apps/kdevgrepview/
-%{tde_datadir}/apps/kdevjavasupport/kdevjavasupport.rc
-%{tde_datadir}/apps/kdevmakeview/kdevmakeview.rc
-%{tde_datadir}/apps/kdevpartexplorer/kdevpartexplorer.rc
-%{tde_datadir}/apps/kdevpascalproject/kdevpascalproject.rc
-%{tde_datadir}/apps/kdevpascalsupport/kdevpascalsupport.rc
-%{tde_datadir}/apps/kdevperlsupport/kdevperlsupport.rc
-%{tde_datadir}/apps/kdevphpsupport/kdevphpsupport.rc
-%{tde_datadir}/apps/kdevphpsupport/phpfunctions
-%{tde_datadir}/apps/kdevpythonsupport/kdevpythonsupport.rc
-%{tde_datadir}/apps/kdevquickopen/kdevpart_quickopen.rc
+%{tde_datadir}/apps/kdevjavasupport/
+%{tde_datadir}/apps/kdevmakeview/
+%{tde_datadir}/apps/kdevpartexplorer/
+%{tde_datadir}/apps/kdevpascalproject/
+%{tde_datadir}/apps/kdevpascalsupport/
+%{tde_datadir}/apps/kdevperlsupport/
+%{tde_datadir}/apps/kdevphpsupport/
+%{tde_datadir}/apps/kdevpythonsupport/
+%{tde_datadir}/apps/kdevquickopen/
%{tde_datadir}/apps/kdevrbdebugger/
-%{tde_datadir}/apps/kdevregexptest/kdevregexptest.rc
-%{tde_datadir}/apps/kdevreplace/kdevpart_replace.rc
-%{tde_datadir}/apps/kdevrubysupport/kdevrubysupport.rc
-%{tde_datadir}/apps/kdevrubysupport/pics/ruby_config.png
-%{tde_datadir}/apps/kdevrubysupport/pics/ruby_run.png
-%{tde_datadir}/apps/kdevscripting/kdevscripting.rc
-%{tde_datadir}/apps/kdevscriptproject/kdevscriptproject.rc
-%{tde_datadir}/apps/kdevsnippet/kdevpart_snippet.rc
-%{tde_datadir}/apps/kdevsqlsupport/kdevsqlsupport.rc
-%{tde_datadir}/apps/kdevtipofday/kdevpart_tipofday.rc
-%{tde_datadir}/apps/kdevtipofday/tips
-%{tde_datadir}/apps/kdevtools/kdevpart_tools.rc
-%{tde_datadir}/apps/kdevtrollproject/kdevtrollproject.rc
-%{tde_datadir}/apps/kdevvalgrind/kdevpart_valgrind.rc
-%{tde_datadir}/apps/kio_pydoc/kde_pydoc.py*
+%{tde_datadir}/apps/kdevregexptest/
+%{tde_datadir}/apps/kdevreplace/
+%{tde_datadir}/apps/kdevrubysupport/
+%{tde_datadir}/apps/kdevscripting/
+%{tde_datadir}/apps/kdevscriptproject/
+%{tde_datadir}/apps/kdevsnippet/
+%{tde_datadir}/apps/kdevsqlsupport
+%{tde_datadir}/apps/kdevtipofday/
+%{tde_datadir}/apps/kdevtools/
+%{tde_datadir}/apps/kdevtrollproject/
+%{tde_datadir}/apps/kdevvalgrind/
+%{tde_datadir}/apps/kio_pydoc/
%{tde_datadir}/config/kdevassistantrc
%{tde_datadir}/config/kdeveloprc
%{tde_datadir}/desktop-directories/tde-development-kdevelop.directory
@@ -456,12 +493,11 @@ individual needs.
%{tde_tdelibdir}/libkdevvisualboyadvance.la
%{tde_tdelibdir}/libkdevvisualboyadvance.so
%{tde_datadir}/apps/kdevdesignerpart/pics/
-%{tde_datadir}/apps/kdevvisualboyadvance/kdevpart_visualboyadvance.rc
+%{tde_datadir}/apps/kdevvisualboyadvance/
%{tde_tdedocdir}/HTML/en/kde_app_devel/
%{tde_datadir}/mimelnk/text/x-fortran.desktop
%{tde_datadir}/services/kdevvisualboyadvance.desktop
-
%post
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
@@ -480,14 +516,14 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
+Group: Development/Libraries/Other
Requires: %{name}-libs = %{version}-%{release}
Obsoletes: trinity-kdevelop-devel < %{version}-%{release}
Provides: trinity-kdevelop-devel = %{version}-%{release}
%description devel
-%{summary}.
+This package contains the development files for tdevelop.
%files devel
%defattr(-,root,root,-)
@@ -514,7 +550,7 @@ Obsoletes: trinity-kdevelop-libs < %{version}-%{release}
Provides: trinity-kdevelop-libs = %{version}-%{release}
%description libs
-%{summary}.
+This package contains the libraries needed for the tdevelop programs.
%files libs
%defattr(-,root,root,-)
@@ -566,16 +602,7 @@ Provides: trinity-kdevelop-libs = %{version}-%{release}
##########
%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1
-%patch1 -p0 -b .config
-%patch4 -p1
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
-%__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
-%__cp -ar admin c_cpp_reference-2.0.2_for_KDE_3.0/
-%__make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%build
@@ -589,20 +616,6 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-# c references
-pushd c_cpp_reference-2.0.2_for_KDE_3.0
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
- --with-qt-includes=${QTINC:-${QTDIR}/include} \
- --with-extra-libs=%{tde_libdir}
-popd
-
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
@@ -614,6 +627,7 @@ fi
-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 \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
@@ -629,14 +643,13 @@ fi
%__make %{?_smp_mflags} || %__make
-# c references
-cd ..
-%__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
%clean
@@ -644,11 +657,3 @@ cd ..
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc b/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
index a01117ef5..4ddcde0b9 100644
--- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tdewebdev (version R14.0.0)
+# spec file for package tdewebdev (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,7 +21,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdewebdev
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -34,17 +36,12 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
Name: trinity-%{tde_pkg}
-Summary: Web development applications
+Summary: Web development applications
Group: Applications/Editors
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -65,6 +62,8 @@ Source2: http://download.sourceforge.net/quanta/html.tar.bz2
Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
+Source10: %{name}-rpmlintrc
+
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdesdk-devel >= %{tde_version}
@@ -97,6 +96,9 @@ BuildRequires: perl
BuildRequires: libxml2-devel
#endif
+%if "%{?tde_version}" != "14.1.0"
+%define build_tdefilereplace 1
+%endif
Obsoletes: trinity-kdewebdev-libs < %{version}-%{release}
Provides: trinity-kdewebdev-libs = %{version}-%{release}
@@ -105,7 +107,6 @@ Provides: trinity-kdewebdev = %{version}-%{release}
Requires: trinity-quanta = %{version}-%{release}
Requires: trinity-quanta-data = %{version}-%{release}
-Requires: trinity-tdefilereplace = %{version}-%{release}
Requires: trinity-kimagemapeditor = %{version}-%{release}
Requires: trinity-klinkstatus = %{version}-%{release}
Requires: trinity-kommander = %{version}-%{release}
@@ -113,7 +114,6 @@ Requires: trinity-kommander = %{version}-%{release}
%description
Web development applications, including:
-* tdefilereplace: batch search and replace tool
* kimagemapeditor: HTML image map editor
* klinkstatus: link checker
* kommander: visual dialog building tool
@@ -128,7 +128,7 @@ Web development applications, including:
%package -n trinity-quanta
Summary: web development environment for TDE [Trinity]
Group: Applications/Development
-Requires: trinity-tdefilereplace = %{version}-%{release}
+Requires: trinity-tdefilereplace
Requires: trinity-klinkstatus = %{version}-%{release}
Requires: trinity-kommander = %{version}-%{release}
Requires: trinity-quanta-data = %{version}-%{release}
@@ -169,21 +169,6 @@ This package is part of TDE, as a component of the TDE web development module.
%{tde_datadir}/servicetypes/quantadebugger.desktop
%{tde_tdedocdir}/HTML/en/quanta/
-%post -n trinity-quanta
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-quanta
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-
##########
%package -n trinity-quanta-data
@@ -205,52 +190,6 @@ This package is part of TDE, as a component of the TDE web development module.
##########
-%package -n trinity-tdefilereplace
-Summary: batch search-and-replace component for TDE [Trinity]
-Group: Applications/Development
-
-Obsoletes: trinity-kfilereplace < %{version}-%{release}
-Provides: trinity-kfilereplace = %{version}-%{release}
-
-%description -n trinity-tdefilereplace
-tdefileReplace is an embedded component for TDE that acts as a batch
-search-and-replace tool. It allows you to replace one expression with
-another in many files at once.
-
-Note that at the moment tdefileReplace does not come as a standalone
-application. An example of an application that uses the tdefileReplace
-component is Quanta Plus (found in the package quanta).
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-tdefilereplace
-%defattr(-,root,root,-)
-%{tde_bindir}/tdefilereplace
-%{tde_tdelibdir}/libtdefilereplacepart.la
-%{tde_tdelibdir}/libtdefilereplacepart.so
-%{tde_tdeappdir}/tdefilereplace.desktop
-%{tde_datadir}/apps/tdefilereplace/
-%{tde_datadir}/apps/tdefilereplacepart
-%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
-%{tde_datadir}/services/tdefilereplacepart.desktop
-%{tde_tdedocdir}/HTML/en/tdefilereplace/
-
-%post -n trinity-tdefilereplace
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdefilereplace
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
%package -n trinity-kimagemapeditor
Summary: HTML image map editor for TDE
Group: Applications/Development
@@ -274,20 +213,6 @@ This package is part of TDE, as a component of the TDE web development module.
%{tde_datadir}/services/kimagemapeditorpart.desktop
%{tde_tdedocdir}/HTML/en/kimagemapeditor/
-%post -n trinity-kimagemapeditor
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kimagemapeditor
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-klinkstatus
@@ -318,20 +243,6 @@ This package is part of TDE, as a component of the TDE web development module.
%{tde_datadir}/services/klinkstatus_part.desktop
%{tde_tdedocdir}/HTML/en/klinkstatus/
-%post -n trinity-klinkstatus
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klinkstatus
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kommander
@@ -384,22 +295,6 @@ This package is part of TDE, as a component of the TDE web development module.
%{tde_datadir}/apps/tdevappwizard/
%{tde_datadir}/services/kommander_part.desktop
-%post -n trinity-kommander
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kommander
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
##########
%package -n trinity-kommander-devel
@@ -429,12 +324,6 @@ This package is part of TDE, as a component of the TDE web development module.
%{tde_tdeincludedir}/kommander*
%{tde_tdeincludedir}/specials.h
-%post -n trinity-kommander-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kommander-devel
-/sbin/ldconfig || :
-
##########
%if 0%{?build_kxsldbg}
@@ -479,19 +368,40 @@ This package is part of TDE, as a component of the TDE web development module.
%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png
%{tde_datadir}/services/kxsldbg_part.desktop
-%post -n trinity-kxsldbg
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+%endif
-%postun -n trinity-kxsldbg
-for f in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+##########
+
+%if 0%{?build_tdefilereplace}
+
+%package -n trinity-tdefilereplace
+Summary: Batch search-and-replace component for TDE
+Group: Applications/Utilities
+
+Obsoletes: trinity-kfilereplace < %{version}-%{release}
+Provides: trinity-kfilereplace = %{version}-%{release}
+
+%description -n trinity-tdefilereplace
+TDEFileReplace is an embedded component for TDE that acts as a batch
+search-and-replace tool. It allows you to replace one expression with
+another in many files at once.
+
+Note that at the moment TDEFileReplace does not come as a standalone
+application.
+
+This package is part of Trinity, as a component of the TDE utilities module.
+
+%files -n trinity-tdefilereplace
+%defattr(-,root,root,-)
+%{tde_bindir}/tdefilereplace
+%{tde_tdelibdir}/libtdefilereplacepart.la
+%{tde_tdelibdir}/libtdefilereplacepart.so
+%{tde_tdeappdir}/tdefilereplace.desktop
+%{tde_datadir}/apps/tdefilereplace/
+%{tde_datadir}/apps/tdefilereplacepart/
+%{tde_tdedocdir}/HTML/en/tdefilereplace/
+%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
+%{tde_datadir}/services/tdefilereplacepart.desktop
%endif
@@ -529,7 +439,7 @@ Requires: trinity-kommander-devel = %{version}-%{release}
%endif
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -561,7 +471,7 @@ fi
\
--enable-editors \
--with-extra-includes=%{_includedir}/tqt
-
+
# WTF hack for RHEL4
%if 0%{?rhel} == 4
@@ -597,10 +507,12 @@ cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
%suse_update_desktop_file -r kxsldbg Office WebDevelopment
%endif
%suse_update_desktop_file -r kimagemapeditor Office WebDevelopment
-%suse_update_desktop_file -r tdefilereplace System FileManager
%suse_update_desktop_file kmdr-editor Development GUIDesigner
%suse_update_desktop_file kmdr-executor Development GUIDesigner
%suse_update_desktop_file -r quanta Office WebDevelopment
+%if 0%{?build_tdefilereplace}
+%suse_update_desktop_file -r tdefilereplace System FileManager
+%endif
%endif
# Adds missing icons in 'hicolor' theme
@@ -615,5 +527,3 @@ popd
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec b/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec
index ae6558596..c26bb4008 100644
--- a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec
+++ b/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
%define tde_version 3.5.13.2
# TDE specific building variables
@@ -22,7 +17,7 @@
Name: trinity-tdewebdev
Version: %{tde_version}
-Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
License: GPL
Summary: Web development applications
Group: Applications/Editors
@@ -490,7 +485,7 @@ Requires: trinity-kommander-devel = %{version}-%{release}
%endif
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -555,8 +550,3 @@ cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
diff --git a/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc b/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)