From fdaab31bf13208dbdbda581ca43241fb41eb6710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 12 Oct 2014 00:43:36 +0200 Subject: RPM Packaging: update R14 packages --- .../dependencies/avahi-tqt/avahi-tqt-14.0.0.spec | 2 +- .../trinity-filesystem-14.0.0.spec | 452 +++++++++++++++++++++ .../trinity-filesystem/trinity-filesystem.spec | 452 --------------------- redhat/tdebase/plasma-desktop | 9 - redhat/tdebase/tdebase-14.0.0.spec | 165 ++++---- redhat/tdelibs/tdelibs-14.0.0.spec | 4 +- redhat/tdemultimedia/tdemultimedia-14.0.0.spec | 6 - 7 files changed, 539 insertions(+), 551 deletions(-) create mode 100644 redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec delete mode 100644 redhat/extras/trinity-filesystem/trinity-filesystem.spec delete mode 100644 redhat/tdebase/plasma-desktop diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec index 0849488e1..f0c4c250a 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec @@ -145,7 +145,7 @@ Group: Development/Libraries/C and C++ Provides: libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libtqt4-devel >= 2:4.2.0 +Requires: libtqt4-devel >= %{tde_epoch}:4.2.0 %{?avahi_devel:Requires: %{avahi_devel}} Obsoletes: trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec new file mode 100644 index 000000000..0f14796f7 --- /dev/null +++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec @@ -0,0 +1,452 @@ +# +# spec file for package trinity-filesystem +# +# Copyright (c) 2014 François Andriot +# +# 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_version 14.0.0 +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define _docdir %{tde_docdir} +%define tde_docdir %{tde_datadir}/doc +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_includedir %{tde_prefix}/include +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_tdelibdir %{tde_libdir}/trinity + + + +Name: trinity-filesystem +Version: %{tde_version} +Release: 1%{?dist} +Summary: Trinity Directory Layout +Group: System/Fhs +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + + +%description +This package installs the Trinity directory structure. + + +%files +%dir %{tde_prefix} + +%dir %{tde_bindir} + +%dir %{tde_datadir} +%dir %{tde_datadir}/config + +%dir %{tde_docdir} +%dir %{tde_tdedocdir} +%dir %{tde_tdedocdir}/HTML +%dir %{tde_tdedocdir}/HTML/en +%dir %{tde_tdedocdir}/HTML/en/common + +%dir %{tde_includedir} +%dir %{tde_tdeincludedir} + +%dir %{tde_libdir} +%dir %{tde_libdir}/pkgconfig +%dir %{tde_tdelibdir} + +%dir %{tde_datadir}/applications +%dir %{tde_datadir}/applications/tde +%dir %{tde_datadir}/applnk +%dir %{tde_datadir}/applnk/.hidden +%dir %{tde_datadir}/applnk/* +%dir %{tde_datadir}/applnk/*/* +%dir %{tde_datadir}/apps +%dir %{tde_datadir}/apps/plugin +%dir %{tde_datadir}/cmake +%dir %{tde_datadir}/config.kcfg +%dir %{tde_datadir}/autostart +%dir %{tde_datadir}/emoticons +%dir %{tde_datadir}/icons +%dir %{tde_datadir}/icons/crystalsvg +%dir %{tde_datadir}/icons/crystalsvg/* +%dir %{tde_datadir}/icons/crystalsvg/*/* +%dir %{tde_datadir}/icons/hicolor +%dir %{tde_datadir}/icons/hicolor/* +%dir %{tde_datadir}/icons/hicolor/*/* +%dir %{tde_datadir}/locale +%dir %{tde_datadir}/locale/en_US +%dir %{tde_datadir}/locale/l10n +%dir %{tde_datadir}/locale/l10n/* +%dir %{tde_datadir}/mimelnk +%dir %{tde_datadir}/mimelnk/* +%dir %{tde_datadir}/services +%dir %{tde_datadir}/servicetypes +%dir %{tde_datadir}/wallpapers + + +%dir %{_sysconfdir}/trinity +%dir %{_sysconfdir}/xdg/menus + +########## + +%prep + +%build + +%install +%__install -d -m 755 %{?buildroot}%{tde_prefix} + +%__install -d -m 755 %{?buildroot}%{tde_bindir} + +%__install -d -m 755 %{?buildroot}%{tde_datadir} +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications/tde +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/.hidden +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Applications +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Development +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Games +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Graphics +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Internet +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Multimedia +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Office +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings/WebBrowsing +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/System +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Toys +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Utilities +%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps +%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/plugin +%__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart +%__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake +%__install -d -m 755 %{?buildroot}%{tde_datadir}/config +%__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/audio +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/fonts +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/image +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/inode +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/media +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/message +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/model +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/multipart +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/print +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/text +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/uri +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/video +%__install -d -m 755 %{?buildroot}%{tde_datadir}/services +%__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes + +%__install -d -m 755 %{?buildroot}%{tde_datadir}/wallpapers + +# Create icons directories +%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons +for t in crystalsvg hicolor ; do + %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}" + %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable" + for i in {16,22,32,48,64,128} ; do + %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}" + done + + # Create subdirectories + for r in actions apps devices mimetypes places ; do + %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable/${r}" + for i in {16,22,32,48,64,128} ; do + %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}/${r}" + done + done +done + +%__install -d -m 755 %{?buildroot}%{tde_docdir} +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir} +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en/common + +%__install -d -m 755 %{?buildroot}%{tde_includedir} +%__install -d -m 755 %{?buildroot}%{tde_tdeincludedir} + +%__install -d -m 755 %{?buildroot}%{tde_libdir} +%__install -d -m 755 %{?buildroot}%{tde_libdir}/pkgconfig +%__install -d -m 755 %{?buildroot}%{tde_tdelibdir} + +%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor +%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32 +%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps + +%__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity +%__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus + +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/en_US +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/C +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ad +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ae +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/af +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ag +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ai +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/al +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/am +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/an +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ao +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ar +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/as +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/at +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/au +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/aw +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ax +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/az +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ba +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bb +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bd +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/be +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bf +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bh +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bi +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bj +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bo +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/br +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bs +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bt +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bw +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/by +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bz +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ca +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cc +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cd +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cf +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ch +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ci +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ck +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cl +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/co +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cu +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cv +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cx +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cy +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cz +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/de +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dj +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/do +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dz +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ec +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ee +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eh +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/er +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/es +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/et +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fi +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fj +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fo +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ga +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gb +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gd +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ge +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gh +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gi +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gl +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gp +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gq +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gt +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gu +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gw +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gy +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ht +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hu +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/id +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ie +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/il +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/in +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/iq +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ir +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/is +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/it +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jo +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jp +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ke +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kh +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ki +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/km +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kp +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kw +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ky +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kz +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/la +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lb +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lc +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/li +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ls +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lt +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lu +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lv +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ly +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ma +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mc +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/md +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/me +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mh +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ml +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mo +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mq +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ms +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mt +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mu +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mv +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mw +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mx +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/my +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mz +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/na +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nc +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ne +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nf +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ng +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ni +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nl +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/no +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/np +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nu +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nz +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/om +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pa +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pe +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pf +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ph +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pl +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ps +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pt +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pw +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/py +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/qa +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ro +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/rs +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ru +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/rw +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sa +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sb +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sc +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sd +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/se +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sh +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/si +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/so +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/st +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sv +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sy +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sz +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tc +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/td +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/th +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tj +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/to +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tp +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tr +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tt +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tv +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tw +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tz +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ua +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ug +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/us +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/uy +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/uz +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/va +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vc +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ve +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vi +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vn +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vu +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/wf +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ws +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ye +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/za +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/zm +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/zw + +%post +%if 0%{?suse_version} +# Add setuid files in '/etc/permissions.local' +for b in kcheckpass kgrantpty kpac_dhcp_helper start_tdeinit tdmtsak tdekbdledsync ; do + if ! grep -q "^%{tde_bindir}/${b}" "/etc/permissions.local"; then + echo "%{tde_bindir}/${b} root:root 4711" >>/etc/permissions.local + fi +done +%endif + + +%changelog +* Mon Jun 03 2013 Francois Andriot - 14.0.0-1 +- Initial build for TDE R14 diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec deleted file mode 100644 index 0f14796f7..000000000 --- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec +++ /dev/null @@ -1,452 +0,0 @@ -# -# spec file for package trinity-filesystem -# -# Copyright (c) 2014 François Andriot -# -# 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_version 14.0.0 -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define _docdir %{tde_docdir} -%define tde_docdir %{tde_datadir}/doc -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_includedir %{tde_prefix}/include -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_tdelibdir %{tde_libdir}/trinity - - - -Name: trinity-filesystem -Version: %{tde_version} -Release: 1%{?dist} -Summary: Trinity Directory Layout -Group: System/Fhs -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch - - -%description -This package installs the Trinity directory structure. - - -%files -%dir %{tde_prefix} - -%dir %{tde_bindir} - -%dir %{tde_datadir} -%dir %{tde_datadir}/config - -%dir %{tde_docdir} -%dir %{tde_tdedocdir} -%dir %{tde_tdedocdir}/HTML -%dir %{tde_tdedocdir}/HTML/en -%dir %{tde_tdedocdir}/HTML/en/common - -%dir %{tde_includedir} -%dir %{tde_tdeincludedir} - -%dir %{tde_libdir} -%dir %{tde_libdir}/pkgconfig -%dir %{tde_tdelibdir} - -%dir %{tde_datadir}/applications -%dir %{tde_datadir}/applications/tde -%dir %{tde_datadir}/applnk -%dir %{tde_datadir}/applnk/.hidden -%dir %{tde_datadir}/applnk/* -%dir %{tde_datadir}/applnk/*/* -%dir %{tde_datadir}/apps -%dir %{tde_datadir}/apps/plugin -%dir %{tde_datadir}/cmake -%dir %{tde_datadir}/config.kcfg -%dir %{tde_datadir}/autostart -%dir %{tde_datadir}/emoticons -%dir %{tde_datadir}/icons -%dir %{tde_datadir}/icons/crystalsvg -%dir %{tde_datadir}/icons/crystalsvg/* -%dir %{tde_datadir}/icons/crystalsvg/*/* -%dir %{tde_datadir}/icons/hicolor -%dir %{tde_datadir}/icons/hicolor/* -%dir %{tde_datadir}/icons/hicolor/*/* -%dir %{tde_datadir}/locale -%dir %{tde_datadir}/locale/en_US -%dir %{tde_datadir}/locale/l10n -%dir %{tde_datadir}/locale/l10n/* -%dir %{tde_datadir}/mimelnk -%dir %{tde_datadir}/mimelnk/* -%dir %{tde_datadir}/services -%dir %{tde_datadir}/servicetypes -%dir %{tde_datadir}/wallpapers - - -%dir %{_sysconfdir}/trinity -%dir %{_sysconfdir}/xdg/menus - -########## - -%prep - -%build - -%install -%__install -d -m 755 %{?buildroot}%{tde_prefix} - -%__install -d -m 755 %{?buildroot}%{tde_bindir} - -%__install -d -m 755 %{?buildroot}%{tde_datadir} -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications/tde -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/.hidden -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Applications -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Development -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Games -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Graphics -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Internet -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Multimedia -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Office -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings/WebBrowsing -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/System -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Toys -%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Utilities -%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps -%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/plugin -%__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart -%__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake -%__install -d -m 755 %{?buildroot}%{tde_datadir}/config -%__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/audio -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/fonts -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/image -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/inode -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/media -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/message -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/model -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/multipart -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/print -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/text -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/uri -%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/video -%__install -d -m 755 %{?buildroot}%{tde_datadir}/services -%__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes - -%__install -d -m 755 %{?buildroot}%{tde_datadir}/wallpapers - -# Create icons directories -%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons -for t in crystalsvg hicolor ; do - %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}" - %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable" - for i in {16,22,32,48,64,128} ; do - %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}" - done - - # Create subdirectories - for r in actions apps devices mimetypes places ; do - %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable/${r}" - for i in {16,22,32,48,64,128} ; do - %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}/${r}" - done - done -done - -%__install -d -m 755 %{?buildroot}%{tde_docdir} -%__install -d -m 755 %{?buildroot}%{tde_tdedocdir} -%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML -%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en -%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en/common - -%__install -d -m 755 %{?buildroot}%{tde_includedir} -%__install -d -m 755 %{?buildroot}%{tde_tdeincludedir} - -%__install -d -m 755 %{?buildroot}%{tde_libdir} -%__install -d -m 755 %{?buildroot}%{tde_libdir}/pkgconfig -%__install -d -m 755 %{?buildroot}%{tde_tdelibdir} - -%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor -%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32 -%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps - -%__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity -%__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus - -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/en_US -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/C -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ad -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ae -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/af -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ag -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ai -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/al -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/am -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/an -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ao -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ar -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/as -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/at -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/au -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/aw -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ax -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/az -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ba -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bb -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bd -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/be -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bf -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bh -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bi -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bj -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bo -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/br -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bs -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bt -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bw -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/by -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bz -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ca -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cc -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cd -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cf -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ch -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ci -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ck -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cl -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/co -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cu -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cv -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cx -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cy -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cz -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/de -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dj -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/do -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dz -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ec -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ee -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eh -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/er -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/es -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/et -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fi -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fj -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fo -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ga -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gb -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gd -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ge -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gh -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gi -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gl -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gp -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gq -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gt -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gu -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gw -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gy -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ht -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hu -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/id -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ie -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/il -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/in -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/iq -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ir -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/is -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/it -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jo -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jp -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ke -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kh -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ki -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/km -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kp -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kw -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ky -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kz -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/la -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lb -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lc -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/li -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ls -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lt -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lu -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lv -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ly -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ma -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mc -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/md -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/me -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mh -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ml -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mo -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mq -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ms -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mt -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mu -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mv -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mw -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mx -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/my -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mz -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/na -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nc -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ne -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nf -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ng -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ni -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nl -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/no -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/np -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nu -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nz -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/om -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pa -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pe -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pf -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ph -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pl -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ps -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pt -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pw -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/py -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/qa -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ro -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/rs -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ru -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/rw -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sa -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sb -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sc -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sd -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/se -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sh -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/si -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/so -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/st -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sv -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sy -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sz -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tc -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/td -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/th -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tj -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tk -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/to -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tp -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tr -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tt -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tv -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tw -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tz -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ua -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ug -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/us -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/uy -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/uz -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/va -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vc -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ve -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vg -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vi -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vn -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vu -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/wf -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ws -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ye -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/za -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/zm -%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/zw - -%post -%if 0%{?suse_version} -# Add setuid files in '/etc/permissions.local' -for b in kcheckpass kgrantpty kpac_dhcp_helper start_tdeinit tdmtsak tdekbdledsync ; do - if ! grep -q "^%{tde_bindir}/${b}" "/etc/permissions.local"; then - echo "%{tde_bindir}/${b} root:root 4711" >>/etc/permissions.local - fi -done -%endif - - -%changelog -* Mon Jun 03 2013 Francois Andriot - 14.0.0-1 -- Initial build for TDE R14 diff --git a/redhat/tdebase/plasma-desktop b/redhat/tdebase/plasma-desktop deleted file mode 100644 index 9e14070d8..000000000 --- a/redhat/tdebase/plasma-desktop +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# This stupid scripts prevent the launch of 'plasma-desktop' -# (from KDE4) alongside with TDE. - -case "${DESKTOP_SESSION}" in - "kde3"|"trinity"|"TDE") ;; - *) exec /usr/bin/plasma-desktop;; -esac diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 75a9683e4..c8e6f1a72 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -30,6 +30,10 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity +%define tdm tdm +%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 @@ -67,7 +71,7 @@ Source5: pamd.kscreensaver-trinity%{?dist} %endif # openSUSE: configuration file for TDM -Source6: suse-displaymanagers-tdm +Source6: suse-displaymanagers-tdm # Fedora 18: use SYSTEMD for TDM startup %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 @@ -425,9 +429,9 @@ BuildRequires: nas-devel BuildRequires: dbus-devel >= 0.22-12.EL.9p1 Requires: dbus-qt >= 0.22-12.EL.9p1 %else -BuildRequires: libdbus-tqt-1-devel >= 2:0.63 -BuildRequires: libdbus-1-tqt-devel >= 2:0.9 -Requires: libdbus-tqt-1-0 >= 2:0.63 +BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 +BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 +Requires: libdbus-tqt-1-0 >= %{tde_epoch}:0.63 %endif %if 0%{?fedora} >= 17 @@ -529,6 +533,7 @@ BuildRequires: bdftopcf BuildRequires: drakconf %endif +# LIBCONFIG support # Needed for "compton" stuff BuildRequires: libconfig-devel @@ -566,9 +571,7 @@ Requires: trinity-libkonq = %{version}-%{release} Requires: %{name}-libtqt3-integration = %{version}-%{release} Requires: %{name}-tdeio-smb-plugin = %{version}-%{release} -Requires: libtqt3-mt >= 3.5.0 -Requires: libtqt4 >= 2:4.2.0 -Requires: trinity-arts >= 2:1.5.10 +Requires: trinity-arts >= %{tde_epoch}:1.5.10 Requires: trinity-tdelibs >= %{tde_version} Requires: openssl @@ -606,8 +609,7 @@ web browser, X terminal emulator, and many other programs and components. Summary: %{summary} - Development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libtqt4-devel >= 2:4.2.0 -Requires: trinity-arts-devel >= 2:1.5.10 +Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 Requires: trinity-tdelibs-devel >= %{tde_version} Requires: %{name}-bin-devel = %{version}-%{release} @@ -976,8 +978,8 @@ plugdev group. %{tde_tdelibdir}/kcm_joystick.so %{tde_tdelibdir}/kcm_kded.la %{tde_tdelibdir}/kcm_kded.so -%{tde_tdelibdir}/kcm_tdm.la -%{tde_tdelibdir}/kcm_tdm.so +%{tde_tdelibdir}/kcm_%{tdm}.la +%{tde_tdelibdir}/kcm_%{tdm}.so %{tde_tdelibdir}/kcm_tdednssd.so %{tde_tdelibdir}/kcm_tdednssd.la %{tde_tdelibdir}/kcm_keys.la @@ -1084,7 +1086,7 @@ plugdev group. %{tde_tdeappdir}/kcmusb.desktop %{tde_tdeappdir}/kcmview1394.desktop %{tde_tdeappdir}/KControl.desktop -%{tde_tdeappdir}/tdm.desktop +%{tde_tdeappdir}/%{tdm}.desktop %{tde_tdeappdir}/keys.desktop %{tde_tdeappdir}/tdefontview.desktop %{tde_tdeappdir}/tdehtml_behavior.desktop @@ -1168,8 +1170,6 @@ plugdev group. %{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png %{tde_datadir}/icons/hicolor/*/apps/kcmsmserver.png %{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png -%{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png -%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png %{tde_datadir}/apps/usb.ids %{tde_datadir}/apps/kcmview1394/ @@ -1321,14 +1321,14 @@ TDE applications, particularly those in the TDE base module. # SETUID binaries # Some setuid binaries need special care %if 0%{?suse_version} -%if %{?with_tsak} -%verify(not mode) %{tde_bindir}/tdmtsak +%if 0%{?with_tsak} +%verify(not mode) %{tde_bindir}/%{tdm}tsak %endif %verify(not mode) %{tde_bindir}/kcheckpass %verify(not mode) %{tde_bindir}/tdekbdledsync %else -%if %{?with_tsak} -%attr(4511,root,root) %{tde_bindir}/tdmtsak +%if 0%{?with_tsak} +%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak %endif %attr(4755,root,root) %{tde_bindir}/kcheckpass %attr(4755,root,root) %{tde_bindir}/tdekbdledsync @@ -1437,7 +1437,7 @@ needed for a basic TDE desktop installation. %{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png %{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png %{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png -%{tde_datadir}/icons/crystalsvg/*/apps/tdmconfig.png +%{tde_datadir}/icons/crystalsvg/*/apps/%{tdm}config.png %{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png %{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png %{tde_datadir}/icons/crystalsvg/*/apps/tdescreensaver.png @@ -1682,6 +1682,9 @@ Group: Applications/Utilities Requires: trinity-kdesktop = %{version}-%{release} Requires: cyrus-sasl Requires: psmisc +%if 0%{?with_hal} +Requires: hal >= 0.5 +%endif %if 0%{?rhel} == 4 || 0%{?suse_version} Requires: cryptsetup %else @@ -2079,7 +2082,7 @@ Provides: service(graphical-login) # Required for Mandriva's installer %if 0%{?mgaversion} || 0%{?mdkversion} Provides: dm -Provides: tdm +Provides: %{tdm} %endif %description -n trinity-tdm @@ -2102,27 +2105,27 @@ already. Most users won't need this. %defattr(-,root,root,-) %{tde_tdelibdir}/kgreet_pam.la %{tde_tdelibdir}/kgreet_pam.so -%{tde_bindir}/gentdmconf -%{tde_bindir}/tdm -%{tde_bindir}/tdm_config -%{tde_bindir}/tdmctl -%{tde_bindir}/tdm_greet +%{tde_bindir}/gen%{tdm}conf +%{tde_bindir}/%{tdm} +%{tde_bindir}/%{tdm}_config +%{tde_bindir}/%{tdm}ctl +%{tde_bindir}/%{tdm}_greet %{tde_bindir}/krootimage -%dir %{tde_datadir}/apps/tdm -%dir %{tde_datadir}/apps/tdm/pics -%{tde_datadir}/apps/tdm/pics/kdelogo.png -%{tde_datadir}/apps/tdm/pics/shutdown.jpg -%{tde_datadir}/apps/tdm/pics/users -%dir %{tde_datadir}/apps/tdm/sessions -%{tde_datadir}/apps/tdm/sessions/*.desktop -%{tde_datadir}/apps/tdm/themes/ -%{tde_datadir}/config/tdm -%dir %{_sysconfdir}/trinity/tdm +%dir %{tdm_datadir} +%dir %{tdm_datadir}/pics +%{tdm_datadir}/pics/kdelogo.png +%{tdm_datadir}/pics/shutdown.jpg +%{tdm_datadir}/pics/users +%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 +%exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp %endif -%config(noreplace) %{_sysconfdir}/trinity/tdm/* -%{tde_tdedocdir}/HTML/en/tdm/ +%config(noreplace) %{_sysconfdir}/trinity/%{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 @@ -2158,7 +2161,7 @@ already. Most users won't need this. # SELINUX policy %if 0%{?with_selinux_policy} -%{?_sysconfdir}/trinity/tdm/tdm.pp +%{?_sysconfdir}/trinity/%{tdm}/tdm.pp %endif # Logrotate configuration @@ -2166,26 +2169,26 @@ already. Most users won't need this. %pre -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' -if [ -d "%{tde_datadir}/config/tdm" ] && [ ! -L "%{tde_datadir}/config/tdm" ]; then - if [ -d "%{_sysconfdir}/trinity/tdm" ]; then - # If 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" +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 + echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'" + rm -rf "%{tde_datadir}/config/%{tdm}" else # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm' if [ ! -d "%{_sysconfdir}/trinity" ]; then mkdir -p "%{_sysconfdir}/trinity" fi - echo "Migrating TDM configuration from '%{tde_datadir}/config/tdm' to '%{_sysconfdir}/trinity/tdm'" - mv -f "%{tde_datadir}/config/tdm" "%{_sysconfdir}/trinity/tdm.migr" + echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'" + mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr" fi fi # Remove actual directory before creating a symlink -if [ ! -L "%{tde_datadir}/apps/tdm/pics/users" ]; then +if [ ! -L "%{tdm_datadir}/pics/users" ]; then [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces" - cp -f "%{tde_datadir}/apps/tdm/pics/users/"* "%{_datadir}/faces" - rm -rf "%{tde_datadir}/apps/tdm/pics/users" + cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces" + rm -rf "%{tdm_datadir}/pics/users" fi %post -n trinity-tdm @@ -2193,19 +2196,19 @@ fi %make_session %endif %if 0%{?with_selinux_policy} -/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/tdm/tdm.pp" +/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" %endif # Sets default user icon in TDM -if [ ! -r "%{tde_datadir}/apps/tdm/faces/.default.face.icon" ]; then - [ -d "%{tde_datadir}/apps/tdm/faces" ] || mkdir -p "%{tde_datadir}/apps/tdm/faces" - %__cp -f "%{tde_datadir}/apps/tdm/pics/users/default2.png" "%{tde_datadir}/apps/tdm/faces/.default.face.icon" +if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then + [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces" + cp -f "%{tdm_datadir}/pics/users/default2.png" "%{tdm_datadir}/faces/.default.face.icon" fi # Sets default language for TDM if [ "$1" = "1" ]; then if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then - %__sed -i "%{_sysconfdir}/trinity/tdm/tdmrc" -e "s|^#*Language=.*|Language=${LANG}|" + sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|" fi fi @@ -2217,9 +2220,9 @@ fi %posttrans -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' -if [ -d "%{_sysconfdir}/trinity/tdm.migr" ] && [ -d "%{_sysconfdir}/trinity/tdm" ]; then - %__mv -f "%{_sysconfdir}/trinity/tdm.migr/"* "%{_sysconfdir}/trinity/tdm/" - rmdir "%{_sysconfdir}/trinity/tdm.migr/" +if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then + mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/" + rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/" fi %postun -n trinity-tdm @@ -2949,7 +2952,7 @@ TDE will start, but many good defaults will not be set. %files -n trinity-ksmserver %defattr(-,root,root,-) %{tde_bindir}/ksmserver -%{tde_bindir}/starttde +%{tde_bindir}/%{starttde} %{tde_bindir}/migratekde3 %{tde_bindir}/r14-xdg-update %{tde_bindir}/tdeinit_displayconfig @@ -3374,28 +3377,28 @@ Windows and Samba shares. # Applies an optional distro-specific graphical theme %if "%{?tde_bg}" != "" # TDM Background -%__sed -i "tdm/kfrontend/gentdmconf.c" \ +%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \ -e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|' # TDE user default background %__sed -i "kpersonalizer/keyecandypage.cpp" \ -e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|' -%__sed -i "starttde" \ +%__sed -i "%{starttde}" \ -e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \ -e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|' %endif # TDE default directory and icon in startup script -%__sed -i "starttde" \ +%__sed -i "%{starttde}" \ -e "s|/opt/trinity|%{tde_prefix}|g" \ -e "s|%%{tde_starticon}|%{tde_starticon}|g" # Xsession script location may vary on some distro %if 0%{?rhel} || 0%{?fedora} -%__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|" +%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|" %endif %if 0%{?suse_version} -%__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" +%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" %endif # Reboot command location may vary on some distributions @@ -3405,9 +3408,9 @@ if [ -x "/usr/bin/reboot" ]; then fi if [ -n "${REBOOT}" ]; then %__sed -i \ - "doc/tdm/tdmrc-ref.docbook" \ - "kcontrol/tdm/tdm-shut.cpp" \ - "tdm/config.def" \ + "doc/%{tdm}/%{tdm}rc-ref.docbook" \ + "kcontrol/%{tdm}/%{tdm}-shut.cpp" \ + "%{tdm}/config.def" \ -e "s|/sbin/poweroff|${POWEROFF}|g" \ -e "s|/sbin/reboot|${REBOOT}|g" fi @@ -3530,21 +3533,21 @@ fi # Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'. %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %__install -D -m 644 \ - "%{?buildroot}%{tde_datadir}/apps/tdm/sessions/tde.desktop" \ + "%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \ "%{?buildroot}%{_datadir}/xsessions/tde.desktop" %endif # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora -# Generated files for TDM go to '/usr/share/xsessions' +# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions' %if 0%{?mgaversion} || 0%{?mdkversion} %__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d cat <"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE" NAME=TDE ICON=kde-wmsession.xpm DESC=The Trinity Desktop Environment -EXEC=%{tde_bindir}/starttde +EXEC=%{tde_bindir}/%{starttde} SCRIPT: -exec %{tde_bindir}/starttde +exec %{tde_bindir}/%{starttde} EOF %__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d @@ -3552,7 +3555,7 @@ cat <"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf" NAME=TDM DESCRIPTION=TDM (Trinity Display Manager) PACKAGE=trinity-tdm -EXEC=%{tde_bindir}/tdm +EXEC=%{tde_bindir}/%{tdm} %if 0%{?pclinuxos} FNDSESSION_EXEC="/usr/sbin/chksession -k" %else @@ -3570,7 +3573,7 @@ EOF %endif # TDM configuration -%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \ +%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \ %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else @@ -3604,11 +3607,11 @@ EOF # Symlink TDM configuration %__mkdir_p "%{?buildroot}%{tde_datadir}/config" -%__ln_s "%{_sysconfdir}/trinity/tdm" "%{?buildroot}%{tde_datadir}/config/tdm" +%__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" +%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" %endif # Mageia icon for TDE menu @@ -3646,10 +3649,10 @@ EOF # Move faces icon to XDG directory '/usr/share/faces' if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then %__mkdir_p "%{?buildroot}%{_datadir}/faces" - %__mv -f "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"* "%{?buildroot}%{_datadir}/faces" - rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users" + %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces" + rmdir "%{?buildroot}%{tdm_datadir}/pics/users" fi -%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users" +%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users" # Adds missing icons in 'hicolor' theme # These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'. @@ -3720,8 +3723,8 @@ for i in ksysguard tde-kcontrol tdefontview showdesktop; do done # Remove setuid bit on some binaries. -%if %{?with_tsak} -chmod 0511 "%{?buildroot}%{tde_bindir}/tdmtsak" +%if 0%{?with_tsak} +chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak" %endif chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass" chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync" @@ -3735,8 +3738,8 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync" %if 0%{?suse_version} # Check permissions on setuid files (openSUSE specific) %verifyscript -%if %{?with_tsak} -%verify_permissions -e %{tde_bindir}/tdmtsak +%if 0%{?with_tsak} +%verify_permissions -e %{tde_bindir}/%{tdm}tsak %endif %verify_permissions -e %{tde_bindir}/kcheckpass %verify_permissions -e %{tde_bindir}/tdekbdledsync diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index e72e3d519..2adff45a0 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -81,7 +81,7 @@ BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 BuildRequires: trinity-filesystem >= %{tde_version} -Requires: trinity-arts >= 2:1.5.10 +Requires: trinity-arts >= %{tde_epoch}:1.5.10 Requires: trinity-filesystem >= %{tde_version} Requires: fileshareset >= 2.0 @@ -511,7 +511,7 @@ Provides: trinity-kdelibs-devel = %{version}-%{release} Requires: libtqt3-mt-devel >= 3.5.0 Requires: libtqt4-devel = 2:4.2.0 Requires: trinity-arts-devel >= 2:1.5.10 -Requires: libart_lgpl-devel >= 2.3.22 +Requires: libart_lgpl-devel %{?xcomposite_devel:Requires: %{xcomposite_devel}} %{?xt_devel:Requires: %{xt_devel}} diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index 9936c4ce6..73983a076 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -1170,12 +1170,6 @@ noatun plugins. ########## -# FIXME 2014/03/15: FTBFS on PCLINUXOS ... Need to remove -fstack-protector -%if 0%{?pclinuxos} -%define _ssp_cflags -fno-stack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags} -%endif - - %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -- cgit v1.2.1