Conflicts:
	redhat/tdebase/tdebase-14.0.0.spec
	redhat/tdelibs/tdelibs-14.0.0.spec
pull/3/head
François Andriot 12 years ago
commit c7debbe08c

1
debian/jessie vendored

@ -0,0 +1 @@
wheezy

@ -8,7 +8,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-bonding-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, tde-ldap-cert-updater
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
Description: Kerberos control module for the TDE control center
This is a TDE control center module to manage TDE connections to Kerberos realms.

@ -7,7 +7,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-controller-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp
Conflicts: tde-ldap-cert-updater
Description: Kerberos realm controller module for the TDE control center
This is a TDE control center module to configure a Kerberos Realm Controller

@ -8,7 +8,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-bonding-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, tde-ldap-cert-updater
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
Description: Kerberos control module for the TDE control center
This is a TDE control center module to manage TDE connections to Kerberos realms.

@ -7,7 +7,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-controller-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp
Conflicts: tde-ldap-cert-updater
Description: Kerberos realm controller module for the TDE control center
This is a TDE control center module to configure a Kerberos Realm Controller

@ -8,7 +8,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-bonding-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, tde-ldap-cert-updater
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
Description: Kerberos control module for the TDE control center
This is a TDE control center module to manage TDE connections to Kerberos realms.

@ -7,7 +7,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-controller-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp
Conflicts: tde-ldap-cert-updater
Description: Kerberos realm controller module for the TDE control center
This is a TDE control center module to configure a Kerberos Realm Controller

@ -0,0 +1,10 @@
Note on 2013/07/17 :
The current TDE packages are built as follow:
For 3.5.13.x:
1) build "dependencies/qt3" from "mageia" directory
2) build all other packages from "redhat" directory
For R14 and later:
1) build all packages from "redhat" directory

@ -0,0 +1,13 @@
Note on 2013/07/17 :
The stuff in this directory is obsolete.
It looks like it was an attempt to build TDE 3.5.12 on Mandriva 2010.2 .
The current TDE packages are built as follow:
For 3.5.13.x:
1) build "dependencies/qt3" from "mageia" directory
2) build all other packages from "redhat" directory
For R14 and later:
1) build all packages from "redhat" directory

@ -127,4 +127,4 @@ cd build
%changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
- Initial build for TDE 14.0.0

@ -3,6 +3,8 @@
%define _variant .opt
%endif
%define tde_version 14.0.0
%define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
@ -14,7 +16,7 @@
Name: trinity-libart-lgpl
Version: 14.0.0
Version: 2.3.22
Release: 1%{?dist}%{?_variant}
Summary: Library of functions for 2D graphics - runtime files
@ -29,10 +31,10 @@ 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
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
%description
A library of functions for 2D graphics supporting a superset of the
@ -134,7 +136,7 @@ especially suitable for embedded applications.
##########
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
@ -174,5 +176,5 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
- Initial build for TDE 3.5.13.2
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3.22-1
- Initial build for TDE 14.0.0

@ -16,7 +16,7 @@
Name: trinity-tqca-tls
Version: 1.0
Release: 2%{?dist}%{?_variant}
Release: 3%{?dist}%{?_variant}
Summary: TLS plugin for the TQt Cryptographic Architecture
License: LGPLv2+
@ -30,7 +30,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqt3-devel >= %{tde_version}
BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-tqca-devel >= 1.0
BuildRequires: openssl-devel >= 0.9.8
@ -80,8 +80,5 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%{_libdir}/tqt3/plugins/crypto/libqca-tls.so
%changelog
* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
- Initial build for TDE 14.0.0
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
- Initial build for TDE 3.5.13.2

@ -17,7 +17,7 @@
Name: trinity-tqca
Version: 1.0
Release: 2%{?dist}%{?_variant}
Release: 3%{?dist}%{?_variant}
Summary: TQt Cryptographic Architecture
@ -33,7 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqt3-devel >= %{tde_version}
BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@ -119,5 +119,5 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
- Initial build for TDE 3.5.13.2
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
- Initial build for TDE 14.0.0

