Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

7 files changed, 454 insertions, 450 deletions

diff --git a/opensuse/arts/arts.spec b/opensuse/arts/arts.spec
index c9eb76281..8e7fb26cd 100644
--- a/opensuse/arts/arts.spec
+++ b/opensuse/arts/arts.spec
@@ -106,10 +106,10 @@ CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DNDEBUG" CFLAGS="$CXXFLAGS" %cmake_tde -d=bu
 # broken automake ?
 #make %{?jobs:-j%jobs}
 
-%make_jobs
+%make_tde -d=build
 
 %install
-%tde_makeinstall
+%makeinstall_tde -d=build
 %ifarch x86_64
 mkdir -p $RPM_BUILD_ROOT/%{_tde_libdir}
 ln -sf ../lib64/mcop $RPM_BUILD_ROOT/%{_tde_libdir}/mcop
diff --git a/opensuse/libtqt4/libtqt4.spec b/opensuse/libtqt4/libtqt4.spec
index 3933940f2..f01d2621c 100644
--- a/opensuse/libtqt4/libtqt4.spec
+++ b/opensuse/libtqt4/libtqt4.spec
@@ -104,7 +104,11 @@ Authors:
  
  
 %prep
-%setup -q
+%if %{with_qt3}
+%setup -qn tqtinterface-qt3-%{version}
+%else
+%setup -qn tqtinterface-qt4-%{version}
+%endif
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
diff --git a/opensuse/tde-filesystem/macros.tde b/opensuse/tde-filesystem/macros.tde
index 44a3a46fb..807910c18 100644
--- a/opensuse/tde-filesystem/macros.tde
+++ b/opensuse/tde-filesystem/macros.tde
@@ -1,6 +1,7 @@
 #
 # Disclaimer: this was taken from macros.kde4. Some items
 # are not applicable to Trinity, but are still here.
+# NEW: this obsoletes common_options from kdelibs3
 
 %_tde_prefix /opt/tde
 %_tde_bindir %{_tde_prefix}/bin
@@ -10,18 +11,25 @@
 %_tde_sysconfdir %{_sysconfdir}
 %_tde_iconsdir %{_tde_prefix}/share/icons
 %_tde_sbindir %{_tde_prefix}/sbin
-%_tde_applicationsdir %{_tde_prefix}/share/applications/tde
-%_tde_mandir %{_tde_prefix}/share/man
-%_tde_sharedir %{_tde_prefix}/share/tde
-%_tde_appsdir %{_tde_sharedir}/apps
+%_tde_sharedir %{_tde_prefix}/share
+%_tde_datadir %{_tde_sharedir}/apps
+%_tde_appdir %{_tde_datadir}
+%_tde_applicationsdir %{_tde_sharedir}/applications
+%_tde_appsdir %{_tde_sharedir}/applnk
 %_tde_configdir %{_tde_sharedir}/config
 %_tde_configkcfgdir %{_tde_sharedir}/config.kcfg
 %_tde_servicesdir %{_tde_sharedir}/services
 %_tde_servicetypesdir %{_tde_sharedir}/servicetypes
 %_tde_includedir %{_tde_prefix}/include
-%_tde_docdir %{_tde_prefix}/share/doc/kde
-%_tde_htmldir %{_tde_prefix}/share/doc/kde/HTML
-%_tde_wallpapersdir %{_tde_prefix}/share/wallpapers
+%_tde_docdir %{_tde_sharedir}/doc/
+%_tde_htmldir %{_tde_sharedir}/doc/HTML
+%_tde_wallpapersdir %{_tde_sharedir}/wallpapers
+%_tde_icondir %{_tde_sharedir}/icons
+%_tde_sounddir %{_tde_sharedir}/sounds
+%_tde_locale %{_tde_sharedir}/locale
+%_tde_mimedir %{_tde_sharedir}/mimelnk
+%_tde_styledir %{_tde_libdir}/tde/plugins/styles
+%_tde_widgetdir %{_tde_libdir}/tde/plugins/designer
  
 # these are for backwards compatibility
 %_kde3_prefix %{_tde_prefix}
@@ -38,8 +46,6 @@
  
 %_tde_build_type release
  
-%tde_makeinstall make DESTDIR=%{?buildroot:%{buildroot}} install
- 
 %cmake_tde(d:) \
   export CFLAGS=$RPM_OPT_FLAGS \
   export CXXFLAGS=$RPM_OPT_FLAGS \
@@ -64,26 +70,81 @@
       -DQT_INCLUDE_DIRS=/usr/lib/qt3/include \\\
       -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \\\
       -DMAN_INSTALL_DIR=%{_mandir} \\\
+      -DINFO_INSTALL_DIR=%{_infodir} \\\
       $bdir %* \
+   if [ "$bdir" == ".." ]; then \
+	cd .. \
+   fi \
+%{nil}
+
+%make_tde(d:) \
+  bdir=. \
+  %{-d:dir=%{-d*} \
+  cd $dir \
+  bdir=.. } \
+  make %{?_smp_mflags} VERBOSE=1 \
+  if [ "$bdir" == ".." ]; then \
+       cd .. \
+  fi \
+%{nil}
+
+%makeinstall_tde(d:) \
+  bdir=. \
+  %{-d:dir=%{-d*} \
+  cd $dir \
+  bdir=.. } \
+  make DESTDIR=%{?buildroot:%{buildroot}} install VERBOSE=1 \
+  if [ "$bdir" == ".." ]; then \
+       cd .. \
+  fi \
 %{nil}
  
 %tde_post_install \
-        if test -e /usr/lib/rpm/suse_update_desktop_file.sh; then \
-               find $RPM_BUILD_ROOT/opt/tde/share \\\
-                        -name '*.desktop' -o -name '*.directory' 2> /dev/null | while read file; do \
-                       test -r "$file" || continue \
-                       grep -q "^X-SuSE-translate=" "$file" && continue \
-                       case "$file" in \
-                        */.hidden/*) \
-                                %suse_update_desktop_file -n "$file" \
-                                ;; \
-                         *) \
-                                %suse_update_desktop_file "$file" \
-                                ;; \
-                        esac \
-                done \
+	# remove not needed development files
+	rm -f $RPM_BUILD_ROOT/%{_tde_libdir}/libkdeinit_*.la \
+	# not worth the hassle
+	rm -rf $RPM_BUILD_ROOT/%{_tde_icondir}/locolor \
+	# move icons in one theme - prefering hicolor
+	d="$RPM_BUILD_ROOT/%{_tde_icondir}/crystalsvg" \
+        if [ -d "$d" -a ! -e "$d/index.theme" ]; then \
+		find "$d" -type f | while read src; do \
+		  dest="${src/\/crystalsvg\///hicolor/}" \
+		  dir="${dest%/*}" \
+		  mkdir -p "$dir" \
+		  mv "$src" "$dest" \
+		done \
+	fi \
+	# we do this 3 times as there is a 3 fold hierarchy
+        if [ -d  $RPM_BUILD_ROOT/%{_tde_icondir} ]; then \
+  	    for i in `seq 1 3`; do \
+    	        find $RPM_BUILD_ROOT/%{_tde_icondir} -type d -exec rmdir -v --ignore-fail-on-non-empty -- {} \; || true \
+  	    done \
+	fi \
+	if [ -d $RPM_BUILD_ROOT/%{_tde_locale}/sr@Latn ]; then \
+             mv $RPM_BUILD_ROOT/%{_tde_locale}/sr@Latn $RPM_BUILD_ROOT/%{_tde_locale}/sr@latin \
         fi \
+        if test -e /usr/lib/rpm/suse_update_desktop_file.sh; then \
+		distribution='' \
+		if test -f $HOME/.rpmmacros && test -d /usr/src/packages/SRPMS; then \
+			distribution=`grep ^%distribution $HOME/.rpmmacros | cut '-d ' -f2` \
+		fi \
+		find $RPM_BUILD_ROOT/opt/kde3/share \\\
+			-name '*.desktop' 2> /dev/null | while read file; do \
+			test -r "$file" || continue \
+			grep -q "^X-SuSE-translate=" "$file" && continue \
+			case "$file" in \
+				*/.hidden/*) \
+					/usr/lib/rpm/suse_update_desktop_file.sh -n "$file" \
+					;; \
+				 *) \
+					if test -n "$distribution"; then \
+						/usr/lib/rpm/suse_update_desktop_file.sh --project "$distribution" --basedir /usr/src/packages/SRPMS "$file" \
+					else \
+						/usr/lib/rpm/suse_update_desktop_file.sh "$file" \
+					fi \
+					;; \
+			esac \
+		done \
+	fi \
 %{nil}
- 
-%make_jobs \
-  %{__make} %{?_smp_mflags} VERBOSE=1
+
diff --git a/opensuse/tdelibs/kde3rc.dif b/opensuse/tdelibs/kde3rc.dif
index 2a33aaf1e..72465757e 100644
--- a/opensuse/tdelibs/kde3rc.dif
+++ b/opensuse/tdelibs/kde3rc.dif
@@ -8,10 +8,10 @@ Index: kdecore/kconfigbackend.cpp
  #else
 -    QString etc_kderc = QString::fromLatin1("/etc/kderc");
 +    QString etc_kderc;
-+    if (checkAccess(QString::fromLatin1("/etc/kde3rc"), R_OK))
-+       etc_kderc = QString::fromLatin1("/etc/kde3rc");
++    if (checkAccess(QString::fromLatin1("/etc/tderc"), R_OK))
++       etc_kderc = QString::fromLatin1("/etc/tderc");
 +    else
-+       etc_kderc = QString::fromLatin1("/etc/kderc");
++       etc_kderc = QString::fromLatin1("/etc/kde3rc");
  #endif
  
      if (checkAccess(etc_kderc, R_OK))
diff --git a/opensuse/tdelibs/tdelibs.changes b/opensuse/tdelibs/tdelibs.changes
index 47174df17..ac5164f07 100644
--- a/opensuse/tdelibs/tdelibs.changes
+++ b/opensuse/tdelibs/tdelibs.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Sat Aug 13 21:19:53 UTC 2011 - rxu@lincomlinux.org
+
+- initial conversion to Trinity
+
+-------------------------------------------------------------------
 Fri Jun 17 09:55:54 UTC 2011 - aj@suse.de
 
 - Add /etc/ld.so.conf.d/kdelibs3.conf (bnc#671725).
diff --git a/opensuse/tdelibs/tdelibs.spec b/opensuse/tdelibs/tdelibs.spec
index 953d0cc1e..f5adb19ae 100644
--- a/opensuse/tdelibs/tdelibs.spec
+++ b/opensuse/tdelibs/tdelibs.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package kdelibs3
+# spec file for package tdelibs
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 the Trinity Project (opensuse).
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -11,59 +11,39 @@
 # 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://bugs.opensuse.org/
+  
+# Please submit bugfixes or comments via http://bugs.trinitydesktop.org/
 #
 
 # norootforbuild
 
 
-Name:           kdelibs3
+Name:           tdelibs
 BuildRequires:  OpenEXR-devel arts-devel aspell-devel cups-devel fam-devel flac-devel krb5-devel
 BuildRequires:  libart_lgpl-devel libidn-devel libsndfile libtiff-devel
-BuildRequires:  libxslt-devel openldap2-devel pcre-devel qt3-devel sgml-skel
+BuildRequires:  libxslt-devel openldap2-devel pcre-devel libtqt4-devel sgml-skel
 BuildRequires:  db-devel libacl-devel libattr-devel unsermake update-desktop-files utempter
 BuildRequires:  unzip
-%if %suse_version > 1020
 BuildRequires:  avahi-compat-mDNSResponder-devel fdupes libbz2-devel libjasper-devel
-%else
-BuildRequires:  libjasper mDNSResponder-devel
-%endif
-%if %suse_version > 1000
-BuildRequires:  libdrm-devel
-%endif
-Url:            http://www.kde.org
+BuildRequires:  libdrm-devel tde-filesystem
+URL:            http://www.trinitydesktop.org
 License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
-Group:          System/GUI/KDE
+Group:          System/GUI/TDE
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        KDE Base Libraries
-Version:        3.5.10
-Release:        47
-Obsoletes:      kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons kdepim3-networkstatus
-Provides:       kups keramik kdelibs3-cups kdelibs3-33addons kdepim3-networkstatus
+Summary:        Trinity Base Libraries
+Version:        3.5.12.99
+Release:        1
+Provides:       kups keramik tdelibs-cups tdelibs-33addons tdepim-networkstatus
 Provides:       kdelibs3_base = 3.3
-# bug437293
-%ifarch ppc64
-Obsoletes:      kdelibs3-64bit
-%endif
-#
-Requires:       qt3 >= %( echo `rpm -q --queryformat '%{VERSION}' qt3`)
-Requires:       openssl kdelibs3-default-style
-%if %suse_version > 1020
+Requires:       libtqt4 >= %( echo `rpm -q --queryformat '%{VERSION}' libtqt4`)
+Requires:       openssl tdelibs-default-style
 Requires:       hicolor-icon-theme
-%endif
-%if %suse_version > 1000
 Recommends:     ispell enscript
-%endif
-%if %suse_version > 1010
 Requires:       sudo
-%endif
 Source0:        kdelibs-%{version}.tar.bz2
-Source2:        do_make
 Source3:        baselibs.conf
 Source4:        api_docu_description
-Source6:        kde3rc
-Source7:        common_options
+Source6:        tderc
 # svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
 Source8:        admin.tar.bz2
 Source9:        cr16-filesys-file_broken.png
@@ -168,26 +148,19 @@ Patch211:       oom_score_adj.patch
 Patch212:       kcontrol_crash_patch.diff
 
 %description
-This package contains kdelibs, one of the basic packages of the K
-Desktop Environment. It contains the necessary libraries for the KDE
+This package contains tdelibs, one of the basic packages of the Trinity
+Desktop Environment. It contains the necessary libraries for the Trinity
 desktop.
 
-This package is absolutely necessary for using KDE.
+This package is absolutely necessary for using TDE.
 
 %package arts
 License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
-Summary:        KDE aRts support
-Group:          System/GUI/KDE
-Provides:       kdelibs3:/opt/kde3/bin/artsmessage
-# bug437293
-%ifarch ppc64
-Obsoletes:      kdelibs3-arts-64bit
-%endif
-#
+Summary:        TDE aRts support
+Group:          System/GUI/TDE
+Provides:       tdelibs:/opt/tde/bin/artsmessage
 Requires:       arts >= %( echo `rpm -q --queryformat '%{VERSION}' arts`)
-%if %suse_version > 1000
-Recommends:     kdemultimedia3-arts
-%endif
+Recommends:     tdemultimedia-arts
 
 %description arts
 This package contains bindings and gui elements for using aRts sound
@@ -195,49 +168,41 @@ daemon.
 
 %package default-style
 License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
-Summary:        The default KDE style
-Group:          System/GUI/KDE
-Provides:       kdelibs3:/opt/kde3/%_lib/libkdefx.so.4
+Summary:        The default TDE style
+Group:          System/GUI/TDE
+Provides:       tdelibs:/opt/tde/%_lib/libkdefx.so.4
 
 %description default-style
 This package contains the Plastik widget style and libkdefx. It only
-depends on Qt, not the KDE libraries.
+depends on TQt, not the KDE libraries.
 
 %package doc
 License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
-Summary:        Documentation for KDE Base Libraries
-Group:          System/GUI/KDE
-Provides:       kdelibs3:/opt/kde3/share/apps/ksgmltools2
-Provides:       kdelibs3_doc
+Summary:        Documentation for TDE Base Libraries
+Group:          System/GUI/TDE
+Provides:       tdelibs:/opt/tde/share/apps/ksgmltools2
+Provides:       tdelibs_doc
 Requires:       sgml-skel libxml2
 %define regcat /usr/bin/sgml-register-catalog
 PreReq:         %{regcat} /usr/bin/xmlcatalog /usr/bin/edit-xml-catalog
 PreReq:         sed grep awk
 
 %description doc
-This package contains the core environment and templates for the KDE
+This package contains the core environment and templates for the Trinity
 help system.
 
 %package devel
 License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
-# usefiles /opt/kde3/bin/dcopidl /opt/kde3/bin/dcopidl2cpp /opt/kde3/bin/kdb2html /opt/kde3/bin/preparetips 
-Requires:       qt3-devel libvorbis-devel kdelibs3 = %version autoconf automake libxslt-devel libxml2-devel libart_lgpl-devel libjpeg-devel 
-# next line from kde3-devel-packages macro
-Requires:       kdelibs3-doc libtiff-devel openssl-devel update-desktop-files
-%if %suse_version > 1000
+# usefiles /opt/tde/bin/dcopidl /opt/tde/bin/dcopidl2cpp /opt/tde/bin/kdb2html /opt/tde/bin/preparetips 
+Requires:       libtqt4-devel libvorbis-devel tdelibs = %version autoconf automake libxslt-devel libxml2-devel libart_lgpl-devel libjpeg-devel tde-filesystem
+# next line from tde-devel-packages macro
+Requires:       tdelibs-doc libtiff-devel openssl-devel update-desktop-files
+# FIXME dbus-1-qt3-devel to what?
 Requires:       libdrm-devel dbus-1-qt3-devel
-%else
-Requires:       dbus-1-qt
-%endif
 Requires:       libattr-devel libacl-devel
-%if %suse_version > 1020
-Requires:       avahi-compat-mDNSResponder-devel libbz2-devel
-%else
-Requires:       mDNSResponder-devel
-%endif
-Requires:       kdelibs3-arts
-Summary:        KDE Base Package: Build Environment
-Group:          System/GUI/KDE
+Requires:       tdelibs-arts
+Summary:        Trinity Base Package: Build Environment
+Group:          System/GUI/TDE
 Requires:       fam-devel pcre-devel libidn-devel arts-devel
 
 %description devel
@@ -375,44 +340,17 @@ sed 's,#define KDE_VERSION_STRING "\(.*\)",#define KDE_VERSION_STRING "\1 \\"rel
 #
 # create build enviroment
 # 
-UNSERMAKE=yes make -f admin/Makefile.common cvs
+#UNSERMAKE=yes make -f admin/Makefile.common cvs
 
 %build
 export PATH=$PWD/admin/:$PATH
 FINAL="--enable-final"
 CFLAGS="$CFLAGS -fno-strict-aliasing"
 CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-%ifarch armv4l
-  FINAL=""
-  CXXFLAGS="$CXXFLAGS -O0"
-%endif
-   FLAGS="$FLAGS --with-pcsc-dir=/usr "
-   FLAGS="$FLAGS --disable-rpath"
-  OPTIONS="$FLAGS $FINAL \
-       --prefix=/opt/kde3 \
-       --with-qt-dir=/usr/lib/qt3 \
-       --enable-threading \
-       --enable-mt \
-       --with-xinerama \
-       --with-ssl-dir=/usr/ssl \
-       --mandir=%_mandir \
-       --sysconfdir=%_sysconfdir \
-       --enable-new-ldflags"
-  #
-  # common_options
-  #
-  sed -e 's,@_lib@,%_lib,g' -e "s,@configkde@,$OPTIONS,g" \
-    %{SOURCE7} > ../common_options
-  . ../common_options
-  rm -rf $RPM_BUILD_ROOT
-  export PATH=/opt/kde3/bin:$PATH
-  if [ %_lib = lib64 ]; then
-        EXTRA_OPTIONS="--enable-libsuffix=64"
-  fi
-%if %is_plus
-  EXTRA_OPTIONS="$EXTRA_OPTIONS --enable-dnotify"
-%endif
-export path_sudo=/usr/bin/sudo
+
+# common_options and do_make have been obsoleted by tde-filesystem
+
+  export path_sudo=/usr/bin/sudo
   #
   # define the distribution exactly
   #
@@ -428,10 +366,19 @@ export path_sudo=/usr/bin/sudo
   # find MIT kerberos
   export PATH=/usr/lib/mit/bin:$PATH
   # fast-malloc is not needed anymore
-  ./configure $configkde $EXTRA_OPTIONS \
-    --enable-fast-malloc=no \
-    --with-distribution="$DISTRI"
-do_make %{?jobs:-j %jobs} 
+
+%cmake_tde -d=build \
+	-DKDE_MALLOC_FULL=OFF \
+	-DKDE_MALLOC=OFF \
+	-DKDE_DISTRIBUTION="$DISTRI" \
+	-DSSL_INSTALL_DIR=/usr/ssl \
+	-DPCSC_INSTALL_DIR=/usr \
+	%if %is_plus
+	-DENABLE_DNOFIFY=ON \
+	%endif
+
+%make_tde -d=build
+
 #
 xmlcatbin=/usr/bin/xmlcatalog
 # CATALOG=docbook-simple.xml
@@ -443,7 +390,7 @@ xmlcatbin=/usr/bin/xmlcatalog
 #   "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd" \
 #   "file://%{xml_mod_dtd_dir}/sdocbook.dtd" $CATALOG
 %define FOR_ROOT_CAT for-catalog-%{name}-%{version}.xml
-CATALOG=/opt/kde3/share/apps/ksgmltools2/customization/catalog.xml
+CATALOG=%{_tde_prefix}/share/apps/ksgmltools2/customization/catalog.xml
 rm -f %{FOR_ROOT_CAT}.tmp
 $xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp
 # $xmlcatbin --noout --add "delegateSystem" \
@@ -466,114 +413,103 @@ sed '/<catalog/a\
   %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT}
 
 %install
-  . ../common_options
-  mkdir -p $RPM_BUILD_ROOT/etc/opt/kde3/ 
-  install -m 0644 ../common_options \
-        $RPM_BUILD_ROOT/etc/opt/kde3/common_options
-  export PATH=$PWD/admin/:$PATH
-  do_make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
-  mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/config.kcfg
-  install -D %SOURCE9 $RPM_BUILD_ROOT/opt/kde3/share/icons/crystalsvg/16x16/filesystems/file_broken.png
+  %makeinstall -d=build
+  mkdir -p $RPM_BUILD_ROOT/%{_tde_configkcfgdir}
+  install -D %SOURCE9 $RPM_BUILD_ROOT/%{_tde_icondir}/crystalsvg/16x16/filesystems/file_broken.png
   mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu \
      $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde
   #
   # lib64 compatibility symlink
   #
 %ifarch x86_64 ppc64 s390x mips64 sparc64
-    mkdir -p $RPM_BUILD_ROOT/opt/kde3/lib/kde3/
+    mkdir -p $RPM_BUILD_ROOT/%{_tde_prefix}/lib/kde3/
     ln -sf ../../lib64/kde3/plugins \
-         $RPM_BUILD_ROOT/opt/kde3/lib/kde3/plugins-lib64
+         $RPM_BUILD_ROOT/%{_tde_prefix}/lib/kde3/plugins-lib64
 %endif
   #
   # add missing directories
   #
   for i in Applications Development Editors Edutainment Games Graphics Internet Multimedia Office Settings System Toys Utilities WordProcessing; do
-    install -d -m 0755 $RPM_BUILD_ROOT/opt/kde3/share/applnk/$i
+    install -d -m 0755 $RPM_BUILD_ROOT/%{_tde_appsdir}/$i
   done
   rm -f locale.list
   for i in $(find /usr/share/locale -mindepth 1 -maxdepth 1 -type d | sed 's:/usr/share/locale/::'); do
-    install -d -m 755 $RPM_BUILD_ROOT/opt/kde3/share/locale/$i
-    install -d -m 755 $RPM_BUILD_ROOT/opt/kde3/share/locale/$i/LC_MESSAGES
-    install -d -m 755 $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/$i
-    echo "%lang($i) %doc /opt/kde3/share/locale/$i" >> locale.list
+    install -d -m 755 $RPM_BUILD_ROOT/%{_tde_locale}/$i
+    install -d -m 755 $RPM_BUILD_ROOT/%{_tde_locale}/$i/LC_MESSAGES
+    install -d -m 755 $RPM_BUILD_ROOT/%{_tde_htmldir}/$i
+    echo "%lang($i) %doc %{_tde_locale}/$i" >> locale.list
   done
   %suse_update_desktop_file kresources X-KDE-settings-desktop
-  # unlike with other modules, kde_post_install shouldn't
+  # unlike with other modules, tde_post_install shouldn't
   # be put at the end of %install
-  kde_post_install
+  %tde_post_install
   # now create a filesystem layer
   for theme in hicolor locolor; do
     for j in actions apps filesystems mimetypes; do
       for i in 16 22 32 48 64 128; do
-        install -d -m 0755 $RPM_BUILD_ROOT/opt/kde3/share/icons/${theme}/${i}x${i}/${j}
+        install -d -m 0755 $RPM_BUILD_ROOT/%{_tde_icondir}/${theme}/${i}x${i}/${j}
       done
-      install -d -m 0755 $RPM_BUILD_ROOT/opt/kde3/share/icons/${theme}/scalable/${j}
+      install -d -m 0755 $RPM_BUILD_ROOT/%{_tde_icondir}/${theme}/scalable/${j}
     done
   done
-  install -d -m 0755 $RPM_BUILD_ROOT/etc/opt/kde3/%_lib
-  install -d -m 0755 $RPM_BUILD_ROOT/etc/opt/kde3/share/config
-  install -d -m 0755 $RPM_BUILD_ROOT/opt/kde3/share/apps/kdelibs/
+  install -d -m 0755 $RPM_BUILD_ROOT/etc/%{_tde_libdir}
+  install -d -m 0755 $RPM_BUILD_ROOT/etc/%{_tde_configdir}
+  install -d -m 0755 $RPM_BUILD_ROOT/%{_tde_datadir}/kdelibs/
   install -m 0644 %SOURCE6 $RPM_BUILD_ROOT/etc/
-  rm -f $RPM_BUILD_ROOT/opt/kde3/%_lib/libkdeinit_*.la
+  rm -f $RPM_BUILD_ROOT/%{_tde_libdir}/libkdeinit_*.la
   #
-  # add additional icon path
+  # add additional icon path (not needed anymore? we use cmake)
   #
-  mkdir -p ${RPM_BUILD_ROOT}/opt/kde3/share/apps/kdelibs
-  rm -f admin/*.orig
-  cp -a admin ${RPM_BUILD_ROOT}/opt/kde3/share/apps/kdelibs/
+  #mkdir -p ${RPM_BUILD_ROOT}/%{_tde_datadir}/kdelibs
+  #rm -f admin/*.orig
+  #cp -a admin ${RPM_BUILD_ROOT}/%{_tde_datadir}/kdelibs/
   # This is not needed on SUSE Linux! - Marcus Meissner <meissner@suse.de>
-  rm $RPM_BUILD_ROOT/opt/kde3/bin/kgrantpty
+  rm $RPM_BUILD_ROOT/%{_tde_bindir}/kgrantpty
   #
   # our version is in kdebase3
   #
-  rm -f $RPM_BUILD_ROOT/opt/kde3/bin/fileshare*
+  rm -f $RPM_BUILD_ROOT/%{_tde_bindir}/fileshare*
   #
   # no sources for man pages
   #
-  rm -f $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/en/kdelibs/man-*
+  rm -f $RPM_BUILD_ROOT/%{_tde_htmldir}/en/kdelibs/man-*
   # 
   # install BitTorrent icons
   #
   tar xfvz %SOURCE11
   for i in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
       install -m 0644 bt/$i/mimetypes/bt.png \
-              $RPM_BUILD_ROOT/opt/kde3/share/icons/crystalsvg/$i/mimetypes/torrent.png
+              $RPM_BUILD_ROOT/%{_tde_icondir}/crystalsvg/$i/mimetypes/torrent.png
   done
-  cp CATALOG.%{name} catalog.xml ${RPM_BUILD_ROOT}/opt/kde3/share/apps/ksgmltools2/customization/
+  cp CATALOG.%{name} catalog.xml ${RPM_BUILD_ROOT}/%{_tde_datadir}/ksgmltools2/customization/
   mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xml
   cp %{FOR_ROOT_CAT} ${RPM_BUILD_ROOT}%{_sysconfdir}/xml
-#  rm -f $RPM_BUILD_ROOT/opt/kde3/%_lib/libkdefakes.la
-#  rm -f $RPM_BUILD_ROOT/opt/kde3/%_lib/libkjava.la
-%if %suse_version > 1020
-rm -f $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/index.theme
-%endif
+#  rm -f $RPM_BUILD_ROOT/%{_tde_libdir}/libkdefakes.la
+#  rm -f $RPM_BUILD_ROOT/%{_tde_libdir}/libkjava.la
+rm -f $RPM_BUILD_ROOT/%{_tde_icondir}/hicolor/index.theme
   # .desktop files in kdeaccessibility3 require the kttsd icon
-  for i in {16x16,22x22,32x32,48x48,64x64,128x128,scalable}; do mv $RPM_BUILD_ROOT/opt/kde3/share/icons/crystalsvg/$i/apps/kttsd.* $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/$i/apps/;done
-  install -m 0644 %SOURCE14 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/
-  install -m 0644 %SOURCE15 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/
-  install -m 0644 %SOURCE16 $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/
+  for i in {16x16,22x22,32x32,48x48,64x64,128x128,scalable}; do mv $RPM_BUILD_ROOT/%{_tde_icondir}/crystalsvg/$i/apps/kttsd.* $RPM_BUILD_ROOT/%{_tde_icondir}/hicolor/$i/apps/;done
+  install -m 0644 %SOURCE14 $RPM_BUILD_ROOT/%{_tde_mimedir}/application/
+  install -m 0644 %SOURCE15 $RPM_BUILD_ROOT/%{_tde_mimedir}/application/
+  install -m 0644 %SOURCE16 $RPM_BUILD_ROOT/%{_tde_mimedir}/application/
   # fix bnc#396153
   for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
-    ln -s /opt/kde3/share/icons/crystalsvg/$i/filesystems/network.png $RPM_BUILD_ROOT/opt/kde3/share/icons/crystalsvg/$i/filesystems/preferences-system-network.png
-    ln -s /opt/kde3/share/icons/crystalsvg/$i/filesystems/desktop.png $RPM_BUILD_ROOT/opt/kde3/share/icons/crystalsvg/$i/filesystems/preferences-desktop.png
+    ln -s %{_tde_icondir}/crystalsvg/$i/filesystems/network.png $RPM_BUILD_ROOT/%{_tde_icondir}/crystalsvg/$i/filesystems/preferences-system-network.png
+    ln -s %{_tde_icondir}/crystalsvg/$i/filesystems/desktop.png $RPM_BUILD_ROOT/%{_tde_icondir}/crystalsvg/$i/filesystems/preferences-desktop.png
   done
-  chmod a-x $RPM_BUILD_ROOT/opt/kde3/share/icons/crystalsvg/16x16/filesystems/file_broken.png
-  %if %suse_version > 1020
+  chmod a-x $RPM_BUILD_ROOT/%{_tde_icondir}/crystalsvg/16x16/filesystems/file_broken.png
   %fdupes -s $RPM_BUILD_ROOT
-  %endif
-  %if %suse_version > 1110
-  mkdir -p $RPM_BUILD_ROOT/etc/opt/kde3/share/applications
-  touch $RPM_BUILD_ROOT/etc/opt/kde3/share/applications/mimeinfo.cache
-  mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/applications
-  touch $RPM_BUILD_ROOT/opt/kde3/share/applications/mimeinfo.cache
-  %endif
+  mkdir -p $RPM_BUILD_ROOT/etc/%{_tde_applicationsdir}
+  touch $RPM_BUILD_ROOT/etc/%{_tde_applicationsdir}/mimeinfo.cache
+  mkdir -p $RPM_BUILD_ROOT/%{_tde_applicationsdir}
+  touch $RPM_BUILD_ROOT/%{_tde_applicationsdir}/mimeinfo.cache
 # Create /etc/ld.so.conf.d/kdelibs3.conf 
 mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kdelibs3.conf <<EOF
+cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/tdelibs.conf <<EOF
 %ifarch s390x sparc64 x86_64 ppc64
-/opt/kde3/lib64
+/opt/tde/lib64
 %endif
-/opt/kde3/lib
+/opt/tde/lib
 EOF
 
 %post
@@ -598,7 +534,7 @@ EOF
 
 %post doc
   if [ -x %{regcat} ]; then
-    %{regcat} -a /opt/kde3/share/apps/ksgmltools2/customization/CATALOG.%{name} >/dev/null 2>&1
+    %{regcat} -a %{_tde_datadir}/ksgmltools2/customization/CATALOG.%{name} >/dev/null 2>&1
   fi
   if [ -x /usr/bin/edit-xml-catalog ]; then
     edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
@@ -607,7 +543,7 @@ EOF
 
 %postun doc
   if [ "$1" = "0" -a -x %{regcat} ]; then
-    %{regcat} -r /opt/kde3/share/apps/ksgmltools2/customization/CATALOG.%{name} >/dev/null 2>&1
+    %{regcat} -r %{_tde_datadir}/ksgmltools2/customization/CATALOG.%{name} >/dev/null 2>&1
   fi
   # remove entries only on removal of file
   if [ ! -f %{xml_sysconf_dir}/%{FOR_ROOT_CAT} -a -x /usr/bin/edit-xml-catalog ] ; then
@@ -622,271 +558,269 @@ EOF
 %files default-style
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.BSD COPYING.LIB NAMING README 
-/opt/kde3/%_lib/libkdefx.so.*
-/opt/kde3/%_lib/kde3/plugins/styles/plastik.*
+%{_tde_libdir}/libkdefx.so.*
+%{_tde_libdir}/kde3/plugins/styles/plastik.*
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.BSD COPYING.LIB NAMING README 
-/etc/ld.so.conf.d/kdelibs3.conf
-%dir /etc/opt/kde3
-%dir /opt/kde3
-%dir /opt/kde3/bin
-%dir /opt/kde3/include
-%dir /opt/kde3/share
-%dir /opt/kde3/share/config.kcfg
+/etc/ld.so.conf.d/tdelibs.conf
+%dir /etc/%{_tde_prefix}
+%dir %{_tde_prefix}
+%dir %{_tde_bindir}
+%dir %{_tde_includedir}
+%dir %{_tde_sharedir}
+%dir %{_tde_configkcfgdir}
 %_mandir/man*/*