@ -49,6 +49,16 @@ BuildRequires: cups-devel
BuildRequires: tar
BuildRequires: freetype-devel
BuildRequires: fontconfig-devel
BuildRequires: gcc-c++
BuildRequires: libuuid-devel
BuildRequires: glib2-devel
BuildRequires: make
# NAS support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_nas 1
BuildRequires: nas-devel
%endif
# Xrender support
%if 0%{?rhel} || 0%{?fedora}
@ -219,8 +229,8 @@ applications, as well as the README files for TQt 3.
%{tde_libdir}/tqt3/plugins/inputmethods/libqsimple.so
%{tde_libdir}/tqt3/plugins/inputmethods/libqxim.so
%{tde_libdir}/libtqt-mt.so.3
%{tde_libdir}/libtqt-mt.so.3.3
%{tde_libdir}/libtqt-mt.so.3.3.8
%{tde_libdir}/libtqt-mt.so.3.5
%{tde_libdir}/libtqt-mt.so.3.5.0
%{tde_libdir}/libtqt-mt.la
%{tde_libdir}/libtqui.so.1
%{tde_libdir}/libtqui.so.1.0
@ -238,7 +248,7 @@ applications, as well as the README files for TQt 3.
##########
%package config
Summary: Graphical configuration tool for programs using Qt 3
Summary: Graphical configuration tool for programs using TQt 3
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
@ -258,7 +268,7 @@ This package contains a graphical configuration tool for programs using TQt 3.
##########
%package devel
Summary: Development files for the Qt 3 GUI toolkit
Summary: Development files for the TQt 3 GUI toolkit
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
@ -387,7 +397,7 @@ sqlite driver for TQt 3's SQL classes (QSQL)
##########
%if %{?with_ibase}
%if 0%{?with_ibase}
%package ibase
Summary: ibase drivers for TQt 3's SQL classes
Group: System Environment/Libraries
@ -404,7 +414,7 @@ ibase driver for TQt 3's SQL classes (QSQL)
##########
%package designer
Summary: In3erface designer (IDE) for the Qt 3 toolkit
Summary: In3erface designer (IDE) for the TQt 3 toolkit
Group: Development/Tools
Requires: %{name}-devel = %{version}-%{release}
@ -435,13 +445,13 @@ export LD_LIBRARY_PATH=${QTDIR}/lib:$LD_LIBRARY_PATH
# Checks for supplementary include dir
INCDIRS=""
for d in \
/usr/include/fontconfig \
/usr/include/pgsql/server \
/usr/include/postgresql/server \
/usr/include/Xft2 \
/usr/include/Xft2/X11/Xft \
/usr/include/mysql \
/usr/include/libpng15 \
%{_includedir}/fontconfig \
%{_includedir}/pgsql/server \
%{_includedir}/postgresql/server \
%{_includedir}/Xft2 \
%{_includedir}/Xft2/X11/Xft \
%{_includedir}/mysql \
%{_includedir}/libpng15 \
; do
if [ -d "${d}" ]; then
INCDIRS="${INCDIRS} -I${d}"
@ -503,7 +513,7 @@ echo yes | ./configure \
-system-libpng \
-system-libmng \
-system-libjpeg \
-system-nas-sound \
%{?with_nas:-system-nas-sound} %{?!with_nas:-no-nas-sound} \
\
-enable-opengl \
-dlopen-opengl \
@ -544,7 +554,7 @@ ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h
# fix QTDIR in 'qmake.conf'
%__sed -i mkspecs/*/qmake.conf \
-e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = \$(QTDIR)/include/tqt3|" \
-e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \
-e "s|\$(QTDIR)|/usr|g" \
-e "s|-lqt|-ltqt|g"
@ -574,5 +584,5 @@ export PATH=${QTDIR}/stripbin:${QTDIR}/bin:$PATH
%changelog
* Mon Feb 13 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.0-1
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.0-1
- Initial build for TDE R14.0.0

@ -170,5 +170,5 @@ done
%changelog
* Tue Feb 14 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial build for TDE 14.0.0

@ -7,10 +7,15 @@ tdm_start_proc() {
}
tdm_vars() {
if [ -x /opt/trinity/bin/kdm ]; then
TDM_BIN=/opt/trinity/bin/kdm
export KDEROOTHOME=/root/.tdm
else
TDM_BIN=/opt/trinity/bin/tdm
export TDEROOTHOME=/root/.tdm
fi
case "${DISPLAYMANAGER##*/}" in
tdm)
export KDEROOTHOME=/root/.kdm
DISPLAYMANAGER=$TDM_BIN
STARTPROC=tdm_start_proc
;;

@ -0,0 +1,60 @@
--- trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/background/CMakeLists.txt.ORI 2013-07-17 15:07:53.620475336 +0200
+++ trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/background/CMakeLists.txt 2013-07-17 15:08:37.773235444 +0200
@@ -23,6 +23,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${LIBART_LIBRARY_DIRS}
)
##### bgnd (static) #############################
--- trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/kicker/CMakeLists.txt.ftbfs 2013-07-17 15:10:49.001523716 +0200
+++ trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/kicker/CMakeLists.txt 2013-07-17 15:11:58.278148735 +0200
@@ -22,6 +22,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${LIBART_LIBRARY_DIRS}
)
##### other data ################################
--- trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/tdm/CMakeLists.txt.ftbfs 2013-07-17 15:14:35.389300184 +0200
+++ trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/tdm/CMakeLists.txt 2013-07-17 15:14:41.479267342 +0200
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${LIBART_LIBRARY_DIRS}
)
##### other data ################################
--- trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/icons/CMakeLists.txt.ftbfs 2013-07-17 15:16:26.158703430 +0200
+++ trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/icons/CMakeLists.txt 2013-07-17 15:16:31.722673486 +0200
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${LIBART_LIBRARY_DIRS}
)
##### other data ################################
--- trinity-tdebase-14.0.0~pre738+d41051b3/tdm/kfrontend/CMakeLists.txt.ftbfs 2013-07-17 15:22:20.506802399 +0200
+++ trinity-tdebase-14.0.0~pre738+d41051b3/tdm/kfrontend/CMakeLists.txt 2013-07-17 15:22:27.893762894 +0200
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${LIBART_LIBRARY_DIRS}
)
--- trinity-tdebase-14.0.0~pre738+d41051b3/kdesktop/CMakeLists.txt.ftbfs 2013-07-17 15:26:02.711616155 +0200
+++ trinity-tdebase-14.0.0~pre738+d41051b3/kdesktop/CMakeLists.txt 2013-07-17 15:26:08.085587520 +0200
@@ -36,6 +36,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${LIBART_LIBRARY_DIRS}
)