-/opt/kde3/bin/checkXML
-/opt/kde3/bin/dcop
-/opt/kde3/bin/dcopclient
-/opt/kde3/bin/dcopfind
-/opt/kde3/bin/dcopobject
-/opt/kde3/bin/dcopref
-/opt/kde3/bin/dcops*
-/opt/kde3/bin/dcopquit
-/opt/kde3/bin/imagetops
-/opt/kde3/bin/ka*
-/opt/kde3/bin/kbuildsycoca
-/opt/kde3/bin/kco*
-/opt/kde3/bin/kcmshell
-/opt/kde3/bin/kded
-/opt/kde3/bin/kdeinit*
-/opt/kde3/bin/start_kdeinit
-/opt/kde3/bin/start_kdeinit_wrapper
-/opt/kde3/bin/kde-config
-/opt/kde3/bin/kde-menu
-/opt/kde3/bin/kdesu_stub
-/opt/kde3/bin/kdontchangethehostname
-/opt/kde3/bin/kfile
-/opt/kde3/bin/ki*
-/opt/kde3/bin/kfmexec
-/opt/kde3/bin/klauncher
-/opt/kde3/bin/kmailservice
-/opt/kde3/bin/ktradertest
-/opt/kde3/bin/knotify
-/opt/kde3/bin/kstartupconfig
-/opt/kde3/bin/kdostartupconfig
-%verify(not mode) /opt/kde3/bin/kpac_dhcp_helper
-/opt/kde3/bin/ksendbugmail
-/opt/kde3/bin/kshell
-/opt/kde3/bin/ktelnetservice
-/opt/kde3/bin/kwrapper
-/opt/kde3/bin/lnusertemp
-/opt/kde3/bin/make_driver_db_lpr
-/opt/kde3/bin/khotnewstuff
-/opt/kde3/bin/makekdewidgets
-%dir /opt/kde3/%_lib
-%dir /opt/kde3/%_lib/kde3
-/opt/kde3/%_lib/kde3/dcopserver.*
-/opt/kde3/%_lib/kde3/kaddprinterwizard.*
-/opt/kde3/%_lib/kde3/kbuildsycoca.*
-/opt/kde3/%_lib/kde3/kcmshell.*
-/opt/kde3/%_lib/kde3/kcm_kresources.*
-/opt/kde3/%_lib/kde3/kconf_update.*
-/opt/kde3/%_lib/kde3/kcookiejar.*
-/opt/kde3/%_lib/kde3/kded.*
-/opt/kde3/%_lib/kde3/kded_proxyscout.*
-/opt/kde3/%_lib/kde3/kfileaudiopreview.*
-/opt/kde3/%_lib/kde3/klauncher.*
-/opt/kde3/%_lib/kde3/knotify.*
-/opt/kde3/%_lib/kde3/kabc*
-/opt/kde3/%_lib/kde3/kbzip2filter.*
-/opt/kde3/%_lib/kde3/kded_k*
-/opt/kde3/%_lib/kde3/kdeprint_ext.*
-/opt/kde3/%_lib/kde3/kdeprint_lp*
-/opt/kde3/%_lib/kde3/kdeprint_rlpr.*
-/opt/kde3/%_lib/kde3/kdeprint_tool_escputil.*
-/opt/kde3/%_lib/kde3/kgzipfilter.*
-/opt/kde3/%_lib/kde3/khtmlimagepart.*
-/opt/kde3/%_lib/kde3/ki*
-/opt/kde3/%_lib/kde3/kjavaappletviewer.*
-/opt/kde3/%_lib/kde3/ktexteditor_*
-/opt/kde3/%_lib/kde3/libk*
-/opt/kde3/%_lib/kde3/kspell_*
-/opt/kde3/%_lib/kde3/kstyle_plastik_config.*
-/opt/kde3/%_lib/kde3/kstyle_highcontrast_config.*
-/opt/kde3/%_lib/kde3/libshellscript.*
-%exclude /opt/kde3/%_lib/kde3/plugins/styles/plastik.*
-/opt/kde3/%_lib/kde3/plugins
-/opt/kde3/%_lib/libDCOP.so.*
-%exclude /opt/kde3/%_lib/libkdefx.so.*
-/opt/kde3/%_lib/libk*.so.*
-/opt/kde3/%_lib/libvcard.so.*
-/opt/kde3/%_lib/libkdeinit*.so
-/opt/kde3/%_lib/libnetworkstatus.so.*
-/opt/kde3/%_lib/libconnectionmanager.so.*
-/opt/kde3/%_lib/kde3/kded_networkstatus.*
-/opt/kde3/share/applnk
-%dir /opt/kde3/share/apps
-/opt/kde3/share/apps/LICENSES
-/opt/kde3/share/apps/ka*
-/opt/kde3/share/apps/kc*
-%dir /opt/kde3/share/apps/kdeprint
-/opt/kde3/share/apps/kdeprint/apsdriver*
-/opt/kde3/share/apps/kdeprint/filters
-/opt/kde3/share/apps/kdeprint/icons
-/opt/kde3/share/apps/kdeprint/lprngtooldriver1
-/opt/kde3/share/apps/kdeprint/pics
-%dir /opt/kde3/share/apps/kdeprint/plugins
-/opt/kde3/share/apps/kdeprint/plugins/ext.print
-/opt/kde3/share/apps/kdeprint/plugins/lp*.print
-/opt/kde3/share/apps/kdeprint/plugins/rlpr.print
-/opt/kde3/share/apps/kdeprint/s*
-/opt/kde3/share/apps/kdeprint/t*
-/opt/kde3/share/apps/kdeui
-/opt/kde3/share/apps/kdewidgets
-/opt/kde3/share/apps/khtml
-/opt/kde3/share/apps/kio_uiserver
-/opt/kde3/share/apps/kjava
-/opt/kde3/share/apps/knotify
-/opt/kde3/share/apps/kssl
-/opt/kde3/share/apps/kstyle
-/opt/kde3/share/apps/ktexteditor_*
-/opt/kde3/share/apps/proxyscout
-/opt/kde3/share/apps/knewstuff
-/opt/kde3/share/autostart
-/opt/kde3/share/config
-/opt/kde3/share/emoticons
-/opt/kde3/share/icons
-/opt/kde3/share/locale
-/opt/kde3/share/mimelnk
-/opt/kde3/share/service*
-%config /etc/kde3rc
-/opt/kde3/share/applications
-/opt/kde3/bin/cupsd*
-/opt/kde3/bin/make_driver_db_cups
-/opt/kde3/%_lib/kde3/kdeprint_cups.*
-/opt/kde3/%_lib/kde3/cupsdconf.*
-/opt/kde3/share/apps/kdeprint/cups*
-/opt/kde3/share/apps/kdeprint/kde_logo.png
-/opt/kde3/share/apps/kdeprint/plugins/cups.print
-/opt/kde3/share/apps/kdeprint/preview*
+%{_tde_bindir}/checkXML
+%{_tde_bindir}/dcop
+%{_tde_bindir}/dcopclient
+%{_tde_bindir}/dcopfind
+%{_tde_bindir}/dcopobject
+%{_tde_bindir}/dcopref
+%{_tde_bindir}/dcops*
+%{_tde_bindir}/dcopquit
+%{_tde_bindir}/imagetops
+%{_tde_bindir}/ka*
+%{_tde_bindir}/kbuildsycoca
+%{_tde_bindir}/kco*
+%{_tde_bindir}/kcmshell
+%{_tde_bindir}/kded
+%{_tde_bindir}/kdeinit*
+%{_tde_bindir}/start_kdeinit
+%{_tde_bindir}/start_kdeinit_wrapper
+%{_tde_bindir}/kde-config
+%{_tde_bindir}/kde-menu
+%{_tde_bindir}/kdesu_stub
+%{_tde_bindir}/kdontchangethehostname
+%{_tde_bindir}/kfile
+%{_tde_bindir}/ki*
+%{_tde_bindir}/kfmexec
+%{_tde_bindir}/klauncher
+%{_tde_bindir}/kmailservice
+%{_tde_bindir}/ktradertest
+%{_tde_bindir}/knotify
+%{_tde_bindir}/kstartupconfig
+%{_tde_bindir}/kdostartupconfig
+%verify(not mode) %{_tde_bindir}/kpac_dhcp_helper
+%{_tde_bindir}/ksendbugmail
+%{_tde_bindir}/kshell
+%{_tde_bindir}/ktelnetservice
+%{_tde_bindir}/kwrapper
+%{_tde_bindir}/lnusertemp
+%{_tde_bindir}/make_driver_db_lpr
+%{_tde_bindir}/khotnewstuff
+%{_tde_bindir}/makekdewidgets
+%dir %{_tde_libdir}
+%dir %{_tde_libdir}/kde3
+%{_tde_libdir}/kde3/dcopserver.*
+%{_tde_libdir}/kde3/kaddprinterwizard.*
+%{_tde_libdir}/kde3/kbuildsycoca.*
+%{_tde_libdir}/kde3/kcmshell.*
+%{_tde_libdir}/kde3/kcm_kresources.*
+%{_tde_libdir}/kde3/kconf_update.*
+%{_tde_libdir}/kde3/kcookiejar.*
+%{_tde_libdir}/kde3/kded.*
+%{_tde_libdir}/kde3/kded_proxyscout.*
+%{_tde_libdir}/kde3/kfileaudiopreview.*
+%{_tde_libdir}/kde3/klauncher.*
+%{_tde_libdir}/kde3/knotify.*
+%{_tde_libdir}/kde3/kabc*
+%{_tde_libdir}/kde3/kbzip2filter.*
+%{_tde_libdir}/kde3/kded_k*
+%{_tde_libdir}/kde3/kdeprint_ext.*
+%{_tde_libdir}/kde3/kdeprint_lp*
+%{_tde_libdir}/kde3/kdeprint_rlpr.*
+%{_tde_libdir}/kde3/kdeprint_tool_escputil.*
+%{_tde_libdir}/kde3/kgzipfilter.*
+%{_tde_libdir}/kde3/khtmlimagepart.*
+%{_tde_libdir}/kde3/ki*
+%{_tde_libdir}/kde3/kjavaappletviewer.*
+%{_tde_libdir}/kde3/ktexteditor_*
+%{_tde_libdir}/kde3/libk*
+%{_tde_libdir}/kde3/kspell_*
+%{_tde_libdir}/kde3/kstyle_plastik_config.*
+%{_tde_libdir}/kde3/kstyle_highcontrast_config.*
+%{_tde_libdir}/kde3/libshellscript.*
+%exclude %{_tde_libdir}/kde3/plugins/styles/plastik.*
+%{_tde_libdir}/kde3/plugins
+%{_tde_libdir}/libDCOP.so.*
+%exclude %{_tde_libdir}/libkdefx.so.*
+%{_tde_libdir}/libk*.so.*
+%{_tde_libdir}/libvcard.so.*
+%{_tde_libdir}/libkdeinit*.so
+%{_tde_libdir}/libnetworkstatus.so.*
+%{_tde_libdir}/libconnectionmanager.so.*
+%{_tde_libdir}/kde3/kded_networkstatus.*
+%{_tde_appsdir}
+%dir %{_tde_datadir}
+%{_tde_datadir}/LICENSES
+%{_tde_datadir}/ka*
+%{_tde_datadir}/kc*
+%dir %{_tde_datadir}/kdeprint
+%{_tde_datadir}/kdeprint/apsdriver*
+%{_tde_datadir}/kdeprint/filters
+%{_tde_datadir}/kdeprint/icons
+%{_tde_datadir}/kdeprint/lprngtooldriver1
+%{_tde_datadir}/kdeprint/pics
+%dir %{_tde_datadir}/kdeprint/plugins
+%{_tde_datadir}/kdeprint/plugins/ext.print
+%{_tde_datadir}/kdeprint/plugins/lp*.print
+%{_tde_datadir}/kdeprint/plugins/rlpr.print
+%{_tde_datadir}/kdeprint/s*
+%{_tde_datadir}/kdeprint/t*
+%{_tde_datadir}/kdeui
+%{_tde_datadir}/kdewidgets
+%{_tde_datadir}/khtml
+%{_tde_datadir}/kio_uiserver
+%{_tde_datadir}/kjava
+%{_tde_datadir}/knotify
+%{_tde_datadir}/kssl
+%{_tde_datadir}/kstyle
+%{_tde_datadir}/ktexteditor_*
+%{_tde_datadir}/proxyscout
+%{_tde_datadir}/knewstuff
+%{_tde_sharedir}/autostart
+%{_tde_configdir}
+%{_tde_sharedir}/emoticons
+%{_tde_icondir}/icons
+%{_tde_locale}/locale
+%{_tde_mimedir}/mimelnk
+%{_tde_sharedir}/service*
+%config /etc/tderc
+%{_tde_applicationsdir}
+%{_tde_bindir}/cupsd*
+%{_tde_bindir}/make_driver_db_cups
+%{_tde_libdir}/kde3/kdeprint_cups.*
+%{_tde_libdir}/kde3/cupsdconf.*
+%{_tde_datadir}/kdeprint/cups*
+%{_tde_datadir}/kdeprint/kde_logo.png
+%{_tde_datadir}/kdeprint/plugins/cups.print
+%{_tde_datadir}/kdeprint/preview*
 %ifarch x86_64 ppc64 s390x mips64 sparc64