@ -3,7 +3,9 @@
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_version 14.0.0
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@ -41,9 +43,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
# Wrapper script to prevent Plasma launch at Trinity Startup
Source1: plasma-desktop
Patch0: tdebase-14.0.0-ftbfs.patch
# Pam configuration files for RHEL / Fedora
%if 0%{?suse_version} == 0
@ -270,9 +270,9 @@ Requires: opensuse-manuals_en
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: openssl-devel
@ -385,8 +385,8 @@ BuildRequires: nas-devel
BuildRequires: dbus-devel >= 0.22-12.EL.9p1
Requires: dbus-qt >= 0.22-12.EL.9p1
%else
BuildRequires: trinity-dbus-tqt-devel >= %{version}
Requires: trinity-dbus-tqt >= %{version}
BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
Requires: trinity-dbus-tqt >= %{tde_version}
%endif
%if 0%{?fedora} >= 17
@ -401,16 +401,9 @@ BuildRequires: %{_lib}jack-devel
BuildRequires: jack-audio-connection-kit-devel
%endif
# LIBART support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 5
# LIBART_LGPL support
%define with_libart 1
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}art_lgpl-devel
%endif
%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
BuildRequires: libart_lgpl-devel
%endif
%endif
BuildRequires: trinity-libart-lgpl-devel
# SAMBA support
%if 0%{?rhel} == 4
@ -504,9 +497,9 @@ Requires: trinity-libkonq = %{version}-%{release}
Requires: %{name}-libtqt3-integration = %{version}-%{release}
Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
Requires: trinity-tqtinterface >= %{version}
Requires: trinity-arts >= %{version}
Requires: trinity-tdelibs >= %{version}
Requires: trinity-tqtinterface >= %{tde_version}
Requires: trinity-arts >= %{tde_version}
Requires: trinity-tdelibs >= %{tde_version}
Requires: trinity-tqt3 >= 3.5.0
Requires: openssl
@ -743,8 +736,8 @@ Some random features:
%{tde_tdelibdir}/kate.la
%{tde_tdelibdir}/kate.so
%{tde_libdir}/libkateutils.so.*
%{tde_libdir}/lib[kt]deinit_kate.la
%{tde_libdir}/lib[kt]deinit_kate.so
%{tde_libdir}/libtdeinit_kate.la
%{tde_libdir}/libtdeinit_kate.so
%{tde_tdeappdir}/kate.desktop
%{tde_datadir}/apps/kate/
%{tde_datadir}/apps/tdeconf_update/kate-2.4.upd
@ -810,8 +803,8 @@ Kwrite is a text editor for TDE.
%{tde_bindir}/kwrite
%{tde_tdelibdir}/kwrite.la
%{tde_tdelibdir}/kwrite.so
%{tde_libdir}/lib[kt]deinit_kwrite.la
%{tde_libdir}/lib[kt]deinit_kwrite.so
%{tde_libdir}/libtdeinit_kwrite.la
%{tde_libdir}/libtdeinit_kwrite.so
%{tde_tdeappdir}/kwrite.desktop
%{tde_datadir}/apps/kwrite/kwriteui.rc
%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
@ -915,8 +908,8 @@ plugdev group.
%{tde_tdelibdir}/kcm_joystick.so
%{tde_tdelibdir}/kcm_kded.la
%{tde_tdelibdir}/kcm_kded.so
%{tde_tdelibdir}/kcm_[kt]dm.la
%{tde_tdelibdir}/kcm_[kt]dm.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
@ -979,10 +972,10 @@ plugdev group.
%{tde_tdelibdir}/libkurisearchfilter.so
%{tde_tdelibdir}/liblocaldomainurifilter.la
%{tde_tdelibdir}/liblocaldomainurifilter.so
%{tde_libdir}/lib[kt]deinit_kaccess.la
%{tde_libdir}/lib[kt]deinit_kaccess.so
%{tde_libdir}/lib[kt]deinit_kcontrol.la
%{tde_libdir}/lib[kt]deinit_kcontrol.so
%{tde_libdir}/libtdeinit_kaccess.la
%{tde_libdir}/libtdeinit_kaccess.so
%{tde_libdir}/libtdeinit_kcontrol.la
%{tde_libdir}/libtdeinit_kcontrol.so
%{tde_libdir}/libtdefontinst.so.*
%{tde_tdeappdir}/arts.desktop
%{tde_tdeappdir}/background.desktop
@ -1024,7 +1017,7 @@ plugdev group.
%{tde_tdeappdir}/kcmusb.desktop
%{tde_tdeappdir}/kcmview1394.desktop
%{tde_tdeappdir}/KControl.desktop
%{tde_tdeappdir}/[kt]dm.desktop
%{tde_tdeappdir}/tdm.desktop
%{tde_tdeappdir}/keys.desktop
%{tde_tdeappdir}/tdefontview.desktop
%{tde_tdeappdir}/tdehtml_behavior.desktop
@ -1155,7 +1148,7 @@ TDE applications, particularly those in the TDE base module.
%{tde_bindir}/krootbacking
#%{tde_bindir}/tdeinit_phase1
%if 0%{?with_tsak}
%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
%attr(4511,root,root) %{tde_bindir}/tdmtsak
%{tde_bindir}/tsak
%endif
%{tde_bindir}/kdebugdialog
@ -1171,8 +1164,8 @@ TDE applications, particularly those in the TDE base module.
%{tde_bindir}/kcminit
%{tde_bindir}/kcminit_startup
%{tde_bindir}/kdcop
%{tde_bindir}/[kt]desu
%attr(0755,root,root) %{tde_bindir}/[kt]desud
%{tde_bindir}/tdesu
%attr(0755,root,root) %{tde_bindir}/tdesud
%{tde_bindir}/kdialog
%{tde_bindir}/khotkeys
%{tde_bindir}/knetattach
@ -1202,14 +1195,14 @@ TDE applications, particularly those in the TDE base module.
%{tde_tdelibdir}/khotkeys_arts.so
%{tde_tdelibdir}/kxkb.la
%{tde_tdelibdir}/kxkb.so
%{tde_libdir}/lib[kt]deinit_kcminit.la
%{tde_libdir}/lib[kt]deinit_kcminit.so
%{tde_libdir}/lib[kt]deinit_kcminit_startup.la
%{tde_libdir}/lib[kt]deinit_kcminit_startup.so
%{tde_libdir}/lib[kt]deinit_khotkeys.la
%{tde_libdir}/lib[kt]deinit_khotkeys.so
%{tde_libdir}/lib[kt]deinit_kxkb.la
%{tde_libdir}/lib[kt]deinit_kxkb.so
%{tde_libdir}/libtdeinit_kcminit.la
%{tde_libdir}/libtdeinit_kcminit.so
%{tde_libdir}/libtdeinit_kcminit_startup.la
%{tde_libdir}/libtdeinit_kcminit_startup.so
%{tde_libdir}/libtdeinit_khotkeys.la
%{tde_libdir}/libtdeinit_khotkeys.so
%{tde_libdir}/libtdeinit_kxkb.la
%{tde_libdir}/libtdeinit_kxkb.so
%{tde_libdir}/libkhotkeys_shared.so.*
%{tde_tdeappdir}/keyboard.desktop
%{tde_tdeappdir}/keyboard_layout.desktop
@ -1230,7 +1223,7 @@ TDE applications, particularly those in the TDE base module.
%endif
%{tde_tdedocdir}/HTML/en/kdcop/
%{tde_tdedocdir}/HTML/en/kdebugdialog//
%{tde_tdedocdir}/HTML/en/[kt]desu/
%{tde_tdedocdir}/HTML/en/tdesu/
%{tde_tdedocdir}/HTML/en/knetattach/
%{tde_tdedocdir}/HTML/en/kxkb/
@ -1338,7 +1331,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/[kt]dmconfig.png
%{tde_datadir}/icons/crystalsvg/*/apps/tdmconfig.png
%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
%{tde_datadir}/icons/crystalsvg/*/apps/tdescreensaver.png
@ -1537,18 +1530,11 @@ needed for a basic TDE desktop installation.
%exclude %{tde_datadir}/sounds/pop.wav
%{tde_datadir}/sounds/
%{tde_datadir}/wallpapers/*
%if "%{tde_prefix}" != "/usr"
%{tde_prefix}/etc/xdg/menus/applications-merged/tde-essential.menu
%{tde_prefix}/etc/xdg/menus/tde-information.menu
%{tde_prefix}/etc/xdg/menus/tde-screensavers.menu
%{tde_prefix}/etc/xdg/menus/tde-settings.menu
%else
# XDG directories information
%{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
%{_sysconfdir}/xdg/menus/tde-information.menu
%{_sysconfdir}/xdg/menus/tde-screensavers.menu
%{_sysconfdir}/xdg/menus/tde-settings.menu
%endif
%{tde_tdedocdir}/HTML/en/kcontrol/
%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
@ -1773,11 +1759,11 @@ system passwords.
%{tde_tdelibdir}/kcm_useraccount.so
%{tde_tdeappdir}/kcm_useraccount.desktop
%{tde_tdeappdir}/kdepasswd.desktop
%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default1.png
%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default2.png
%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default3.png
%exclude %{tde_datadir}/apps/[kt]dm/pics/users/root1.png
%{tde_datadir}/apps/[kt]dm/pics/users/*.png
%exclude %{tde_datadir}/apps/tdm/pics/users/default1.png
%exclude %{tde_datadir}/apps/tdm/pics/users/default2.png
%exclude %{tde_datadir}/apps/tdm/pics/users/default3.png
%exclude %{tde_datadir}/apps/tdm/pics/users/root1.png
%{tde_datadir}/apps/tdm/pics/users/*.png
%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
@ -1804,7 +1790,7 @@ Installation of smbclient will make you able to use smb shared printers.
%files -n trinity-tdeprint
%defattr(-,root,root,-)
%{tde_bindir}/[kt]deprintfax
%{tde_bindir}/tdeprintfax
%{tde_bindir}/kjobviewer
%{tde_bindir}/kprinter
%{tde_tdelibdir}/kcm_printmgr.la
@ -1815,19 +1801,19 @@ Installation of smbclient will make you able to use smb shared printers.
%{tde_tdelibdir}/kjobviewer.so
%{tde_tdelibdir}/kprinter.la
%{tde_tdelibdir}/kprinter.so
%{tde_tdelibdir}/lib[kt]deprint_part.la
%{tde_tdelibdir}/lib[kt]deprint_part.so
%{tde_libdir}/lib[kt]deinit_kjobviewer.la
%{tde_libdir}/lib[kt]deinit_kjobviewer.so
%{tde_libdir}/lib[kt]deinit_kprinter.la
%{tde_libdir}/lib[kt]deinit_kprinter.so
%{tde_tdeappdir}/[kt]deprintfax.desktop
%{tde_tdeappdir}/[kt]jobviewer.desktop
%{tde_tdelibdir}/libtdeprint_part.la
%{tde_tdelibdir}/libtdeprint_part.so
%{tde_libdir}/libtdeinit_kjobviewer.la
%{tde_libdir}/libtdeinit_kjobviewer.so
%{tde_libdir}/libtdeinit_kprinter.la
%{tde_libdir}/libtdeinit_kprinter.so
%{tde_tdeappdir}/tdeprintfax.desktop
%{tde_tdeappdir}/kjobviewer.desktop
%{tde_tdeappdir}/printers.desktop
%{tde_datadir}/apps/[kt]deprint/
%{tde_datadir}/apps/[kt]deprintfax/
%{tde_datadir}/apps/[kt]jobviewer/
%{tde_datadir}/apps/[kt]deprint_part/tdeprint_part.rc
%{tde_datadir}/apps/tdeprint/
%{tde_datadir}/apps/tdeprintfax/
%{tde_datadir}/apps/kjobviewer/
%{tde_datadir}/apps/tdeprint_part/tdeprint_part.rc
%{tde_datadir}/icons/hicolor/*/apps/tdeprintfax.png
%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
@ -1844,7 +1830,7 @@ Installation of smbclient will make you able to use smb shared printers.
%{tde_datadir}/services/tdeprint_part.desktop
%{tde_datadir}/services/print.protocol
%{tde_datadir}/services/printdb.protocol
%{tde_tdedocdir}/HTML/en/[kt]deprint/
%{tde_tdedocdir}/HTML/en/tdeprint/
%post -n trinity-tdeprint
/sbin/ldconfig || :
@ -1891,8 +1877,8 @@ the TDE desktop.
%{tde_bindir}/kwebdesktop
%{tde_tdelibdir}/kdesktop.la
%{tde_tdelibdir}/kdesktop.so
%{tde_libdir}/lib[kt]deinit_kdesktop.la
%{tde_libdir}/lib[kt]deinit_kdesktop.so
%{tde_libdir}/libtdeinit_kdesktop.la
%{tde_libdir}/libtdeinit_kdesktop.so
%{tde_datadir}/apps/kdesktop/
%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
%{tde_datadir}/autostart/kdesktop.desktop
@ -1983,23 +1969,23 @@ already. Most users won't need this.
%defattr(-,root,root,-)
%{tde_tdelibdir}/kgreet_pam.la
%{tde_tdelibdir}/kgreet_pam.so
%{tde_bindir}/gen[kt]dmconf
%{tde_bindir}/[kt]dm
%{tde_bindir}/[kt]dm_config
%{tde_bindir}/[kt]dmctl
%{tde_bindir}/[kt]dm_greet
%{tde_bindir}/gentdmconf
%{tde_bindir}/tdm
%{tde_bindir}/tdm_config
%{tde_bindir}/tdmctl
%{tde_bindir}/tdm_greet
%{tde_bindir}/krootimage
%{tde_datadir}/apps/[kt]dm/pics/kdelogo.png
%{tde_datadir}/apps/[kt]dm/pics/shutdown.jpg
%{tde_datadir}/apps/[kt]dm/pics/users/default1.png
%{tde_datadir}/apps/[kt]dm/pics/users/default2.png
%{tde_datadir}/apps/[kt]dm/pics/users/default3.png
%{tde_datadir}/apps/[kt]dm/pics/users/root1.png
%{tde_datadir}/apps/[kt]dm/sessions/*.desktop
%{tde_datadir}/apps/[kt]dm/themes/
%{tde_datadir}/apps/tdm/pics/kdelogo.png
%{tde_datadir}/apps/tdm/pics/shutdown.jpg
%{tde_datadir}/apps/tdm/pics/users/default1.png
%{tde_datadir}/apps/tdm/pics/users/default2.png
%{tde_datadir}/apps/tdm/pics/users/default3.png
%{tde_datadir}/apps/tdm/pics/users/root1.png
%{tde_datadir}/apps/tdm/sessions/*.desktop
%{tde_datadir}/apps/tdm/themes/
%{tde_datadir}/config/tdm
%{_sysconfdir}/trinity/[kt]dm/
%{tde_tdedocdir}/HTML/en/[kt]dm/
%{_sysconfdir}/trinity/tdm/
%{tde_tdedocdir}/HTML/en/tdm/
%if 0%{?suse_version} == 0
%{_sysconfdir}/pam.d/tdm-trinity
%{_sysconfdir}/pam.d/tdm-trinity-np
@ -2146,8 +2132,8 @@ documentation.
%{tde_bindir}/khelpcenter
%{tde_tdelibdir}/khelpcenter.la
%{tde_tdelibdir}/khelpcenter.so
%{tde_libdir}/lib[kt]deinit_khelpcenter.la
%{tde_libdir}/lib[kt]deinit_khelpcenter.so
%{tde_libdir}/libtdeinit_khelpcenter.la
%{tde_libdir}/libtdeinit_khelpcenter.so
%{tde_tdeappdir}/Help.desktop
%{tde_datadir}/apps/khelpcenter/
%{tde_datadir}/config.kcfg/khelpcenter.kcfg
@ -2205,8 +2191,8 @@ functionality.
%{tde_tdelibdir}/kickermenu_find.so
%{tde_tdelibdir}/kickermenu_kate.so
%{tde_tdelibdir}/kickermenu_kate.la
%{tde_tdelibdir}/kickermenu_[kt]deprint.la
%{tde_tdelibdir}/kickermenu_[kt]deprint.so
%{tde_tdelibdir}/kickermenu_tdeprint.la
%{tde_tdelibdir}/kickermenu_tdeprint.so
%{tde_tdelibdir}/kickermenu_konqueror.la
%{tde_tdelibdir}/kickermenu_konqueror.so
%{tde_tdelibdir}/kickermenu_konsole.la
@ -2245,12 +2231,12 @@ functionality.
%{tde_tdelibdir}/trash_panelapplet.la
%{tde_tdelibdir}/trash_panelapplet.so
%{tde_libdir}/libkasbar.so.*
%{tde_libdir}/lib[kt]deinit_appletproxy.la
%{tde_libdir}/lib[kt]deinit_appletproxy.so
%{tde_libdir}/lib[kt]deinit_extensionproxy.la
%{tde_libdir}/lib[kt]deinit_extensionproxy.so
%{tde_libdir}/lib[kt]deinit_kicker.la
%{tde_libdir}/lib[kt]deinit_kicker.so
%{tde_libdir}/libtdeinit_appletproxy.la
%{tde_libdir}/libtdeinit_appletproxy.so
%{tde_libdir}/libtdeinit_extensionproxy.la
%{tde_libdir}/libtdeinit_extensionproxy.so
%{tde_libdir}/libtdeinit_kicker.la
%{tde_libdir}/libtdeinit_kicker.so
%{tde_libdir}/libkickermain.so.*
%{tde_libdir}/libtaskbar.so.*
%{tde_libdir}/libtaskmanager.so.*
@ -2358,8 +2344,8 @@ web browser if the clipboard contains a URL.
%{tde_tdelibdir}/klipper.so
%{tde_tdelibdir}/klipper_panelapplet.la
%{tde_tdelibdir}/klipper_panelapplet.so
%{tde_libdir}/lib[kt]deinit_klipper.la
%{tde_libdir}/lib[kt]deinit_klipper.so
%{tde_libdir}/libtdeinit_klipper.la
%{tde_libdir}/libtdeinit_klipper.so
%{tde_tdeappdir}/klipper.desktop
%{tde_datadir}/apps/tdeconf_update/klipper-1-2.pl
%{tde_datadir}/apps/tdeconf_update/klipper-trinity1.sh
@ -2405,10 +2391,10 @@ structure.
%{tde_tdelibdir}/kcontroledit.so
%{tde_tdelibdir}/kmenuedit.la
%{tde_tdelibdir}/kmenuedit.so
%{tde_libdir}/lib[kt]deinit_kcontroledit.la
%{tde_libdir}/lib[kt]deinit_kcontroledit.so
%{tde_libdir}/lib[kt]deinit_kmenuedit.la
%{tde_libdir}/lib[kt]deinit_kmenuedit.so
%{tde_libdir}/libtdeinit_kcontroledit.la
%{tde_libdir}/libtdeinit_kcontroledit.so
%{tde_libdir}/libtdeinit_kmenuedit.la
%{tde_libdir}/libtdeinit_kmenuedit.so
%{tde_tdeappdir}/kmenuedit.desktop
%{tde_datadir}/applnk/System/kmenuedit.desktop
%{tde_datadir}/apps/kcontroledit/
@ -2495,12 +2481,12 @@ ever launching another application.
%{tde_tdelibdir}/konqueror.so
%{tde_tdelibdir}/libtdehtmlkttsdplugin.la
%{tde_tdelibdir}/libtdehtmlkttsdplugin.so
%{tde_libdir}/lib[kt]deinit_keditbookmarks.la
%{tde_libdir}/lib[kt]deinit_keditbookmarks.so
%{tde_libdir}/lib[kt]deinit_kfmclient.la
%{tde_libdir}/lib[kt]deinit_kfmclient.so
%{tde_libdir}/lib[kt]deinit_konqueror.la
%{tde_libdir}/lib[kt]deinit_konqueror.so
%{tde_libdir}/libtdeinit_keditbookmarks.la
%{tde_libdir}/libtdeinit_keditbookmarks.so
%{tde_libdir}/libtdeinit_kfmclient.la
%{tde_libdir}/libtdeinit_kfmclient.so
%{tde_libdir}/libtdeinit_konqueror.la
%{tde_libdir}/libtdeinit_konqueror.so
%{tde_libdir}/libkonqsidebarplugin.so.*
%{tde_tdeappdir}/Home.desktop
%{tde_tdeappdir}/kcmhistory.desktop
@ -2666,8 +2652,8 @@ Using Konsole, a user can open:
%{tde_tdelibdir}/konsole.so
%{tde_tdelibdir}/libkonsolepart.la
%{tde_tdelibdir}/libkonsolepart.so
%{tde_libdir}/lib[kt]deinit_konsole.la
%{tde_libdir}/lib[kt]deinit_konsole.so
%{tde_libdir}/libtdeinit_konsole.la
%{tde_libdir}/libtdeinit_konsole.so
%{tde_tdeappdir}/konsole.desktop
%{tde_tdeappdir}/konsolesu.desktop
%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
@ -2792,25 +2778,20 @@ TDE will start, but many good defaults will not be set.
%files -n trinity-ksmserver
%defattr(-,root,root,-)
%{tde_bindir}/ksmserver
%{tde_bindir}/start[kt]de
%{tde_bindir}/starttde
%{tde_bindir}/migratekde3
%{tde_bindir}/r14-xdg-update
%{tde_bindir}/tdeinit_displayconfig
%{tde_bindir}/tdeinit_phase1
%{tde_tdelibdir}/ksmserver.la
%{tde_tdelibdir}/ksmserver.so
%{tde_libdir}/lib[kt]deinit_ksmserver.la
%{tde_libdir}/lib[kt]deinit_ksmserver.so
%{tde_libdir}/libtdeinit_ksmserver.la
%{tde_libdir}/libtdeinit_ksmserver.so
%{tde_datadir}/apps/tdeconf_update/ksmserver.upd
%{tde_datadir}/apps/tdeconf_update/move_session_config.sh
%{tde_datadir}/apps/ksmserver/pics/shutdown.png
%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
# Remove conflicts with redhat-menus
%if "%{?tde_prefix}" != "/usr"
%{tde_bindir}/plasma-desktop
%endif
%post -n trinity-ksmserver
/sbin/ldconfig || :
%if 0%{?mdkversion} || 0%{?mgaversion}
@ -3017,45 +2998,45 @@ This package contains the default X window manager for TDE.
%files -n trinity-twin
%defattr(-,root,root,-)
%{tde_bindir}/kompmgr
%{tde_bindir}/[kt]win
%{tde_bindir}/[kt]win_killer_helper
%{tde_bindir}/[kt]win_resumer_helper
%{tde_bindir}/[kt]win_rules_dialog
%{tde_libdir}/tdeconf_update_bin/[kt]win_update_default_rules
%{tde_libdir}/tdeconf_update_bin/[kt]win_update_window_settings
%{tde_tdelibdir}/kcm_[kt]win*.la
%{tde_tdelibdir}/kcm_[kt]win*.so
%{tde_tdelibdir}/[kt]win*.la
%{tde_tdelibdir}/[kt]win*.so
%{tde_libdir}/lib[kt]decorations.so.*
%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.la
%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.so
%{tde_libdir}/lib[kt]deinit_[kt]win.la
%{tde_libdir}/lib[kt]deinit_[kt]win.so
%{tde_bindir}/twin
%{tde_bindir}/twin_killer_helper
%{tde_bindir}/twin_resumer_helper
%{tde_bindir}/twin_rules_dialog
%{tde_libdir}/tdeconf_update_bin/twin_update_default_rules
%{tde_libdir}/tdeconf_update_bin/twin_update_window_settings
%{tde_tdelibdir}/kcm_twin*.la
%{tde_tdelibdir}/kcm_twin*.so
%{tde_tdelibdir}/twin*.la
%{tde_tdelibdir}/twin*.so
%{tde_libdir}/libtdecorations.so.*
%{tde_libdir}/libtdeinit_twin_rules_dialog.la
%{tde_libdir}/libtdeinit_twin_rules_dialog.so
%{tde_libdir}/libtdeinit_twin.la
%{tde_libdir}/libtdeinit_twin.so
%{tde_tdeappdir}/showdesktop.desktop
%{tde_tdeappdir}/[kt]windecoration.desktop
%{tde_tdeappdir}/[kt]winoptions.desktop
%{tde_tdeappdir}/[kt]winrules.desktop
%{tde_datadir}/applnk/.hidden/[kt]winactions.desktop
%{tde_datadir}/applnk/.hidden/[kt]winadvanced.desktop
%{tde_datadir}/applnk/.hidden/[kt]winfocus.desktop
%{tde_datadir}/applnk/.hidden/[kt]winmoving.desktop
%{tde_datadir}/applnk/.hidden/[kt]wintranslucency.desktop
%{tde_datadir}/apps/tdeconf_update/[kt]win3_plugin.pl
%{tde_datadir}/apps/tdeconf_update/[kt]win3_plugin.upd
%{tde_datadir}/apps/tdeconf_update/[kt]win_focus1.sh
%{tde_datadir}/apps/tdeconf_update/[kt]win_focus1.upd
%{tde_datadir}/apps/tdeconf_update/[kt]win_focus2.sh
%{tde_datadir}/apps/tdeconf_update/[kt]win_focus2.upd
%{tde_datadir}/apps/tdeconf_update/[kt]win_fsp_workarounds_1.upd
%{tde_datadir}/apps/tdeconf_update/[kt]winiconify.upd
%{tde_datadir}/apps/tdeconf_update/[kt]winsticky.upd
%{tde_datadir}/apps/tdeconf_update/[kt]win.upd
%{tde_datadir}/apps/tdeconf_update/[kt]winupdatewindowsettings.upd
%{tde_tdeappdir}/twindecoration.desktop
%{tde_tdeappdir}/twinoptions.desktop
%{tde_tdeappdir}/twinrules.desktop
%{tde_datadir}/applnk/.hidden/twinactions.desktop
%{tde_datadir}/applnk/.hidden/twinadvanced.desktop
%{tde_datadir}/applnk/.hidden/twinfocus.desktop
%{tde_datadir}/applnk/.hidden/twinmoving.desktop
%{tde_datadir}/applnk/.hidden/twintranslucency.desktop
%{tde_datadir}/apps/tdeconf_update/twin3_plugin.pl
%{tde_datadir}/apps/tdeconf_update/twin3_plugin.upd
%{tde_datadir}/apps/tdeconf_update/twin_focus1.sh
%{tde_datadir}/apps/tdeconf_update/twin_focus1.upd
%{tde_datadir}/apps/tdeconf_update/twin_focus2.sh
%{tde_datadir}/apps/tdeconf_update/twin_focus2.upd
%{tde_datadir}/apps/tdeconf_update/twin_fsp_workarounds_1.upd
%{tde_datadir}/apps/tdeconf_update/twiniconify.upd
%{tde_datadir}/apps/tdeconf_update/twinsticky.upd
%{tde_datadir}/apps/tdeconf_update/twin.upd
%{tde_datadir}/apps/tdeconf_update/twinupdatewindowsettings.upd
%{tde_datadir}/apps/tdeconf_update/pluginlibFix.pl
%{tde_datadir}/apps/[kt]win/
%{tde_datadir}/config.kcfg/[kt]win.kcfg
%{tde_datadir}/icons/crystalsvg/*/apps/[kt]win.png
%{tde_datadir}/apps/twin/
%{tde_datadir}/config.kcfg/twin.kcfg
%{tde_datadir}/icons/crystalsvg/*/apps/twin.png
%{tde_tdedocdir}/HTML/en/kompmgr/
%post -n trinity-twin
@ -3086,7 +3067,7 @@ Requires: trinity-twin = %{version}-%{release}
%files -n trinity-twin-devel
%defattr(-,root,root,-)
%{tde_tdeincludedir}/[kt]win/
%{tde_tdeincludedir}/twin/
%{tde_tdeincludedir}/kcommondecoration.h
%{tde_tdeincludedir}/kdecoration.h
%{tde_tdeincludedir}/kdecoration_p.h
@ -3217,6 +3198,7 @@ Windows and Samba shares.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs
%patch1 -p1 -b .openterminalhere
%patch2 -p1 -b .startmenuicon
%patch3 -p1 -b .displayconfigtranslation
@ -3391,11 +3373,6 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k"
EOF
%endif
# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
%if "%{?tde_prefix}" != "/usr"
%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{tde_bindir}"
%endif
# PAM configuration files (except openSUSE)
%if 0%{?suse_version} == 0
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
@ -3412,12 +3389,6 @@ EOF
-e "s/^#*MinShowUID=.*/MinShowUID=500/"
%endif
# Moves the XDG configuration files to TDE directory
%if "%{tde_prefix}" != "/usr"
%__mkdir_p "%{?buildroot}%{tde_prefix}/etc"
%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{tde_prefix}/etc"
%endif
# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%if 0%{?suse_version}
@ -3464,5 +3435,5 @@ EOF
%changelog
* Sun Mar 04 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial build for TDE 14.0.0