-%dir /opt/kde3/lib
-%dir /opt/kde3/lib/kde3
-/opt/kde3/lib/kde3/plugins-lib64
+%dir %{_tde_prefix}/lib
+%dir %{_tde_prefix}/lib/kde3
+%{_tde_prefix}/lib/kde3/plugins-lib64
 %endif
 /etc/xdg/menus
-%if %suse_version > 1110
-%dir /etc/opt/kde3
-%dir /etc/opt/kde3/share
-%dir /etc/opt/kde3/share/applications
-%ghost /etc/opt/kde3/share/applications/mimeinfo.cache
-%dir /opt/kde3
-%dir /opt/kde3/share
-%dir /opt/kde3/share/applications
-%ghost /opt/kde3/share/applications/mimeinfo.cache
-%endif
+%dir /etc/%{_tde_prefix}
+%dir /etc/%{_tde_sharedir}
+%dir /etc/%{_tde_applicationsdir}
+%ghost /etc/%{_tde_applicationsdir}/mimeinfo.cache
+%dir %{_tde_prefix}
+%dir %{_tde_sharedir}
+%dir %{_tde_applicationsdir}
+%ghost %{_tde_applicationsdir}/mimeinfo.cache
+
 
 %files arts
 %defattr(-,root,root)
-/opt/kde3/bin/artsmessage
-/opt/kde3/%_lib/libartskde.so.*
+%{_tde_bindir}/artsmessage
+%{_tde_libdir}/libartskde.so.*
 
 %files doc
 %defattr(-,root,root)