File diff suppressed because it is too large Load Diff

@ -0,0 +1,44 @@
--- trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/CMakeLists.txt.ftbfs 2013-07-16 15:59:42.000000000 +0200
+++ trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/CMakeLists.txt 2013-07-17 14:39:37.553649801 +0200
@@ -83,6 +83,7 @@
${TQT_LIBRARY_DIRS}
${LIBIDN_LIBRARY_DIRS}
${GAMIN_LIBDIR}
+ ${LIBART_LIBRARY_DIRS}
)
##### headers ###################################
--- trinity-tdelibs-14.0.0~pre599+bae79307/pics/CMakeLists.txt.ORI 2013-07-17 14:56:14.633297689 +0200
+++ trinity-tdelibs-14.0.0~pre599+bae79307/pics/CMakeLists.txt 2013-07-17 14:56:25.145239757 +0200
@@ -28,6 +28,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${LIBART_LIBRARY_DIRS}
)
--- trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/tdehardwaredevices.h.ORI 2013-07-17 14:47:03.918290078 +0200
+++ trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/tdehardwaredevices.h 2013-07-17 14:47:22.080194401 +0200
@@ -27,7 +27,9 @@
#include "tdelibs_export.h"
// udev includes
+extern "C" {
#include <libudev.h>
+}
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
--- trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/tdehardwaredevices.cpp.ORI 2013-07-17 14:47:29.718154173 +0200
+++ trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/tdehardwaredevices.cpp 2013-07-17 14:47:47.204062091 +0200
@@ -33,7 +33,9 @@
#include <tdeapplication.h>
#include <dcopclient.h>
+extern "C" {
#include <libudev.h>
+}
#include <fcntl.h>
#include <poll.h>