-%doc /opt/kde3/share/doc
-/opt/kde3/bin/meinproc
-/opt/kde3/share/apps/ksgmltools2
+%doc %{_tde_docdir}
+%{_tde_bindir}/meinproc
+%{_tde_datadir}/ksgmltools2
 %config %{_sysconfdir}/xml/%{FOR_ROOT_CAT}
 
 %files devel
 %defattr(-,root,root)
-%dir /opt/kde3/share/apps/kdelibs
-%config /etc/opt/kde3/common_options
-/opt/kde3/bin/dcopidl*
-/opt/kde3/bin/kmimelist
-/opt/kde3/bin/preparetips
-/opt/kde3/bin/ksvgtopng
-/opt/kde3/bin/kunittestmodrunner
-#/opt/kde3/bin/MISC
-/opt/kde3/include/*
-/opt/kde3/share/apps/dcopidlng
-/opt/kde3/share/apps/kdelibs/admin
-/opt/kde3/%_lib/libartskde.la
-/opt/kde3/%_lib/libkunittest.la
-/opt/kde3/%_lib/libkunittest.so
-/opt/kde3/%_lib/libartskde.so
-/opt/kde3/%_lib/libDCOP.so
-/opt/kde3/%_lib/libvcard.so
-/opt/kde3/%_lib/libvcard.la
-/opt/kde3/%_lib/libDCOP.la
-/opt/kde3/%_lib/lib*.a
-/opt/kde3/%_lib/libkabc_dir.la
-/opt/kde3/%_lib/libkabc_dir.so
-/opt/kde3/%_lib/libkabc_file.la
-/opt/kde3/%_lib/libkabc_file.so
-/opt/kde3/%_lib/libkabc.la
-/opt/kde3/%_lib/libkabc_ldapkio.la
-/opt/kde3/%_lib/libkabc_ldapkio.so
-/opt/kde3/%_lib/libkabc.so
-/opt/kde3/%_lib/libkatepartinterfaces.la
-/opt/kde3/%_lib/libkatepartinterfaces.so
-/opt/kde3/%_lib/libkdecore.la
-/opt/kde3/%_lib/libkdecore.so
-/opt/kde3/%_lib/libkdefakes.la
-/opt/kde3/%_lib/libkdefakes.so
-/opt/kde3/%_lib/libkdefx.la
-/opt/kde3/%_lib/libkdefx.so
-/opt/kde3/%_lib/libkdemm.la
-/opt/kde3/%_lib/libkdemm.so
-/opt/kde3/%_lib/libkdeprint.la
-/opt/kde3/%_lib/libkdeprint_management.la
-/opt/kde3/%_lib/libkdeprint_management.so
-/opt/kde3/%_lib/libkdeprint.so
-/opt/kde3/%_lib/libkdesasl.la
-/opt/kde3/%_lib/libkdesasl.so
-/opt/kde3/%_lib/libkdesu.la
-/opt/kde3/%_lib/libkdesu.so
-/opt/kde3/%_lib/libkdeui.la
-/opt/kde3/%_lib/libkdeui.so
-/opt/kde3/%_lib/libkdnssd.la
-/opt/kde3/%_lib/libkdnssd.so
-/opt/kde3/%_lib/libkhtml.la
-/opt/kde3/%_lib/libkhtml.so
-/opt/kde3/%_lib/libkimproxy.la
-/opt/kde3/%_lib/libkimproxy.so
-/opt/kde3/%_lib/libkio.la
-/opt/kde3/%_lib/libkio.so
-/opt/kde3/%_lib/libkjava.la
-/opt/kde3/%_lib/libkjava.so
-/opt/kde3/%_lib/libkjs.la
-/opt/kde3/%_lib/libkjs.so
-/opt/kde3/%_lib/libkmdi2.la
-/opt/kde3/%_lib/libkmdi2.so
-/opt/kde3/%_lib/libkmdi.la
-/opt/kde3/%_lib/libkmdi.so
-/opt/kde3/%_lib/libkmediaplayer.la
-/opt/kde3/%_lib/libkmediaplayer.so
-/opt/kde3/%_lib/libkmid.la
-/opt/kde3/%_lib/libkmid.so
-/opt/kde3/%_lib/libknewstuff.la
-/opt/kde3/%_lib/libknewstuff.so
-/opt/kde3/%_lib/libkntlm.la
-/opt/kde3/%_lib/libkntlm.so
-/opt/kde3/%_lib/libkparts.la
-/opt/kde3/%_lib/libkparts.so
-/opt/kde3/%_lib/libkresources.la
-/opt/kde3/%_lib/libkresources.so
-/opt/kde3/%_lib/libkscreensaver.la
-/opt/kde3/%_lib/libkscreensaver.so
-/opt/kde3/%_lib/libkscript.la
-/opt/kde3/%_lib/libkscript.so
-/opt/kde3/%_lib/libkspell2.la
-/opt/kde3/%_lib/libkspell2.so
-/opt/kde3/%_lib/libkspell.la
-/opt/kde3/%_lib/libkspell.so
-/opt/kde3/%_lib/libktexteditor.la
-/opt/kde3/%_lib/libktexteditor.so
-/opt/kde3/%_lib/libkutils.la
-/opt/kde3/%_lib/libkutils.so
-/opt/kde3/%_lib/libkwalletbackend.la
-/opt/kde3/%_lib/libkwalletbackend.so
-/opt/kde3/%_lib/libkwalletclient.la
-/opt/kde3/%_lib/libkwalletclient.so
-/opt/kde3/%_lib/libnetworkstatus.la
-/opt/kde3/%_lib/libnetworkstatus.so
-/opt/kde3/%_lib/libconnectionmanager.la
-/opt/kde3/%_lib/libconnectionmanager.so
+%dir %{_tde_datadir}/kdelibs
+%{_tde_bindir}/dcopidl*
+%{_tde_bindir}/kmimelist
+%{_tde_bindir}/preparetips
+%{_tde_bindir}/ksvgtopng
+%{_tde_bindir}/kunittestmodrunner
+#%{_tde_bindir}/MISC
+%{_tde_includedir}/*
+%{_tde_datadir}/dcopidlng
+%{_tde_datadir}/kdelibs/admin
+%{_tde_libdir}/libartskde.la
+%{_tde_libdir}/libkunittest.la
+%{_tde_libdir}/libkunittest.so
+%{_tde_libdir}/libartskde.so
+%{_tde_libdir}/libDCOP.so
+%{_tde_libdir}/libvcard.so
+%{_tde_libdir}/libvcard.la
+%{_tde_libdir}/libDCOP.la
+%{_tde_libdir}/lib*.a
+%{_tde_libdir}/libkabc_dir.la
+%{_tde_libdir}/libkabc_dir.so
+%{_tde_libdir}/libkabc_file.la
+%{_tde_libdir}/libkabc_file.so
+%{_tde_libdir}/libkabc.la
+%{_tde_libdir}/libkabc_ldapkio.la
+%{_tde_libdir}/libkabc_ldapkio.so
+%{_tde_libdir}/libkabc.so
+%{_tde_libdir}/libkatepartinterfaces.la
+%{_tde_libdir}/libkatepartinterfaces.so
+%{_tde_libdir}/libkdecore.la
+%{_tde_libdir}/libkdecore.so
+%{_tde_libdir}/libkdefakes.la
+%{_tde_libdir}/libkdefakes.so
+%{_tde_libdir}/libkdefx.la
+%{_tde_libdir}/libkdefx.so
+%{_tde_libdir}/libkdemm.la
+%{_tde_libdir}/libkdemm.so
+%{_tde_libdir}/libkdeprint.la
+%{_tde_libdir}/libkdeprint_management.la
+%{_tde_libdir}/libkdeprint_management.so
+%{_tde_libdir}/libkdeprint.so
+%{_tde_libdir}/libkdesasl.la
+%{_tde_libdir}/libkdesasl.so
+%{_tde_libdir}/libkdesu.la
+%{_tde_libdir}/libkdesu.so
+%{_tde_libdir}/libkdeui.la
+%{_tde_libdir}/libkdeui.so
+%{_tde_libdir}/libkdnssd.la
+%{_tde_libdir}/libkdnssd.so
+%{_tde_libdir}/libkhtml.la
+%{_tde_libdir}/libkhtml.so
+%{_tde_libdir}/libkimproxy.la
+%{_tde_libdir}/libkimproxy.so
+%{_tde_libdir}/libkio.la
+%{_tde_libdir}/libkio.so
+%{_tde_libdir}/libkjava.la
+%{_tde_libdir}/libkjava.so
+%{_tde_libdir}/libkjs.la
+%{_tde_libdir}/libkjs.so
+%{_tde_libdir}/libkmdi2.la
+%{_tde_libdir}/libkmdi2.so
+%{_tde_libdir}/libkmdi.la
+%{_tde_libdir}/libkmdi.so
+%{_tde_libdir}/libkmediaplayer.la
+%{_tde_libdir}/libkmediaplayer.so
+%{_tde_libdir}/libkmid.la
+%{_tde_libdir}/libkmid.so
+%{_tde_libdir}/libknewstuff.la
+%{_tde_libdir}/libknewstuff.so
+%{_tde_libdir}/libkntlm.la
+%{_tde_libdir}/libkntlm.so
+%{_tde_libdir}/libkparts.la
+%{_tde_libdir}/libkparts.so
+%{_tde_libdir}/libkresources.la
+%{_tde_libdir}/libkresources.so
+%{_tde_libdir}/libkscreensaver.la
+%{_tde_libdir}/libkscreensaver.so
+%{_tde_libdir}/libkscript.la
+%{_tde_libdir}/libkscript.so
+%{_tde_libdir}/libkspell2.la
+%{_tde_libdir}/libkspell2.so
+%{_tde_libdir}/libkspell.la
+%{_tde_libdir}/libkspell.so
+%{_tde_libdir}/libktexteditor.la
+%{_tde_libdir}/libktexteditor.so
+%{_tde_libdir}/libkutils.la
+%{_tde_libdir}/libkutils.so
+%{_tde_libdir}/libkwalletbackend.la
+%{_tde_libdir}/libkwalletbackend.so
+%{_tde_libdir}/libkwalletclient.la
+%{_tde_libdir}/libkwalletclient.so
+%{_tde_libdir}/libnetworkstatus.la
+%{_tde_libdir}/libnetworkstatus.so
+%{_tde_libdir}/libconnectionmanager.la
+%{_tde_libdir}/libconnectionmanager.so
 
 %changelog
diff --git a/opensuse/tdelibs/kde3rc b/opensuse/tdelibs/tderc
index 3a5af96d9..c98cc4144 100644
--- a/opensuse/tdelibs/kde3rc
+++ b/opensuse/tdelibs/tderc
@@ -1,5 +1,5 @@
 [Directories]
-prefixes=/etc/opt/kde3/
+prefixes=/etc/opt/tde/
 userProfileMapFile=/etc/kde-user-profile
 profileDirsPrefix=/var/lib/kde-profiles/
 dir_wallpaper=/usr/share/wallpapers