@ -3,6 +3,8 @@
%define _variant .opt
%endif
%define tde_version 14.0.0
# TDE specific variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@ -31,10 +33,15 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Patch0: tdelibs-14.0.0-ftbfs.patch
Patch1: tdelibs-14.0.0-fix_xdg_menu.patch
# Fix battery charge detection
Patch2: tdelibs-14.0.0-fix_battery_charge.patch
# Patches from Mandriva
Patch1: tdelibs-14.0.0-xdg_dirs_set_path.patch
Patch2: tdelibs-14.0.0-cups_by_default.patch
Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch
Patch102: tdelibs-14.0.0-cups_by_default.patch
# Fix battery charge detection
Patch3: tdelibs-14.0.0-fix_battery_charge.patch
@ -50,14 +57,13 @@ Provides: trinity-kdelibs-apidocs = %{version}-%{release}
BuildRequires: cmake >= 2.8
BuildRequires: libtool
BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-dbus-1-tqt-devel >= %{version}
BuildRequires: trinity-dbus-tqt-devel >= %{version}
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-dbus-1-tqt-devel >= %{tde_version}
BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
BuildRequires: krb5-devel
BuildRequires: libxslt-devel
BuildRequires: cups-devel
BuildRequires: trinity-libart-lgpl-devel
BuildRequires: openssl-devel
BuildRequires: gcc-c++
BuildRequires: alsa-lib-devel
@ -67,6 +73,9 @@ BuildRequires: glib2-devel
# LUA support are not ready yet
#BuildRequires: lua-devel
# LIBART_LGPL support
BuildRequires: trinity-libart-lgpl-devel
# ASPELL support
BuildRequires: aspell
BuildRequires: aspell-devel
@ -96,6 +105,15 @@ BuildRequires: libbz2-devel
BuildRequires: bzip2-devel
%endif
# UDEV support
BuildRequires: libudev-devel
# UDISKS2 support
BuildRequires: udisks-devel
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_udisks2 1
%endif
# UTEMPTER support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libutempter-devel
@ -130,7 +148,7 @@ BuildRequires: jasper-devel
# AVAHI support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_avahi 1
BuildRequires: trinity-avahi-tqt-devel >= %{version}
BuildRequires: trinity-avahi-tqt-devel >= %{tde_version}
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
Requires: %{_lib}avahi-client3
@ -201,11 +219,14 @@ BuildRequires: xz-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}nm-util-devel
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: NetworkManager-glib-devel
%endif
%endif
Requires: trinity-tqt3 >= 3.5.0
Requires: trinity-tqtinterface >= %{version}
Requires: trinity-arts >= %{version}
Requires: trinity-tqtinterface >= %{tde_version}
Requires: trinity-arts >= %{tde_version}
%description
Libraries for the Trinity Desktop Environment:
@ -302,7 +323,8 @@ kimgio (image manipulation).
%{tde_tdedocdir}/HTML/en/tdespell/
%{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf
%{tde_prefix}/etc/xdg/menus/tde-applications.menu
%{_sysconfdir}/xdg/menus/tde-applications.menu
%{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde
%{_sysconfdir}/ld.so.conf.d/trinity.conf
%{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service
@ -366,9 +388,12 @@ applications for TDE.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .xdg_path
%patch2 -p1 -b .cups_by_default
%patch3 -p1 -b .batterycharge
%patch0 -p1 -b .ftbfs
%patch1 -p1 -b .xdg
%patch2 -p1 -b .batterycharge
%patch101 -p1 -b .xdg_path
%patch102 -p1 -b .cups_by_default
%build
@ -418,7 +443,7 @@ cd build
%{?!with_gamin:-DWITH_GAMIN=OFF} %{?with_gamin:-DWITH_GAMIN=ON} \
-DWITH_UPOWER=ON \
-DWITH_UDISKS=ON \
-DWITH_UDISKS2=ON \
%{?with_udisks2:-DWITH_UDISKS2=ON} %{?!with_udisks2:-DWITH_UDISKS2=OFF} \
-DWITH_CONSOLEKIT=ON \
%{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \
-DWITH_SUDO_TDESU_BACKEND=OFF \
@ -442,16 +467,6 @@ cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf"
EOF
%endif
# Moves the XDG configuration files to TDE directory
%if "%{tde_prefix}" != "/usr"
%__install -p -D -m644 \
"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
"%{?buildroot}%{tde_prefix}/etc/xdg/menus/tde-applications.menu"
%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
%else
%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/tde-applications.menu"
%endif
# Appends TDE version to '.pc' file
echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc"
@ -461,5 +476,5 @@ echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc"
%changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial build for TDE 14.0.0

@ -8,7 +8,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-bonding-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, tde-ldap-cert-updater
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
Description: Kerberos control module for the TDE control center
This is a TDE control center module to manage TDE connections to Kerberos realms.

@ -7,7 +7,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-controller-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp
Conflicts: tde-ldap-cert-updater
Description: Kerberos realm controller module for the TDE control center
This is a TDE control center module to configure a Kerberos Realm Controller

@ -8,7 +8,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-bonding-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, tde-ldap-cert-updater
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
Description: Kerberos control module for the TDE control center
This is a TDE control center module to manage TDE connections to Kerberos realms.

@ -7,7 +7,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-controller-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp
Conflicts: tde-ldap-cert-updater
Description: Kerberos realm controller module for the TDE control center
This is a TDE control center module to configure a Kerberos Realm Controller

@ -8,7 +8,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-bonding-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, tde-ldap-cert-updater
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
Description: Kerberos control module for the TDE control center
This is a TDE control center module to manage TDE connections to Kerberos realms.

@ -7,7 +7,7 @@ Standards-Version: 3.8.4
Package: kcontrol-ldap-controller-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd
Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp
Conflicts: tde-ldap-cert-updater
Description: Kerberos realm controller module for the TDE control center
This is a TDE control center module to configure a Kerberos Realm Controller

Loading…
Cancel
Save