RPM Packaging: update tdemultimedia

19 files changed, 58 insertions, 3226 deletions

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 48b6bd825..22fbc9611 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -201,12 +201,18 @@ BuildRequires: libXt-devel
 %endif
 
 # XMU support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
 BuildRequires: libXmu-devel
 %endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
 BuildRequires: libxmu-devel
 %endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
+%endif
 
 # XI support
 %if 0%{?rhel} == 4
diff --git a/redhat/tdegraphics/kdegraphics-3.5.12.spec b/redhat/tdegraphics/kdegraphics-3.5.12.spec
deleted file mode 100644
index d43b5315a..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.12.spec
+++ /dev/null
@@ -1,369 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 3
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-kdegraphics
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{_variant}
-License:	GPL
-Summary:    K Desktop Environment - Graphics Applications
-
-Group:      Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdegraphics-%{version}.tar.gz
-
-# Official TDE patches (from SVN)
-#  Fix kdegraphics FTBFS under gcc4.6
-#  Thanks to David Rankin for the patch!
-Patch0:		r1242777.diff
-
-# [kdegraphics/kviewshell]: GCC >= 4.5 fix
-#   avoid "documentWidget.cpp:290:70: error: taking address of temporary"
-Patch1:		kdegraphics-documentwidget-gcc45.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: gettext
-BuildRequires: libmng-devel
-BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
-BuildRequires: libungif-devel
-BuildRequires: automake libtool
-BuildRequires: gphoto2-devel
-BuildRequires: sane-backends-devel
-BuildRequires: libusb-devel
-
-
-# kgamma
-BuildRequires: libXxf86vm-devel
-# kuickshow
-BuildRequires: imlib-devel
-#kfile-plugin
-BuildRequires: OpenEXR-devel
-# kpdf
-BuildRequires: freetype-devel
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: poppler-qt-devel
-%else
-BuildRequires: poppler-devel
-%endif
-BuildRequires: libpaper-devel
-# ksvg
-BuildRequires: fontconfig-devel
-BuildRequires: fribidi-devel
-BuildRequires: lcms-devel
-BuildRequires: libart_lgpl-devel
-BuildRequires: libXmu-devel
-# kpovmodeler
-BuildRequires: libGL-devel libGLU-devel libXi-devel
-
-Requires: tqtinterface
-Requires: trinity-arts
-Requires: trinity-kdelibs
-Requires: ghostscript
-Requires: %{name}-libs = %{version}-%{release}
-
-%if "%{_prefix}" == "/usr"
-Provides: kdegraphics3 = %{version}-%{release}
-Conflicts: kdegraphics
-%endif
-
-%description
-Graphics applications for the K Desktop Environment, including
-* kamera (digital camera support)
-* kcoloredit (palette editor and color chooser)
-* kdvi (displays TeX .dvi files)
-* kghostview (displays postscript files)
-* kiconedit (icon editor)
-* kooka (scanner application)
-* kpdf (displays PDF files)
-* kruler (screen ruler and color measurement tool)
-* ksnapshot (screen capture utility)
-* kview (image viewer for GIF, JPEG, TIFF, etc.)
-
-%package devel
-Summary: Development files for %{name} 
-Provides: kdegraphics3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Group: Development/Libraries
-%description devel
-%{summary}.
-
-## FIXME: move more stuff to -extras
-%package extras
-Summary: Extra applications from %{name} 
-Group: Applications/Multimedia
-Requires: %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description extras
-%{summary}, including:
-* kfax
-* kfaxview
-* kpovmodler
-
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-kdelibs >= %{version}
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-
-
-%prep
-%setup -q -n kdegraphics
-%patch0 -p1
-%patch1 -p1
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --disable-debug \
-   --disable-warnings \
-   --enable-final \
-   --includedir=%{_includedir}/kde \
-   --with-xinerama \
-   --with-extra-includes=%{_includedir}/tqt
-
-%if 0%{?fedora} >= 15
-# Ugly fix for kolourpaint - problem when linking libkdefx.so
-sed -i kolourpaint/Makefile \
-  -e 's,\($(kolourpaint_LINK) $(kolourpaint_OBJECTS) $(kolourpaint_LDADD) \)\($(LIBS)\),\1 -lkdefx \2,'
-  
-# Another ugly fix for kpdf - problem when linking fontconfig
-sed -i kpdf/Makefile \
-  -e '/^LDFLAGS = .*/ s,$, -lfontconfig,'
-%endif
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-%__make install DESTDIR=%{buildroot}
-
-# locale's
-%find_lang %{name} || touch %{name}.lang
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# rpmdocs
-for dir in k* ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    if test -s "$dir/$file" ; then
-       install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-       echo "%doc rpmdocs/$dir/" >> %{name}.lang
-    fi
-  done
-done
-
-# unpackaged files
-# omit kpovmodeler-devel files (for now) -- Rex
-rm -f %{buildroot}/libkpovmodeler.so
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-%post extras
-/sbin/ldconfig ||:
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun extras
-/sbin/ldconfig ||:
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-
-%files extras
-%defattr(-,root,root,-)
-
-# kfax
-%doc rpmdocs/kfax/
-%{_bindir}/kfax
-%{_datadir}/applications/kde/kfax.desktop
-%{_datadir}/apps/kfax/
-%{_datadir}/icons/hicolor/??x??/apps/kfax.png
-%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz
-
-# kfaxview
-%{_bindir}/kfaxview
-%{_libdir}/libkfaximage.so
-%{_libdir}/libkfaximage.la
-%{tde_libdir}/kfaxviewpart.*
-%{_datadir}/applications/kde/kfaxview.desktop
-%{_datadir}/apps/kfaxview/
-%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png
-%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
-%{_datadir}/services/kfaxmultipage.desktop
-%{_datadir}/services/kfaxmultipage_tiff.desktop
-
-# kpovmodeler
-%doc rpmdocs/kpovmodeler/
-%doc %{_docdir}/HTML/en/kpovmodeler/
-%{_bindir}/kpovmodeler
-%{_libdir}/libkpovmodeler.so.*
-%{_libdir}/libkpovmodeler.la
-%{tde_libdir}/libkpovmodelerpart.*
-%{_datadir}/applications/kde/kpovmodeler.desktop
-%{_datadir}/apps/kpovmodeler/
-%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
-%{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%doc rpmdocs/*
-
-# kfax
-%exclude %{_bindir}/kfax
-%exclude %{_datadir}/applications/kde/kfax.desktop
-%exclude %{_datadir}/apps/kfax/
-%exclude %{_datadir}/icons/hicolor/*/apps/kfax.*
-
-# kfaxview
-%exclude %{_bindir}/kfaxview
-%exclude %{_libdir}/libkfaximage.so
-%exclude %{_libdir}/libkfaximage.la
-%exclude %{tde_libdir}/kfaxviewpart.*
-%exclude %{_datadir}/applications/kde/kfaxview.desktop
-%exclude %{_datadir}/apps/kfaxview/
-%exclude %{_datadir}/icons/hicolor/*/apps/kfaxview.*
-%exclude %{_datadir}/services/kfaxmultipage.desktop
-%exclude %{_datadir}/services/kfaxmultipage_tiff.desktop
-
-# kpovmodeler
-%exclude %{tde_docdir}/HTML/en/kpovmodeler/
-%exclude %{_bindir}/kpovmodeler
-%exclude %{_libdir}/libkpovmodeler.*
-%exclude %{tde_libdir}/libkpovmodelerpart.*
-%exclude %{_datadir}/applications/kde/kpovmodeler.desktop
-%exclude %{_datadir}/apps/kpovmodeler/
-%exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
-%exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
-
-%{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/applnk/Graphics/*kruler.desktop
-%{_datadir}/apps/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/config*/*
-%{_datadir}/service*/*
-%{_datadir}/mimelnk/*/*
-%{_libdir}/libkdeinit_*.so
-%{tde_libdir}/*
-
-%files libs
-%defattr(-,root,root,-)
-%exclude %{_libdir}/libkfaximage.la
-%exclude %{_libdir}/libkpovmodeler.la
-%exclude %{_libdir}/libkpovmodeler.so.*
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-# Why ???
-%{_libdir}/libdjvu.so
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/kde/*
-%{_libdir}/lib*.so
-#exclude %{_libdir}/libkpovmodeler.so
-%exclude %{_libdir}/libkfaximage.so
-%exclude %{_libdir}/libkdeinit_*.so
-%exclude %{_libdir}/libdjvu.so
-
-%changelog
-* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Add support for RHEL5
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2 
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add fix for Fedora 15
-- Add 'patch0' and 'patch1' for GCC >= 4.5
-- Correct macro to install under "/opt", if desired
-
-* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial release for RHEL 6.0
-- SPEC file taken from Fedora 8 "kdegraphics 7:3.5.10-1"
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-add_poppler_tqt_pc.patch b/redhat/tdegraphics/kdegraphics-3.5.13-add_poppler_tqt_pc.patch
deleted file mode 100644
index 210b425e6..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-add_poppler_tqt_pc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit b2d01d000c11d7c0dd183e1af059f81ac5249c25
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1339541595 -0500
-
-    Add poppler-tqt.pc file
-
-diff --git a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
-index d07e813..42d50a8 100644
---- a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
-+++ b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
-@@ -28,6 +28,12 @@ link_directories(
-   ${TQT_LIBRARY_DIRS}
- )
- 
-+##### pc files ##################################
-+
-+configure_file( poppler-tqt.pc.cmake poppler-tqt.pc @ONLY )
-+
-+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-tqt.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
-+
- ##### headers ###################################
- 
- install( FILES
-diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
-new file mode 100644
-index 0000000..ce2b40d
---- /dev/null
-+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
-@@ -0,0 +1,12 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: poppler-tqt
-+Description: TQt bindings for poppler
-+Version: @POPPLER_VERSION@
-+Requires: poppler = @POPPLER_VERSION@
-+
-+Libs: -L${libdir} -lpoppler-tqt
-+Cflags: -I${includedir}
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-disable_kuickshow_doc.patch b/redhat/tdegraphics/kdegraphics-3.5.13-disable_kuickshow_doc.patch
deleted file mode 100644
index b33ee2b8d..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-disable_kuickshow_doc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdegraphics/doc/kuickshow/CMakeLists.txt.ORI	2012-08-02 20:57:35.855904888 +0000
-+++ kdegraphics/doc/kuickshow/CMakeLists.txt	2012-08-02 20:57:53.872026818 +0000
-@@ -9,4 +9,6 @@
- #
- #################################################
- 
--tde_create_handbook( DESTINATION kuickshow )
-+if( BUILD_KUICKSHOW )
-+  tde_create_handbook( DESTINATION kuickshow )
-+endif( )
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-disable_poppler.patch b/redhat/tdegraphics/kdegraphics-3.5.13-disable_poppler.patch
deleted file mode 100644
index 502972e7b..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-disable_poppler.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdegraphics.ORI/kfile-plugins/dependencies/CMakeLists.txt	2011-07-31 08:24:04.000000000 +0200
-+++ kdegraphics/kfile-plugins/dependencies/CMakeLists.txt	2011-10-30 14:42:03.000000000 +0100
-@@ -9,4 +9,6 @@
- #
- #################################################
- 
--add_subdirectory( poppler-tqt )
-\ Pas de fin de ligne à la fin du fichier.
-+if( WITH_PDF )
-+  add_subdirectory( poppler-tqt )
-+endif ( )
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-fix_corrupt_image_file.patch b/redhat/tdegraphics/kdegraphics-3.5.13-fix_corrupt_image_file.patch
deleted file mode 100644
index cb123f90f..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-fix_corrupt_image_file.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit d655a9f8e32b1e948f54eb8e0f33b5de629e25b3
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1340997300 -0500
-
-    Fix corrupt image file.
-    Thanks to E. Liddell.
-
-diff --git a/ksvg/test/tiger.svg b/ksvg/test/tiger.svg
-index f2c1391..4a2e3b5 100644
---- a/ksvg/test/tiger.svg
-+++ b/ksvg/test/tiger.svg
-@@ -1,4 +1,4 @@
--<svg>
-+<svg xmlns="http://www.w3.org/2000/svg">
-  <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
-   <path d="M-122.304 84.285C-122.304 84.285 -122.203 86.179 -123.027 86.16C-123.851 86.141 -140.305 38.066 -160.833 40.309C-160.833 40.309 -143.05 32.956 -122.304 84.285z"/>
-  </g>
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-fix_gcc47_compilation.patch b/redhat/tdegraphics/kdegraphics-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 38300d75d..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,307 +0,0 @@
---- kdegraphics/kmrml/kmrml/mrml_elements.h.ORI	2012-04-25 23:02:52.323845593 +0200
-+++ kdegraphics/kmrml/kmrml/mrml_elements.h	2012-04-25 23:03:23.373552145 +0200
-@@ -157,7 +157,7 @@
-                 TQDomElement elem = list.item( i ).toElement();
-                 t item( elem );
-                 if ( item.isValid() )
--                    append( item );
-+                    this->append( item );
-             }
-         }
- 
---- kdegraphics/kviewshell/plugins/djvu/libdjvu/GContainer.h.gcc47	2011-08-13 08:06:40.000000000 +0200
-+++ kdegraphics/kviewshell/plugins/djvu/libdjvu/GContainer.h	2012-04-25 23:15:09.391133568 +0200
-@@ -133,6 +133,93 @@
-     #$Id: GContainer.h,v 1.15 2004/05/13 15:16:34 leonb Exp $# */
- //@{
- 
-+// ------------------------------------------------------------
-+// HASH FUNCTIONS
-+// ------------------------------------------------------------
-+
-+
-+/** @name Hash functions
-+    These functions let you use template class \Ref{GMap} with the
-+    corresponding elementary types. The returned hash code may be reduced to
-+    an arbitrary range by computing its remainder modulo the upper bound of
-+    the range.
-+    @memo Hash functions for elementary types. */
-+//@{
-+
-+/** Hashing function (unsigned int). */
-+static inline unsigned int 
-+hash(const unsigned int & x) 
-+{ 
-+  return x; 
-+}
-+
-+/** Hashing function (int). */
-+static inline unsigned int 
-+hash(const int & x) 
-+{ 
-+  return (unsigned int)x;
-+}
-+
-+/** Hashing function (long). */
-+static inline unsigned int
-+hash(const long & x) 
-+{ 
-+  return (unsigned int)x;
-+}
-+
-+/** Hashing function (unsigned long). */
-+static inline unsigned int
-+hash(const unsigned long & x) 
-+{ 
-+  return (unsigned int)x;
-+}
-+
-+/** Hashing function (void *). */
-+static inline unsigned int 
-+hash(void * const & x) 
-+{ 
-+  return (unsigned long) x; 
-+}
-+
-+/** Hashing function (const void *). */
-+static inline unsigned int 
-+hash(const void * const & x) 
-+{ 
-+  return (unsigned long) x; 
-+}
-+
-+/** Hashing function (float). */
-+static inline unsigned int
-+hash(const float & x) 
-+{ 
-+  // optimizer will get rid of unnecessary code  
-+  unsigned int *addr = (unsigned int*)&x;
-+  if (sizeof(float)<2*sizeof(unsigned int))
-+    return addr[0];
-+  else
-+    return addr[0]^addr[1];
-+}
-+
-+/** Hashing function (double). */
-+static inline unsigned int
-+hash(const double & x) 
-+{ 
-+  // optimizer will get rid of unnecessary code
-+  unsigned int *addr = (unsigned int*)&x;
-+  if (sizeof(double)<2*sizeof(unsigned int))
-+    return addr[0];
-+  else if (sizeof(double)<4*sizeof(unsigned int))
-+    return addr[0]^addr[1];
-+  else
-+    return addr[0]^addr[1]^addr[2]^addr[3];    
-+}
-+
-+
-+//@}
-+//@}
-+//@}
-+
-+// ------------ THE END
- 
- 
- // ------------------------------------------------------------
-@@ -887,21 +974,21 @@
-   /** Inserts an element after the last element of the list. 
-       The new element is initialized with a copy of argument #elt#. */
-   void append(const TYPE &elt)
--    { GListImpl<TI>::append(newnode((const TI&)elt)); }
-+    { GListImpl<TI>::append(this->newnode((const TI&)elt)); }
-   /** Inserts an element before the first element of the list. 
-       The new element is initialized with a copy of argument #elt#. */
-   void prepend(const TYPE &elt)
--    { GListImpl<TI>::prepend(newnode((const TI&)elt)); }
-+    { GListImpl<TI>::prepend(this->newnode((const TI&)elt)); }
-   /** Inserts a new element after the list element at position #pos#.  When
-       position #pos# is null the element is inserted at the beginning of the
-       list.  The new element is initialized with a copy of #elt#. */
-   void insert_after(GPosition pos, const TYPE &elt)
--    { GListImpl<TI>::insert_after(pos, newnode((const TI&)elt)); }
-+    { GListImpl<TI>::insert_after(pos, this->newnode((const TI&)elt)); }
-   /** Inserts a new element before the list element at position #pos#. When
-       position #pos# is null the element is inserted at the end of the
-       list. The new element is initialized with a copy of #elt#. */
-   void insert_before(GPosition pos, const TYPE &elt)
--    { GListImpl<TI>::insert_before(pos, newnode((const TI&)elt)); }
-+    { GListImpl<TI>::insert_before(pos, this->newnode((const TI&)elt)); }
-   /** Inserts an element of another list into this list.  This function
-       removes the element at position #frompos# in list #frompos#, inserts it
-       in the current list before the element at position #pos#, and advances
-@@ -1039,7 +1126,7 @@
-   GPosition contains(const K &key) const 
-     { return GPosition( get(key), (void*)this); }
-   void del(const K &key) 
--    { deletenode(get(key)); }
-+    { this->deletenode(this->get(key)); }
- };
- 
- template<class K>
-@@ -1067,7 +1154,7 @@
- template<class K> GCONT HNode *
- GSetImpl<K>::get_or_throw(const K &key) const
- { 
--  HNode *m = get(key);
-+  HNode *m = this->get(key);
-   if (!m)
-   {
-     G_THROW( ERR_MSG("GContainer.cannot_add") );
-@@ -1078,14 +1165,14 @@
- template<class K> inline GCONT HNode *
- GSetImpl<K>::get_or_throw(const K &key) const
- { 
--  return get(key);
-+  return this->get(key);
- }
- #endif
- 
- template<class K> GCONT HNode *
- GSetImpl<K>::get_or_create(const K &key)
- {
--  HNode *m = get(key);
-+  HNode *m = this->get(key);
-   if (m) return m;
-   SNode *n = (SNode*) operator new (sizeof(SNode));
- #if GCONTAINER_ZERO_FILL
-@@ -1093,7 +1180,7 @@
- #endif
-   new ((void*)&(n->key)) K ( key );
-   n->hashcode = hash((const K&)(n->key));
--  installnode(n);
-+  this->installnode(n);
-   return n;
- }
- 
-@@ -1122,7 +1209,7 @@
- template<class K, class TI> GCONT HNode *
- GMapImpl<K,TI>::get_or_create(const K &key)
- {
--  GCONT HNode *m = get(key);
-+  GCONT HNode *m = this->get(key);
-   if (m) return m;
-   MNode *n = (MNode*) operator new (sizeof(MNode));
- #if GCONTAINER_ZERO_FILL
-@@ -1131,7 +1218,7 @@
-   new ((void*)&(n->key)) K  (key);
-   new ((void*)&(n->val)) TI ();
-   n->hashcode = hash((const K&)(n->key));
--  installnode(n);
-+  this->installnode(n);
-   return n;
- }
- 
-@@ -1197,13 +1284,13 @@
-       contains key #key#. This variant of #operator[]# is necessary when
-       dealing with a #const GMAP<KTYPE,VTYPE>#. */
-   const VTYPE& operator[](const KTYPE &key) const
--    { return (const VTYPE&)(((const typename GMapImpl<KTYPE,TI>::MNode*)(get_or_throw(key)))->val); }
-+    { return (const VTYPE&)(((const typename GMapImpl<KTYPE,TI>::MNode*)(this->get_or_throw(key)))->val); }
-   /** Returns a reference to the value of the map entry for key #key#.  This
-       reference can be used for both reading (as "#a[n]#") and modifying (as
-       "#a[n]=v#"). If there is no entry for key #key#, a new entry is created
-       for that key with the null constructor #VTYPE::VTYPE()#. */
-   VTYPE& operator[](const KTYPE &key)
--    { return (VTYPE&)(((typename GMapImpl<KTYPE,TI>::MNode*)(get_or_create(key)))->val); }
-+    { return (VTYPE&)(((typename GMapImpl<KTYPE,TI>::MNode*)(this->get_or_create(key)))->val); }
-   /** Destroys the map entry for position #pos#.  
-       Nothing is done if position #pos# is not a valid position. */
-   void del(GPosition &pos)
-@@ -1266,95 +1353,6 @@
- };
- 
- 
--// ------------------------------------------------------------
--// HASH FUNCTIONS
--// ------------------------------------------------------------
--
--
--/** @name Hash functions
--    These functions let you use template class \Ref{GMap} with the
--    corresponding elementary types. The returned hash code may be reduced to
--    an arbitrary range by computing its remainder modulo the upper bound of
--    the range.
--    @memo Hash functions for elementary types. */
--//@{
--
--/** Hashing function (unsigned int). */
--static inline unsigned int 
--hash(const unsigned int & x) 
--{ 
--  return x; 
--}
--
--/** Hashing function (int). */
--static inline unsigned int 
--hash(const int & x) 
--{ 
--  return (unsigned int)x;
--}
--
--/** Hashing function (long). */
--static inline unsigned int
--hash(const long & x) 
--{ 
--  return (unsigned int)x;
--}
--
--/** Hashing function (unsigned long). */
--static inline unsigned int
--hash(const unsigned long & x) 
--{ 
--  return (unsigned int)x;
--}
--
--/** Hashing function (void *). */
--static inline unsigned int 
--hash(void * const & x) 
--{ 
--  return (unsigned long) x; 
--}
--
--/** Hashing function (const void *). */
--static inline unsigned int 
--hash(const void * const & x) 
--{ 
--  return (unsigned long) x; 
--}
--
--/** Hashing function (float). */
--static inline unsigned int
--hash(const float & x) 
--{ 
--  // optimizer will get rid of unnecessary code  
--  unsigned int *addr = (unsigned int*)&x;
--  if (sizeof(float)<2*sizeof(unsigned int))
--    return addr[0];
--  else
--    return addr[0]^addr[1];
--}
--
--/** Hashing function (double). */
--static inline unsigned int
--hash(const double & x) 
--{ 
--  // optimizer will get rid of unnecessary code
--  unsigned int *addr = (unsigned int*)&x;
--  if (sizeof(double)<2*sizeof(unsigned int))
--    return addr[0];
--  else if (sizeof(double)<4*sizeof(unsigned int))
--    return addr[0]^addr[1];
--  else
--    return addr[0]^addr[1]^addr[2]^addr[3];    
--}
--
--
--//@}
--//@}
--//@}
--
--// ------------ THE END
--
--
- #ifdef HAVE_NAMESPACES
- }
- # ifndef NOT_USING_DJVU_NAMESPACE
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-fix_poppler_include_dir.patch b/redhat/tdegraphics/kdegraphics-3.5.13-fix_poppler_include_dir.patch
deleted file mode 100644
index 1aac35f78..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-fix_poppler_include_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI	2012-08-01 19:42:18.057554419 +0200
-+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt	2012-08-01 19:42:28.320371892 +0200
-@@ -38,7 +38,7 @@
- 
- install( FILES
-     poppler-qt.h poppler-page-transition.h poppler-link-qt3.h
--  DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
-+  DESTINATION ${INCLUDE_INSTALL_DIR} )
- 
- ##### poppler-tqt (shared) ############################
- 
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-fix_poppler_support.patch b/redhat/tdegraphics/kdegraphics-3.5.13-fix_poppler_support.patch
deleted file mode 100644
index 39a151d64..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-fix_poppler_support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- kdegraphics/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake.ORI	2012-05-06 19:23:47.668667462 +0200
-+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake	2012-05-06 19:21:43.311268611 +0200
-@@ -1,3 +1,13 @@
-+# Poppler
-+if( BUILD_KPDF )
-+  pkg_search_module( POPPLER poppler )
-+  if( POPPLER_FOUND )
-+    set( HAVE_POPPLER 1 )
-+  else( )
-+    tde_message_fatal( "poppler is required, but was not found on your system" )
-+  endif( )
-+endif( )
-+
- tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
- set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
- set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} "-lpoppler" )
---- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI	2012-05-06 19:24:31.405752482 +0200
-+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt	2012-05-06 19:22:12.544657204 +0200
-@@ -21,7 +21,7 @@
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-   ${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
--  /usr/include/poppler
-+  ${POPPLER_INCLUDE_DIRS}
- )
- 
- link_directories(
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch b/redhat/tdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch
deleted file mode 100644
index ba18d0b3d..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nuar kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake kdegraphics/kpovmodeler/ConfigureChecks.cmake
---- kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake	2011-05-11 22:40:19.000000000 +0200
-+++ kdegraphics/kpovmodeler/ConfigureChecks.cmake	2011-10-30 14:00:54.000000000 +0100
-@@ -12,7 +12,10 @@
- # glu
- pkg_search_module( GLU glu )
- if( NOT GLU_FOUND )
--  tde_message_fatal( "glu is required, but was not found on your system" )
-+  check_include_file ( GL/glu.h HAVE_GLU )
-+  if( NOT HAVE_GLU )
-+    tde_message_fatal( "glu is required, but was not found on your system" )
-+  endif ( )
- endif( )
- 
- 
-kfile-plugins/dependencies/poppler-tqt/CMakeFiles/poppler-tqt-shared.dir/build.make
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch b/redhat/tdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch
deleted file mode 100644
index 84b7b6e4a..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdegraphics/kpovmodeler/ConfigureChecks.cmake.ORI	2011-11-02 21:57:05.000000000 +0100
-+++ kdegraphics/kpovmodeler/ConfigureChecks.cmake	2011-11-02 21:57:49.000000000 +0100
-@@ -16,6 +16,7 @@
-   if( NOT HAVE_GLU )
-     tde_message_fatal( "glu is required, but was not found on your system" )
-   endif ( )
-+  set( GLU_LIBRARIES "-lGL -lGLU" )
- endif( )
- 
- 
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch b/redhat/tdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch
deleted file mode 100644
index c0e6e3da2..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar kdegraphics.ORI/ksnapshot/CMakeLists.txt kdegraphics/ksnapshot/CMakeLists.txt
---- kdegraphics.ORI/ksnapshot/CMakeLists.txt	2011-05-11 23:29:40.000000000 +0200
-+++ kdegraphics/ksnapshot/CMakeLists.txt	2011-10-31 15:45:47.107958154 +0100
-@@ -40,6 +40,6 @@
-   SOURCES
-     ksnapshotiface.skel main.cpp ksnapshot.cpp regiongrabber.cpp
-     windowgrabber.cpp ksnapshotwidget.ui
--  LINK kdeprint-shared
-+  LINK kdeprint-shared Xext
-   DESTINATION ${BIN_INSTALL_DIR}
- )
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch b/redhat/tdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
deleted file mode 100644
index a531fb03d..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdegraphics.ORI/kpdf/xpdf/aconf.h	2011-04-27 19:32:57.000000000 +0200
-+++ kdegraphics/kpdf/xpdf/aconf.h	2011-10-30 14:54:24.000000000 +0100
-@@ -7,7 +7,7 @@
- #define HAVE_FREETYPE_FREETYPE_H HAVE_FREETYPE
- #define OPI_SUPPORT 0
- #define TEXTOUT_WORD_LIST 0
--#define HAVE_MKSTEMPS 1 //libkdefakes provides it
-+#define HAVE_MKSTEMPS 0
- #define HAVE_SPLASH 1
- #define SPLASH_CMYK 1
- #define HAVE_XPDFCORE 0
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13.1-fix_poppler_pkgconfig.patch b/redhat/tdegraphics/kdegraphics-3.5.13.1-fix_poppler_pkgconfig.patch
deleted file mode 100644
index 0001e859f..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13.1-fix_poppler_pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kdegraphics-3.5.13.1/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake.ORI	2012-10-14 15:03:54.880338162 +0200
-+++ kdegraphics-3.5.13.1/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake	2012-10-14 15:04:12.400975329 +0200
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include/kde
-+libdir=@LIB_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
- 
- Name: poppler-tqt
- Description: TQt bindings for poppler
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13.1-fix_rhel4_libraries.patch b/redhat/tdegraphics/kdegraphics-3.5.13.1-fix_rhel4_libraries.patch
deleted file mode 100644
index 4fbcb80ad..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13.1-fix_rhel4_libraries.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- kdegraphics-3.5.13.1/kgamma/ConfigureChecks.cmake.ORI	2012-10-10 21:25:24.204928664 +0200
-+++ kdegraphics-3.5.13.1/kgamma/ConfigureChecks.cmake	2012-10-10 21:26:51.812154610 +0200
-@@ -11,10 +11,10 @@
- 
- include( CheckIncludeFileCXX )
- 
- pkg_search_module( XXF86VM xxf86vm )
- if( NOT XXF86VM_FOUND )
--  tde_message_fatal( "xxf86vm is required, but was not found on your system" )
-+  set( XXF86VM_LIBRARIES "-lXxf86vm" )
- endif( )
- 
- tde_save( CMAKE_REQUIRED_INCLUDES )
- set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
---- kdegraphics-3.5.13.1/kpovmodeler/ConfigureChecks.cmake.ORI	2012-10-10 21:33:43.491841294 +0200
-+++ kdegraphics-3.5.13.1/kpovmodeler/ConfigureChecks.cmake	2012-10-10 21:34:11.245282172 +0200
-@@ -23,5 +23,5 @@
- # xmu
- pkg_search_module( XMU xmu )
- if( NOT XMU_FOUND )
--  tde_message_fatal( "xmu is required, but was not found on your system" )
-+  set( XMU_LIBRARIES "-lXmu" )
- endif( )
---- kdegraphics-3.5.13.1/ksvg/plugin/backends/libart/GlyphTracerLibart.cpp.ORI	2012-10-11 22:17:26.285831149 +0200
-+++ kdegraphics-3.5.13.1/ksvg/plugin/backends/libart/GlyphTracerLibart.cpp	2012-10-11 22:17:31.815712301 +0200
-@@ -31,11 +31,7 @@
- 
- #include <config.h>
- 
--#ifdef HAVE_FREETYPE_2_2_x
--  #define FT_VECTOR_PARAMETER const FT_Vector
--#else
--  #define FT_VECTOR_PARAMETER FT_Vector
--#endif
-+#define FT_VECTOR_PARAMETER FT_Vector
- 
- using namespace T2P;
- 
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13.1.spec b/redhat/tdegraphics/kdegraphics-3.5.13.1.spec
deleted file mode 100644
index eaa53b7bd..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13.1.spec
+++ /dev/null
@@ -1,1312 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-tdegraphics
-Version:	3.5.13.1
-Release:	1%{?dist}%{_variant}
-License:	GPL
-Summary:    Trinity Desktop Environment - Graphics Applications
-
-Group:      Applications/Multimedia
-Prefix:		%{tde_prefix}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdegraphics-3.5.13.1.tar.gz
-
-# TDE 3.5.13
-## RHEL / Fedora specific patches
-# [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
-Patch3:		kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
-# [tdegraphics] Fix poppler include directory location
-Patch9:		kdegraphics-3.5.13-fix_poppler_include_dir.patch
-# [tdegraohics] Fix poppler include directory location (2)
-Patch10:	kdegraphics-3.5.13.1-fix_poppler_pkgconfig.patch
-
-# [tdegraphics] Fix build on RHEL4
-Patch201:	kdegraphics-3.5.13.1-fix_rhel4_libraries.patch
-
-BuildRequires: cmake >= 2.8
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
-BuildRequires: trinity-tdebase-devel >= %{version}
-BuildRequires: gettext
-BuildRequires: libmng-devel
-%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
-BuildRequires: %{_lib}png15-devel
-%else
-BuildRequires: libpng-devel
-%endif
-BuildRequires: libtiff-devel
-BuildRequires: automake libtool
-BuildRequires: libusb-devel
-BuildRequires: pcre-devel
-
-# GIF support
-%if 0%{?suse_version}
-BuildRequires: giflib-devel
-%else
-BuildRequires: libungif-devel
-%endif
-
-# GPHOTO2 support
-%if 0%{?suse_version}
-BuildRequires: libgphoto2-devel
-%else
-BuildRequires: gphoto2-devel
-%endif
-
-# PAPER support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_paper 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}paper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	libpaper-devel
-%endif
-%endif
-
-# T1LIB support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-%define with_t1lib 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}t1lib-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	t1lib-devel
-%endif
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}sane1-devel
-# kuickshow
-#BuildRequires:	%{_lib}imlib-devel
-# kpovmodeler
-BuildRequires:	%{_lib}xi-devel
-# kgamma
-BuildRequires:	%{_lib}xxf86vm-devel
-# ksvg
-BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
-# kpovmodeler
-BuildRequires:	%{_lib}mesagl1-devel
-BuildRequires:	%{_lib}mesaglu1-devel
-%else
-BuildRequires:	sane-backends-devel
-
-# kuickshow
-#BuildRequires:	imlib-devel
-
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%else
-BuildRequires: libdrm-devel
-
-# kpovmodeler
-BuildRequires:	libXi-devel
-
-# kgamma
-BuildRequires:	libXxf86vm-devel
-
-# ksvg
-BuildRequires:	libXmu-devel
-%endif
-
-# kpovmodeler
-%if 0%{?suse_version}
-BuildRequires:	Mesa-libGL-devel
-BuildRequires:	Mesa-libGLU-devel
-%else
-BuildRequires:	libGL-devel
-BuildRequires:	libGLU-devel
-%endif
-%endif
-
-#kfile-plugin
-BuildRequires:	OpenEXR-devel
-
-# kpdf
-BuildRequires: freetype-devel
-
-# poppler
-%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-BuildRequires: poppler-devel >= 0.12
-#BuildRequires:	poppler-qt-devel >= 0.12
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}poppler-devel
-%endif
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
-BuildRequires:	trinity-poppler-devel
-BuildRequires:	trinity-poppler-qt3-devel >= 0.12
-%endif
-
-# ksvg
-BuildRequires: fontconfig-devel
-%if 0%{?suse_version}
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-BuildRequires: libart_lgpl-devel
-
-# kuickshow
-BuildRequires: fribidi-devel
-
-# kamera
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-%define build_kamera 1
-%endif
-
-Obsoletes:	trinity-kdegraphics < %{version}-%{release}
-Provides:	trinity-kdegraphics = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-libs < %{version}-%{release}
-Provides:	trinity-kdegraphics-libs = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-extras < %{version}-%{release}
-Provides:	trinity-kdegraphics-extras = %{version}-%{release}
-
-
-%{?build_kamera:Requires: trinity-kamera = %{version}-%{release}}
-Requires: trinity-kcoloredit = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: trinity-kdvi = %{version}-%{release}
-Requires: trinity-kfax = %{version}-%{release}
-Requires: trinity-kfaxview = %{version}-%{release}
-Requires: trinity-kgamma = %{version}-%{release}
-Requires: trinity-kghostview = %{version}-%{release}
-Requires: trinity-kiconedit = %{version}-%{release}
-Requires: trinity-kmrml = %{version}-%{release}
-Requires: trinity-kolourpaint = %{version}-%{release}
-Requires: trinity-kooka = %{version}-%{release}
-Requires: trinity-kpdf = %{version}-%{release}
-Requires: trinity-kpovmodeler = %{version}-%{release}
-Requires: trinity-kruler = %{version}-%{release}
-Requires: trinity-ksnapshot = %{version}-%{release}
-Requires: trinity-ksvg = %{version}-%{release}
-Requires: trinity-kview = %{version}-%{release}
-Requires: trinity-kviewshell = %{version}-%{release}
-Requires: trinity-libkscan = %{version}-%{release}
-Requires: %{name}-libpoppler-tqt = %{version}-%{release}
-
-%description
-Graphics applications for the Trinity Desktop Environment, including
-%if 0%{?build_kamera}
-* kamera (digital camera support)
-%endif
-* kcoloredit (palette editor and color chooser)
-* kdvi (displays TeX .dvi files)
-* kfax
-* kfaxview
-* kghostview (displays postscript files)
-* kiconedit (icon editor)
-* kooka (scanner application)
-* kpdf (displays PDF files)
-* kpovmodler
-* kruler (screen ruler and color measurement tool)
-* ksnapshot (screen capture utility)
-* kview (image viewer for GIF, JPEG, TIFF, etc.)
-
-%files
-
-##########
-
-%if 0%{?build_kamera}
-
-%package -n trinity-kamera
-Summary:	Digital camera io_slave for Konqueror
-Group:		Applications/Graphics
-
-%description -n trinity-kamera
-This is a digital camera io_slave for TDE which uses gphoto2 and libgpio
-to allow access to your camera's pictures with the URL camera:/
-
-%post -n trinity-kamera
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kamera
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%files -n trinity-kamera
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kamera.la
-%{tde_tdelibdir}/kcm_kamera.so
-%{tde_tdelibdir}/kio_kamera.la
-%{tde_tdelibdir}/kio_kamera.so
-%{tde_tdeappdir}/kamera.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png
-%{tde_datadir}/icons/crystalsvg/*/apps/camera.png
-%{tde_datadir}/icons/crystalsvg/*/devices/camera.png
-%{tde_datadir}/icons/crystalsvg/*/filesystems/camera.png
-%{tde_datadir}/services/camera.protocol
-%{tde_tdedocdir}/HTML/en/kamera/
-
-%endif
-
-##########
-
-%package -n trinity-kcoloredit
-Summary:	A color palette editor and color picker for TDE
-Group:		Applications/Graphics
-
-%description -n trinity-kcoloredit
-This package contains two programs, a color palette editor and also a color
-picker.
-
-%files -n trinity-kcoloredit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcolorchooser
-%{tde_bindir}/kcoloredit
-%{tde_tdeappdir}/kcolorchooser.desktop
-%{tde_tdeappdir}/kcoloredit.desktop
-%{tde_datadir}/apps/kcoloredit/kcoloreditui.rc
-%{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
-%{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
-%{tde_tdedocdir}/HTML/en/kcoloredit/
-
-%post -n trinity-kcoloredit
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcoloredit
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package kfile-plugins
-Summary:	TDE metainfo plugins for graphic files
-Group:		Environment/Libraries
- 
-%description kfile-plugins
-This packages provides meta information for graphic files (file sizes,
-tags, etc. all from within the file manager).
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/gsthumbnail.la
-%{tde_tdelibdir}/gsthumbnail.so
-%{tde_tdelibdir}/kfile_bmp.la
-%{tde_tdelibdir}/kfile_bmp.so
-%{tde_tdelibdir}/kfile_dds.la
-%{tde_tdelibdir}/kfile_dds.so
-%{tde_tdelibdir}/kfile_dvi.la
-%{tde_tdelibdir}/kfile_dvi.so
-%{tde_tdelibdir}/kfile_exr.la
-%{tde_tdelibdir}/kfile_exr.so
-%{tde_tdelibdir}/kfile_gif.la
-%{tde_tdelibdir}/kfile_gif.so
-%{tde_tdelibdir}/kfile_ico.la
-%{tde_tdelibdir}/kfile_ico.so
-%{tde_tdelibdir}/kfile_jpeg.la
-%{tde_tdelibdir}/kfile_jpeg.so
-%{tde_tdelibdir}/kfile_pcx.la
-%{tde_tdelibdir}/kfile_pcx.so
-%{tde_tdelibdir}/kfile_pdf.la
-%{tde_tdelibdir}/kfile_pdf.so
-%{tde_tdelibdir}/kfile_png.la
-%{tde_tdelibdir}/kfile_png.so
-%{tde_tdelibdir}/kfile_pnm.la
-%{tde_tdelibdir}/kfile_pnm.so
-%{tde_tdelibdir}/kfile_ps.la
-%{tde_tdelibdir}/kfile_ps.so
-%{tde_tdelibdir}/kfile_raw.la
-%{tde_tdelibdir}/kfile_raw.so
-%{tde_tdelibdir}/kfile_rgb.la
-%{tde_tdelibdir}/kfile_rgb.so
-%{tde_tdelibdir}/kfile_tga.la
-%{tde_tdelibdir}/kfile_tga.so
-%{tde_tdelibdir}/kfile_tiff.la
-%{tde_tdelibdir}/kfile_tiff.so
-%{tde_tdelibdir}/kfile_xbm.la
-%{tde_tdelibdir}/kfile_xbm.so
-%{tde_tdelibdir}/kfile_xpm.la
-%{tde_tdelibdir}/kfile_xpm.so
-%{tde_datadir}/services/gsthumbnail.desktop
-%{tde_datadir}/services/kfile_bmp.desktop
-%{tde_datadir}/services/kfile_dds.desktop
-%{tde_datadir}/services/kfile_dvi.desktop
-%{tde_datadir}/services/kfile_exr.desktop
-%{tde_datadir}/services/kfile_gif.desktop
-%{tde_datadir}/services/kfile_ico.desktop
-%{tde_datadir}/services/kfile_jpeg.desktop
-%{tde_datadir}/services/kfile_pcx.desktop
-%{tde_datadir}/services/kfile_pdf.desktop
-%{tde_datadir}/services/kfile_png.desktop
-%{tde_datadir}/services/kfile_pnm.desktop
-%{tde_datadir}/services/kfile_ps.desktop
-%{tde_datadir}/services/kfile_raw.desktop
-%{tde_datadir}/services/kfile_rgb.desktop
-%{tde_datadir}/services/kfile_tga.desktop
-%{tde_datadir}/services/kfile_tiff.desktop
-%{tde_datadir}/services/kfile_xbm.desktop
-%{tde_datadir}/services/kfile_xpm.desktop
-
-##########
-
-%package -n trinity-kdvi
-Summary:	Dvi viewer for TDE
-Group:		Applications/Graphics
-
-%description -n trinity-kdvi
-This program and KPart allow the user to display *.DVI files from TeX.
-
-%files -n trinity-kdvi
-%defattr(-,root,root,-)
-%{tde_bindir}/kdvi
-%{tde_tdelibdir}/kdvipart.la
-%{tde_tdelibdir}/kdvipart.so
-%{tde_tdeappdir}/kdvi.desktop
-%{tde_datadir}/apps/kdvi/
-%{tde_datadir}/config.kcfg/kdvi.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kdvi.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
-%{tde_datadir}/services/kdvimultipage.desktop
-%{tde_tdedocdir}/HTML/en/kdvi/
-
-%post -n trinity-kdvi
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdvi
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kfax
-Summary:	G3/G4 fax viewer for Trinity
-Group:		Applications/Graphics
-Requires:	libtiff
-
-%description -n trinity-kfax
-A fax viewer for Trinity, supporting the display of raw and tiffed fax images
-(g3, g3-2d, g4).
-
-%files -n trinity-kfax
-%defattr(-,root,root,-)
-%doc rpmdocs/kfax/
-%{tde_bindir}/kfax
-%{tde_tdeappdir}/kfax.desktop
-%{tde_datadir}/apps/kfax/
-%{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
-
-%post -n trinity-kfax
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfax
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kfaxview
-Summary:	G3/G4 fax viewer for Trinity using kviewshell
-Group:		Applications/Graphics
-
-%description -n trinity-kfaxview
-A fax viewer for Trinity, supporting the display of raw and tiffed fax images
-(g3, g3-2d, g4).
-
-This faxviewer uses kviewshell and is intended to replace the standalone
-kfax application once it reproduces all of kfax's features.
-
-%files -n trinity-kfaxview
-%defattr(-,root,root,-)
-%{tde_bindir}/kfaxview
-%{tde_libdir}/libkfaximage.so.*
-%{tde_tdelibdir}/kfaxviewpart.*
-%{tde_tdeappdir}/kfaxview.desktop
-%{tde_datadir}/apps/kfaxview/
-%{tde_datadir}/icons/hicolor/??x??/apps/kfaxview.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
-%{tde_datadir}/services/kfaxmultipage.desktop
-%{tde_datadir}/services/kfaxmultipage_tiff.desktop
-
-%post -n trinity-kfaxview
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kfaxview
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kgamma
-Summary:	Gamma correction module for the Trinity Control Center
-Group:		Applications/Graphics
-
-%description -n trinity-kgamma
-KGamma is a Trinity Control Center module for gamma calibration/correction
-of XFree86. With proper gamma settings, your display (websites, images,
-etc.) will look the same on your monitor as on other monitors.
-
-Homepage: http://kgamma.berlios.de/index2.php
-
-%files -n trinity-kgamma
-%defattr(-,root,root,-)
-%{tde_bindir}/xf86gammacfg
-%{tde_tdelibdir}/kcm_kgamma.la
-%{tde_tdelibdir}/kcm_kgamma.so
-%{tde_tdeappdir}/kgamma.desktop
-%{tde_datadir}/apps/kgamma/
-%{tde_datadir}/icons/hicolor/*/apps/kgamma.png
-%{tde_tdedocdir}/HTML/en/kgamma/
-
-%post -n trinity-kgamma
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgamma
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kghostview
-Summary:	PostScript viewer for Trinity
-Group:		Applications/Graphics
-Requires:	ghostscript
-
-%description -n trinity-kghostview
-KGhostview is Trinity's PostScript viewer. It is a port of Tim Theisen's
-Ghostview program which is used to view documents prepared in Adobe's
-PostScript page description language. PostScript is the major page
-description language for printing on UNIX systems, and this application is
-useful to preview material intended for printing, or for reading documents
-online.
-
-%files -n trinity-kghostview
-%defattr(-,root,root,-)
-%{tde_bindir}/kghostview
-%{tde_tdelibdir}/libkghostviewpart.la
-%{tde_tdelibdir}/libkghostviewpart.so
-%{tde_libdir}/libkghostviewlib.so.*
-%{tde_tdeappdir}/kghostview.desktop
-%{tde_datadir}/apps/kconf_update/kghostview.upd
-%{tde_datadir}/apps/kconf_update/update-to-xt-names.pl
-%{tde_datadir}/apps/kghostview/
-%{tde_datadir}/config.kcfg/kghostview.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kghostview.png
-%{tde_datadir}/services/kghostview_part.desktop
-%{tde_tdedocdir}/HTML/en/kghostview/
-
-%post -n trinity-kghostview
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kghostview
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kiconedit
-Summary:	An icon editor for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kiconedit
-KIconedit allows you easily to create and edit icons.
-
-%files -n trinity-kiconedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kiconedit
-%{tde_tdeappdir}/kiconedit.desktop
-%{tde_datadir}/apps/kiconedit/
-%{tde_datadir}/icons/hicolor/*/apps/kiconedit.png
-%{tde_tdedocdir}/HTML/en/kiconedit/
-
-%post -n trinity-kiconedit
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kiconedit
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmrml
-Summary: 	A Konqueror plugin for searching pictures
-Group:		Applications/Graphics
-
-%description -n trinity-kmrml
-MRML is short for Multimedia Retrieval Markup Language, which defines a
-protocol for querying a server for images based on their content. See 
-http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an 
-MRML server.
-
-%files -n trinity-kmrml
-%defattr(-,root,root,-)
-%{tde_bindir}/mrmlsearch
-%{tde_tdelibdir}/kcm_kmrml.la
-%{tde_tdelibdir}/kcm_kmrml.so
-%{tde_tdelibdir}/kded_daemonwatcher.la
-%{tde_tdelibdir}/kded_daemonwatcher.so
-%{tde_tdelibdir}/kio_mrml.la
-%{tde_tdelibdir}/kio_mrml.so
-%{tde_tdelibdir}/libkmrmlpart.la
-%{tde_tdelibdir}/libkmrmlpart.so
-%{tde_tdelibdir}/mrmlsearch.la
-%{tde_tdelibdir}/mrmlsearch.so
-%{tde_libdir}/lib[kt]deinit_mrmlsearch.so
-%{tde_tdeappdir}/kcmkmrml.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
-%{tde_datadir}/mimelnk/text/mrml.desktop
-%{tde_datadir}/services/kded/daemonwatcher.desktop
-%{tde_datadir}/services/mrml.protocol
-%{tde_datadir}/services/mrml_part.desktop
-
-%post -n trinity-kmrml
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kmrml
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kolourpaint
-Summary:	A simple paint program for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kolourpaint
-KolourPaint is a very simple paint program for Trinity. It aims to be
-conceptually simple to understand; providing a level of functionality
-targeted towards the average user. It's designed for daily tasks like:
-
-* Painting - drawing diagrams and "finger painting" 
-* Image Manipulation - editing screenshots and photos; applying effects 
-* Icon Editing - drawing clipart and logos with transparency 
-
-It's not an unusable and monolithic program where simple tasks like
-drawing lines become near impossible. Nor is it so simple that it lacks
-essential features like Undo/Redo.
-
-Homepage: http://kolourpaint.sourceforge.net
-
-%files -n trinity-kolourpaint
-%defattr(-,root,root,-)
-%{tde_bindir}/kolourpaint
-%{tde_tdeappdir}/kolourpaint.desktop
-%{tde_datadir}/apps/kolourpaint/
-%{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
-%{tde_tdedocdir}/HTML/en/kolourpaint/
-
-%post -n trinity-kolourpaint
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kolourpaint
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kooka
-Summary:	Scanner program for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kooka
-Kooka is an open source GNU/Linux scan program based on SANE and
-KScan library.
-
-Kooka helps you to handle the most important scan parameters, find the
-correct image file format to save and manage your scanned images. It
-offers support for different OCR modules. Libkscan, a autonomous part
-of Kooka, provides a scan service for easy and consistent use to all
-KDE applications.
-
-Install ocrad or gocr if you wish to enable optical character recognition
-in kooka.
-
-Homepage: http://kooka.kde.org/
-
-%files -n trinity-kooka
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kookarc
-%{tde_bindir}/kooka
-%{tde_tdeappdir}/kooka.desktop
-%{tde_datadir}/apps/kooka/
-%{tde_tdedocdir}/HTML/en/kooka/
-
-%post -n trinity-kooka
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kooka
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kpdf
-Summary:	PDF viewer for Trinity
-Group:		Applications/Graphics
-#Recommends: kghostview-trinity (= ${binary:Version})
-
-%description -n trinity-kpdf
-KPDF allows you to view PDF (Portable Document Format) files. This package
-includes kpdfpart so you can embed in konqueror or run as a standalone
-application.
-
-%files -n trinity-kpdf
-%defattr(-,root,root,-)
-%{tde_bindir}/kpdf
-%{tde_tdelibdir}/libkpdfpart.la
-%{tde_tdelibdir}/libkpdfpart.so
-%{tde_tdeappdir}/kpdf.desktop
-%{tde_datadir}/apps/kpdf/shell.rc
-%{tde_datadir}/apps/kpdfpart/part.rc
-%{tde_datadir}/config.kcfg/kpdf.kcfg
-%{tde_tdedocdir}/HTML/en/kpdf/
-%{tde_datadir}/icons/hicolor/*/apps/kpdf.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
-%{tde_datadir}/services/kpdf_part.desktop
-
-%post -n trinity-kpdf
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpdf
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kpovmodeler
-Summary:	A graphical editor for povray scenes
-Group:		Applications/Graphics
-#Requires:	povray
-
-%description -n trinity-kpovmodeler
-KPovmodeler is KDE's graphical editor for povray scenes. KPovModeler is a
-modeling and composition program for creating POV-Ray scenes in KDE.
-
-For most modelers, POV-Ray is nothing but a rendering engine. This greatly
-limits the innate possibilities of the POV-Ray scripted language. This
-is not the case for KPovModeler, which allows you to use all the features
-of POV-Ray through the translation of POV-Ray language into a graphical
-tree.
-
-kpovmodeler uses the povray package, currently available only in Debian's
-non-free, unsupported repository.
-
-Homepage: http://www.kpovmodeler.org
-
-%files -n trinity-kpovmodeler
-%defattr(-,root,root,-)
-%doc rpmdocs/kpovmodeler/
-%{tde_bindir}/kpovmodeler
-%{tde_libdir}/libkpovmodeler.so.*
-%{tde_tdelibdir}/libkpovmodelerpart.*
-%{tde_tdeappdir}/kpovmodeler.desktop
-%{tde_datadir}/apps/kpovmodeler/
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
-%{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
-%doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
-
-%post -n trinity-kpovmodeler
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kpovmodeler
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kruler
-Summary:	A screen ruler and color measurement tool for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kruler
-Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
-
-%files -n trinity-kruler
-%defattr(-,root,root,-)
-%{tde_bindir}/kruler
-%{tde_tdeappdir}/kruler.desktop
-%{tde_datadir}/applnk/Graphics/kruler.desktop
-%{tde_datadir}/apps/kruler/
-%{tde_datadir}/icons/hicolor/*/apps/kruler.png
-%{tde_tdedocdir}/HTML/en/kruler/
-
-%post -n trinity-kruler
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kruler
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksnapshot
-Summary:	Screenshot utility for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-ksnapshot
-KSnapshot is a simple applet for taking screenshots. It is capable of 
-capturing images of either the whole desktop or just a single window. 
-The images can then be saved in a variety of formats.
-
-%files -n trinity-ksnapshot
-%defattr(-,root,root,-)
-%{tde_bindir}/ksnapshot
-%{tde_tdeappdir}/ksnapshot.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
-%{tde_tdedocdir}/HTML/en/ksnapshot/
-
-%post -n trinity-ksnapshot
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksnapshot
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksvg
-Summary:	SVG viewer for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-ksvg
-KSVG allows you view SVG (scalable vector graphics) files. This package
-includes kpart so you can embed it in konqueror and a standalone
-application.
-
-%files -n trinity-ksvg
-%defattr(-,root,root,-)
-%{tde_bindir}/printnodetest
-%{tde_bindir}/svgdisplay
-%{tde_tdelibdir}/libksvgplugin.la
-%{tde_tdelibdir}/libksvgplugin.so
-%{tde_tdelibdir}/libksvgrendererlibart.la
-%{tde_tdelibdir}/libksvgrendererlibart.so
-%{tde_tdelibdir}/svgthumbnail.la
-%{tde_tdelibdir}/svgthumbnail.so
-%{tde_libdir}/libksvg.so.0
-%{tde_libdir}/libksvg.so.0.0.1
-%{tde_libdir}/libtext2path.so.0
-%{tde_libdir}/libtext2path.so.0.0.0
-%{tde_datadir}/apps/ksvg/ksvgplugin.rc
-%{tde_datadir}/services/ksvglibartcanvas.desktop
-%{tde_datadir}/services/ksvgplugin.desktop
-%{tde_datadir}/services/svgthumbnail.desktop
-%{tde_datadir}/servicetypes/ksvgrenderer.desktop
-
-%post -n trinity-ksvg
-/sbin/ldconfig || :
-
-%postun -n trinity-ksvg
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kview
-Summary:	Simple image viewer/converter for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kview
-KView is a simple image viewer and converter application. It supports
-a number of plugins, which add an array of basic editing capabilities
-as well.
-
-%files -n trinity-kview
-%defattr(-,root,root,-)
-%{tde_bindir}/kview
-%{tde_tdelibdir}/kcm_kviewcanvasconfig.la
-%{tde_tdelibdir}/kcm_kviewcanvasconfig.so
-%{tde_tdelibdir}/kcm_kviewgeneralconfig.la
-%{tde_tdelibdir}/kcm_kviewgeneralconfig.so
-%{tde_tdelibdir}/kcm_kviewpluginsconfig.la
-%{tde_tdelibdir}/kcm_kviewpluginsconfig.so
-%{tde_tdelibdir}/kcm_kviewpresenterconfig.la
-%{tde_tdelibdir}/kcm_kviewpresenterconfig.so
-%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.la
-%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.so
-%{tde_tdelibdir}/kview.la
-%{tde_tdelibdir}/kview.so
-%{tde_tdelibdir}/kview_browserplugin.la
-%{tde_tdelibdir}/kview_browserplugin.so
-%{tde_tdelibdir}/kview_effectsplugin.la
-%{tde_tdelibdir}/kview_effectsplugin.so
-%{tde_tdelibdir}/kview_presenterplugin.la
-%{tde_tdelibdir}/kview_presenterplugin.so
-%{tde_tdelibdir}/kview_scannerplugin.la
-%{tde_tdelibdir}/kview_scannerplugin.so
-%{tde_tdelibdir}/libkviewcanvas.la
-%{tde_tdelibdir}/libkviewcanvas.so
-%{tde_tdelibdir}/libkviewviewer.la
-%{tde_tdelibdir}/libkviewviewer.so
-%{tde_libdir}/lib[kt]deinit_kview.so
-%{tde_libdir}/libkimageviewer.so.*
-%{tde_tdelibdir}/libphotobook.la
-%{tde_tdelibdir}/libphotobook.so
-%{tde_tdeappdir}/kview.desktop
-%{tde_datadir}/apps/kview/
-%{tde_datadir}/apps/kviewviewer/
-%{tde_datadir}/apps/photobook/photobookui.rc
-%{tde_datadir}/icons/crystalsvg/*/apps/photobook.png
-%{tde_datadir}/icons/hicolor/*/apps/kview.png
-%{tde_datadir}/services/kconfiguredialog/kviewcanvasconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewgeneralconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewpluginsconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewpresenterconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
-%{tde_datadir}/services/kviewcanvas.desktop
-%{tde_datadir}/services/kviewviewer.desktop
-%{tde_datadir}/services/photobook.desktop
-%{tde_datadir}/servicetypes/kimageviewer.desktop
-%{tde_datadir}/servicetypes/kimageviewercanvas.desktop
-%{tde_tdedocdir}/HTML/en/kview/
-
-%post -n trinity-kview
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kview
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kviewshell
-Summary:	Generic framework for viewer applications in Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kviewshell
-KViewShell is a generic viewing framework that allows the graphical
-applications, such as the kview image viewer, to be embedded in other
-KDE applications, such as Konqueror.
-
-KViewShell comes with a djvuviewpart plugin included, for viewing
-DjVu images.
-
-%files -n trinity-kviewshell
-%defattr(-,root,root,-)
-%{tde_bindir}/kviewshell
-%{tde_libdir}/libdjvu.la
-%{tde_libdir}/libdjvu.so
-%{tde_tdelibdir}/djvuviewpart.so
-%{tde_tdelibdir}/djvuviewpart.la
-%{tde_tdelibdir}/emptymultipagepart.la
-%{tde_tdelibdir}/emptymultipagepart.so
-%{tde_tdelibdir}/kviewerpart.la
-%{tde_tdelibdir}/kviewerpart.so
-%{tde_libdir}/libkmultipage.so.*
-%{tde_datadir}/apps/djvumultipage.rc
-%{tde_datadir}/apps/kviewerpart/
-%{tde_datadir}/apps/kviewshell/kviewshell.rc
-%{tde_datadir}/config.kcfg/djvumultipage.kcfg
-%{tde_datadir}/config.kcfg/kviewshell.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kviewshell.png
-%{tde_datadir}/services/emptymultipage.desktop
-%{tde_datadir}/services/djvumultipage.desktop
-%{tde_datadir}/servicetypes/kmultipage.desktop
-
-%post -n trinity-kviewshell
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-kviewshell
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkscan
-Summary:	Scanner library for Trinity
-Group:		Environment/Libraries
-
-%description -n trinity-libkscan
-KScan is TDE's scanner library. It's used by kooka and by koffice currently.
-It provides an easy-to-use library, which allows you to access your scanner
-(as long as it's sane compatible).
-
-%files -n trinity-libkscan
-%defattr(-,root,root,-)
-%{tde_libdir}/libkscan.so.*
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_color.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
-%{tde_datadir}/services/scanservice.desktop
-
-%post -n trinity-libkscan
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libkscan
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkscan-devel
-Summary:	Development files for the Trinity scanner library
-Group:		Development/Libraries
-
-%description -n trinity-libkscan-devel
-This package contains development files for Trinity's scanner library.
-
-%files -n trinity-libkscan-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkscan.la
-%{tde_libdir}/libkscan.so
-
-%post -n trinity-libkscan-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkscan-devel
-/sbin/ldconfig || :
-
-##########
-
-%package libpoppler-tqt
-Summary:	TQt support for Poppler
-Group:		Environment/Libraries
-Provides:	poppler-tqt = %{version}-%{release}
-
-%description libpoppler-tqt
-TQt support library for Poppler.
-This library is used by the Trinity graphics file plugins for PDF support.
-
-%files libpoppler-tqt
-%defattr(-,root,root,-)
-%{tde_libdir}/libpoppler-tqt.so.*
-
-%post libpoppler-tqt
-/sbin/ldconfig || :
-
-%postun libpoppler-tqt
-/sbin/ldconfig || :
-
-##########
-
-%package libpoppler-tqt-devel
-Summary:	Development files for TQt support for Poppler
-Group:		Development/Libraries
-Requires:	%{name}-libpoppler-tqt
-Provides:	poppler-tqt-devel = %{version}-%{release}
-
-%description libpoppler-tqt-devel
-Development files of TQt support library for Poppler.
-This package contains the development files needed to compile applications against poppler-tqt.
-
-%files libpoppler-tqt-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/poppler-link-qt3.h
-%{tde_tdeincludedir}/poppler-page-transition.h
-%{tde_tdeincludedir}/poppler-qt.h
-%{tde_libdir}/libpoppler-tqt.la
-%{tde_libdir}/libpoppler-tqt.so
-%{tde_libdir}/pkgconfig/poppler-tqt.pc
-
-%post libpoppler-tqt-devel
-/sbin/ldconfig || :
-
-%postun libpoppler-tqt-devel
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:	Development files for %{name} 
-Group:		Development/Libraries
-
-Obsoletes:	trinity-kdegraphics-devel < %{version}-%{release}
-Provides:	trinity-kdegraphics-devel = %{version}-%{release}
-
-Requires: trinity-libkscan-devel = %{version}-%{release}
-Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/dom/
-#%{tde_tdeincludedir}/kfaximage.h
-%{tde_tdeincludedir}/kmultipageInterface.h
-%{tde_tdeincludedir}/ksvg/
-%{tde_tdeincludedir}/kviewshell/
-%{tde_tdeincludedir}/libtext2path-0.1/BezierPath.h
-%{tde_tdeincludedir}/libtext2path-0.1/Glyph.h
-%{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h
-%{tde_libdir}/lib[kt]deinit_kview.la
-%{tde_libdir}/lib[kt]deinit_mrmlsearch.la
-%{tde_libdir}/libkghostviewlib.la
-%{tde_libdir}/libkghostviewlib.so
-%{tde_libdir}/libkimageviewer.la
-%{tde_libdir}/libkimageviewer.so
-%{tde_libdir}/libkmultipage.la
-%{tde_libdir}/libkmultipage.so
-%{tde_libdir}/libkpovmodeler.la
-%{tde_libdir}/libkpovmodeler.so
-%{tde_libdir}/libksvg.la
-%{tde_libdir}/libksvg.so
-%{tde_libdir}/libtext2path.la
-%{tde_libdir}/libtext2path.so
-# kfaxview
-%{tde_libdir}/libkfaximage.so
-%{tde_libdir}/libkfaximage.la
-# cmake
-%{tde_datadir}/cmake/*
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-############
-
-# Excludes kuickshow (built separately)
-#%exclude %{tde_bindir}/kuickshow
-#%exclude %{tde_tdelibdir}/kuickshow.la
-#%exclude %{tde_tdelibdir}/kuickshow.so
-#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.la
-#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.so
-#%exclude %{tde_tdeappdir}/kuickshow.desktop
-#%exclude %{tde_datadir}/apps/kuickshow/
-#%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
-#%exclude %{tde_tdedocdir}/HTML/en/kuickshow/
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n kdegraphics-3.5.13.1
-%if 0%{?rhel} && 0%{?rhel} <= 5
-%patch3 -p1 -b .mkstemps
-%endif
-%patch9 -p1
-%patch10 -p1
-
-%if 0%{?rhel} == 4
-%patch201 -p1 -b .rhel4
-%endif
-
-%if 0%{?build_kamera} == 0
-%__rm -rf doc/kamera/
-%endif
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  %{?with_t1lib:-DWITH_T1LIB=ON} \
-  %{?with_paper:-DWITH_LIBPAPER=ON} \
-  -DWITH_TIFF=ON \
-  -DWITH_OPENEXR=ON \
-  -DWITH_PDF=ON \
-  -DBUILD_ALL=ON \
-  -DBUILD_KUICKSHOW=OFF \
-  %{!?build_kamera:-DBUILD_KAMERA=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# rpmdocs
-for dir in k* ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    if test -s "$dir/$file" ; then
-       install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-       echo "%doc rpmdocs/$dir/" >> %{name}.lang
-    fi
-  done
-done
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%changelog
-* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13.spec b/redhat/tdegraphics/kdegraphics-3.5.13.spec
deleted file mode 100644
index 2fb1459e1..000000000
--- a/redhat/tdegraphics/kdegraphics-3.5.13.spec
+++ /dev/null
@@ -1,1007 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-tdegraphics
-Version:	3.5.13
-Release:	6%{?dist}%{_variant}
-License:	GPL
-Summary:    Trinity Desktop Environment - Graphics Applications
-
-Group:      Applications/Multimedia
-Prefix:		%{tde_prefix}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdegraphics-%{version}.tar.gz
-
-# TDE 3.5.13
-## RHEL / Fedora specific patches
-# [kdegraphics/ksnapshot] Missing -lXext in LDFLAGS (required for Fedora 15)
-Patch0:		kdegraphics-3.5.13-ksnapshot_ldflags.patch
-# [kdegraphics/kpovmodeler] CMAKE does not detect GL/glu.h (on RHEL5)
-Patch1:		kdegraphics-3.5.13-kpovmodeler_check_glu.patch
-# [kdegraphics/kfile-plugins/dependencies/poppler-tqt] Compile 'poppler-tqt' only if HAVE_POPPLER_016
-Patch2:		kdegraphics-3.5.13-disable_poppler.patch
-# [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
-Patch3:		kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
-# [kdegraphics/kpovmodeler] CMAKE missing GLU_LIBRARIES
-Patch4:		kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch
-# [kdegraphics] Fix compilation with GCC 4.7
-Patch5:		kdegraphics-3.5.13-fix_gcc47_compilation.patch
-# [kdegraphics] Fix FTBFS due to poppler-tqt
-Patch6:		kdegraphics-3.5.13-fix_poppler_support.patch
-# [tdegraphics] Fix corrupt image file. [Commit #d655a9f8]
-Patch7:		kdegraphics-3.5.13-fix_corrupt_image_file.patch
-# [tdegraphics] Add poppler-tqt.pc file [Commit #b2d01d00]
-Patch8:		kdegraphics-3.5.13-add_poppler_tqt_pc.patch
-# [tdegraphics] Fix poppler include directory location
-Patch9:		kdegraphics-3.5.13-fix_poppler_include_dir.patch
-# [tdegraphics] Disable kuickshow documentation if kuickshow is not built
-Patch10:	kdegraphics-3.5.13-disable_kuickshow_doc.patch
-
-BuildRequires: cmake >= 2.8
-BuildRequires: tqtinterface-devel >= 3.5.13
-BuildRequires: trinity-tdelibs-devel >= 3.5.13
-BuildRequires: trinity-tdebase-devel >= 3.5.13
-BuildRequires: gettext
-BuildRequires: libmng-devel
-BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
-BuildRequires: libungif-devel
-BuildRequires: automake libtool
-BuildRequires: gphoto2-devel
-BuildRequires: libusb-devel
-BuildRequires: libdrm-devel
-BuildRequires: pcre-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}sane1-devel
-BuildRequires:	%{_lib}t1lib-devel
-BuildRequires:	%{_lib}paper-devel
-# kuickshow
-BuildRequires:	%{_lib}imlib-devel
-# kpovmodeler
-BuildRequires:	%{_lib}xi-devel
-# kgamma
-BuildRequires:	%{_lib}xxf86vm-devel
-# ksvg
-BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
-# kpovmodeler
-BuildRequires:	%{_lib}mesagl1-devel
-BuildRequires:	%{_lib}mesaglu1-devel
-%else
-BuildRequires:	sane-backends-devel
-BuildRequires:	t1lib-devel
-BuildRequires:	libpaper-devel
-# kuickshow
-BuildRequires:	imlib-devel
-# kpovmodeler
-BuildRequires:	libXi-devel
-# kgamma
-BuildRequires:	libXxf86vm-devel
-# ksvg
-BuildRequires:	libXmu-devel
-# kpovmodeler
-BuildRequires:	libGL-devel
-BuildRequires:	libGLU-devel
-%endif
-
-#kfile-plugin
-BuildRequires:	OpenEXR-devel
-
-# kpdf
-BuildRequires: freetype-devel
-%if 0%{?rhel} >=6 || 0%{?fedora} >= 15
-BuildRequires: poppler-devel >= 0.12
-#BuildRequires:	poppler-qt-devel >= 0.12
-%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}poppler-devel
-%else
-# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
-BuildRequires:	trinity-poppler-devel
-BuildRequires:	trinity-poppler-qt3-devel >= 0.12
-%endif
-%endif
-
-# ksvg
-BuildRequires: fontconfig-devel
-BuildRequires: lcms-devel
-BuildRequires: libart_lgpl-devel
-
-
-# kuickshow
-BuildRequires: fribidi-devel
-
-
-Obsoletes:	trinity-kdegraphics < %{version}-%{release}
-Provides:	trinity-kdegraphics = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-libs < %{version}-%{release}
-Provides:	trinity-kdegraphics-libs = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-extras < %{version}-%{release}
-Provides:	trinity-kdegraphics-extras = %{version}-%{release}
-
-
-Requires: trinity-kamera = %{version}-%{release}
-Requires: trinity-kcoloredit = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: trinity-kdvi = %{version}-%{release}
-Requires: trinity-kfax = %{version}-%{release}
-Requires: trinity-kfaxview = %{version}-%{release}
-Requires: trinity-kgamma = %{version}-%{release}
-Requires: trinity-kghostview = %{version}-%{release}
-Requires: trinity-kiconedit = %{version}-%{release}
-Requires: trinity-kmrml = %{version}-%{release}
-Requires: trinity-kolourpaint = %{version}-%{release}
-Requires: trinity-kooka = %{version}-%{release}
-Requires: trinity-kpdf = %{version}-%{release}
-Requires: trinity-kpovmodeler = %{version}-%{release}
-Requires: trinity-kruler = %{version}-%{release}
-Requires: trinity-ksnapshot = %{version}-%{release}
-Requires: trinity-ksvg = %{version}-%{release}
-Requires: trinity-kview = %{version}-%{release}
-Requires: trinity-kviewshell = %{version}-%{release}
-Requires: trinity-libkscan = %{version}-%{release}
-Requires: %{name}-libpoppler-tqt = %{version}-%{release}
-
-%description
-Graphics applications for the Trinity Desktop Environment, including
-* kamera (digital camera support)
-* kcoloredit (palette editor and color chooser)
-* kdvi (displays TeX .dvi files)
-* kfax
-* kfaxview
-* kghostview (displays postscript files)
-* kiconedit (icon editor)
-* kooka (scanner application)
-* kpdf (displays PDF files)
-* kpovmodler
-* kruler (screen ruler and color measurement tool)
-* ksnapshot (screen capture utility)
-* kview (image viewer for GIF, JPEG, TIFF, etc.)
-
-%files
-
-##########
-
-%package -n trinity-kamera
-Summary:	Digital camera io_slave for Konqueror
-Group:		Applications/Graphics
-
-%description -n trinity-kamera
-This is a digital camera io_slave for TDE which uses gphoto2 and libgpio
-to allow access to your camera's pictures with the URL camera:/
-
-%post -n trinity-kamera
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kamera
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%files -n trinity-kamera
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kamera.la
-%{tde_tdelibdir}/kcm_kamera.so
-%{tde_tdelibdir}/kio_kamera.la
-%{tde_tdelibdir}/kio_kamera.so
-%{tde_tdeappdir}/kamera.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png
-%{tde_datadir}/icons/crystalsvg/*/apps/camera.png
-%{tde_datadir}/icons/crystalsvg/*/devices/camera.png
-%{tde_datadir}/icons/crystalsvg/*/filesystems/camera.png
-%{tde_datadir}/services/camera.protocol
-%{tde_tdedocdir}/HTML/en/kamera/
-
-##########
-
-%package -n trinity-kcoloredit
-Summary:	A color palette editor and color picker for TDE
-Group:		Applications/Graphics
-
-%description -n trinity-kcoloredit
-This package contains two programs, a color palette editor and also a color
-picker.
-
-%files -n trinity-kcoloredit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcolorchooser
-%{tde_bindir}/kcoloredit
-%{tde_tdeappdir}/kcolorchooser.desktop
-%{tde_tdeappdir}/kcoloredit.desktop
-%{tde_datadir}/apps/kcoloredit/kcoloreditui.rc
-%{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
-%{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
-%{tde_tdedocdir}/HTML/en/kcoloredit/
-
-##########
-
-%package kfile-plugins
-Summary:	TDE metainfo plugins for graphic files
-Group:		Environment/Libraries
- 
-%description kfile-plugins
-This packages provides meta information for graphic files (file sizes,
-tags, etc. all from within the file manager).
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/gsthumbnail.la
-%{tde_tdelibdir}/gsthumbnail.so
-%{tde_tdelibdir}/kfile_bmp.la
-%{tde_tdelibdir}/kfile_bmp.so
-%{tde_tdelibdir}/kfile_dds.la
-%{tde_tdelibdir}/kfile_dds.so
-%{tde_tdelibdir}/kfile_dvi.la
-%{tde_tdelibdir}/kfile_dvi.so
-%{tde_tdelibdir}/kfile_exr.la
-%{tde_tdelibdir}/kfile_exr.so
-%{tde_tdelibdir}/kfile_gif.la
-%{tde_tdelibdir}/kfile_gif.so
-%{tde_tdelibdir}/kfile_ico.la
-%{tde_tdelibdir}/kfile_ico.so
-%{tde_tdelibdir}/kfile_jpeg.la
-%{tde_tdelibdir}/kfile_jpeg.so
-%{tde_tdelibdir}/kfile_pcx.la
-%{tde_tdelibdir}/kfile_pcx.so
-%{tde_tdelibdir}/kfile_pdf.la
-%{tde_tdelibdir}/kfile_pdf.so
-%{tde_tdelibdir}/kfile_png.la
-%{tde_tdelibdir}/kfile_png.so
-%{tde_tdelibdir}/kfile_pnm.la
-%{tde_tdelibdir}/kfile_pnm.so
-%{tde_tdelibdir}/kfile_ps.la
-%{tde_tdelibdir}/kfile_ps.so
-%{tde_tdelibdir}/kfile_raw.la
-%{tde_tdelibdir}/kfile_raw.so
-%{tde_tdelibdir}/kfile_rgb.la
-%{tde_tdelibdir}/kfile_rgb.so
-%{tde_tdelibdir}/kfile_tga.la
-%{tde_tdelibdir}/kfile_tga.so
-%{tde_tdelibdir}/kfile_tiff.la
-%{tde_tdelibdir}/kfile_tiff.so
-%{tde_tdelibdir}/kfile_xbm.la
-%{tde_tdelibdir}/kfile_xbm.so
-%{tde_tdelibdir}/kfile_xpm.la
-%{tde_tdelibdir}/kfile_xpm.so
-%{tde_datadir}/services/gsthumbnail.desktop
-%{tde_datadir}/services/kfile_bmp.desktop
-%{tde_datadir}/services/kfile_dds.desktop
-%{tde_datadir}/services/kfile_dvi.desktop
-%{tde_datadir}/services/kfile_exr.desktop
-%{tde_datadir}/services/kfile_gif.desktop
-%{tde_datadir}/services/kfile_ico.desktop
-%{tde_datadir}/services/kfile_jpeg.desktop
-%{tde_datadir}/services/kfile_pcx.desktop
-%{tde_datadir}/services/kfile_pdf.desktop
-%{tde_datadir}/services/kfile_png.desktop
-%{tde_datadir}/services/kfile_pnm.desktop
-%{tde_datadir}/services/kfile_ps.desktop
-%{tde_datadir}/services/kfile_raw.desktop
-%{tde_datadir}/services/kfile_rgb.desktop
-%{tde_datadir}/services/kfile_tga.desktop
-%{tde_datadir}/services/kfile_tiff.desktop
-%{tde_datadir}/services/kfile_xbm.desktop
-%{tde_datadir}/services/kfile_xpm.desktop
-
-##########
-
-%package -n trinity-kdvi
-Summary:	Dvi viewer for TDE
-Group:		Applications/Graphics
-
-%description -n trinity-kdvi
-This program and KPart allow the user to display *.DVI files from TeX.
-
-%files -n trinity-kdvi
-%defattr(-,root,root,-)
-%{tde_bindir}/kdvi
-%{tde_tdelibdir}/kdvipart.la
-%{tde_tdelibdir}/kdvipart.so
-%{tde_tdeappdir}/kdvi.desktop
-%{tde_datadir}/apps/kdvi/
-%{tde_datadir}/config.kcfg/kdvi.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kdvi.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
-%{tde_datadir}/services/kdvimultipage.desktop
-%{tde_tdedocdir}/HTML/en/kdvi/
-
-##########
-
-%package -n trinity-kfax
-Summary:	G3/G4 fax viewer for Trinity
-Group:		Applications/Graphics
-Requires:	libtiff
-
-%description -n trinity-kfax
-A fax viewer for Trinity, supporting the display of raw and tiffed fax images
-(g3, g3-2d, g4).
-
-%files -n trinity-kfax
-%defattr(-,root,root,-)
-%doc rpmdocs/kfax/
-%{tde_bindir}/kfax
-%{tde_tdeappdir}/kfax.desktop
-%{tde_datadir}/apps/kfax/
-%{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
-
-##########
-
-%package -n trinity-kfaxview
-Summary:	G3/G4 fax viewer for Trinity using kviewshell
-Group:		Applications/Graphics
-
-%description -n trinity-kfaxview
-A fax viewer for Trinity, supporting the display of raw and tiffed fax images
-(g3, g3-2d, g4).
-
-This faxviewer uses kviewshell and is intended to replace the standalone
-kfax application once it reproduces all of kfax's features.
-
-%files -n trinity-kfaxview
-%defattr(-,root,root,-)
-%{tde_bindir}/kfaxview
-%{tde_libdir}/libkfaximage.so.*
-%{tde_tdelibdir}/kfaxviewpart.*
-%{tde_tdeappdir}/kfaxview.desktop
-%{tde_datadir}/apps/kfaxview/
-%{tde_datadir}/icons/hicolor/??x??/apps/kfaxview.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
-%{tde_datadir}/services/kfaxmultipage.desktop
-%{tde_datadir}/services/kfaxmultipage_tiff.desktop
-
-##########
-
-%package -n trinity-kgamma
-Summary:	Gamma correction module for the Trinity Control Center
-Group:		Applications/Graphics
-
-%description -n trinity-kgamma
-KGamma is a Trinity Control Center module for gamma calibration/correction
-of XFree86. With proper gamma settings, your display (websites, images,
-etc.) will look the same on your monitor as on other monitors.
-
-Homepage: http://kgamma.berlios.de/index2.php
-
-%files -n trinity-kgamma
-%defattr(-,root,root,-)
-%{tde_bindir}/xf86gammacfg
-%{tde_tdelibdir}/kcm_kgamma.la
-%{tde_tdelibdir}/kcm_kgamma.so
-%{tde_tdeappdir}/kgamma.desktop
-%{tde_datadir}/apps/kgamma/
-%{tde_datadir}/icons/hicolor/*/apps/kgamma.png
-%{tde_tdedocdir}/HTML/en/kgamma/
-
-##########
-
-%package -n trinity-kghostview
-Summary:	PostScript viewer for Trinity
-Group:		Applications/Graphics
-Requires:	ghostscript
-
-%description -n trinity-kghostview
-KGhostview is Trinity's PostScript viewer. It is a port of Tim Theisen's
-Ghostview program which is used to view documents prepared in Adobe's
-PostScript page description language. PostScript is the major page
-description language for printing on UNIX systems, and this application is
-useful to preview material intended for printing, or for reading documents
-online.
-
-%files -n trinity-kghostview
-%defattr(-,root,root,-)
-%{tde_bindir}/kghostview
-%{tde_tdelibdir}/libkghostviewpart.la
-%{tde_tdelibdir}/libkghostviewpart.so
-%{tde_libdir}/libkghostviewlib.so.*
-%{tde_tdeappdir}/kghostview.desktop
-%{tde_datadir}/apps/kconf_update/kghostview.upd
-%{tde_datadir}/apps/kconf_update/update-to-xt-names.pl
-%{tde_datadir}/apps/kghostview/
-%{tde_datadir}/config.kcfg/kghostview.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kghostview.png
-%{tde_datadir}/services/kghostview_part.desktop
-%{tde_tdedocdir}/HTML/en/kghostview/
-
-##########
-
-%package -n trinity-kiconedit
-Summary:	An icon editor for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kiconedit
-KIconedit allows you easily to create and edit icons.
-
-%files -n trinity-kiconedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kiconedit
-%{tde_tdeappdir}/kiconedit.desktop
-%{tde_datadir}/apps/kiconedit/
-%{tde_datadir}/icons/hicolor/*/apps/kiconedit.png
-%{tde_tdedocdir}/HTML/en/kiconedit/
-
-##########
-
-%package -n trinity-kmrml
-Summary: 	A Konqueror plugin for searching pictures
-Group:		Applications/Graphics
-
-%description -n trinity-kmrml
-MRML is short for Multimedia Retrieval Markup Language, which defines a
-protocol for querying a server for images based on their content. See 
-http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an 
-MRML server.
-
-%files -n trinity-kmrml
-%defattr(-,root,root,-)
-%{tde_bindir}/mrmlsearch
-%{tde_tdelibdir}/kcm_kmrml.la
-%{tde_tdelibdir}/kcm_kmrml.so
-%{tde_tdelibdir}/kded_daemonwatcher.la
-%{tde_tdelibdir}/kded_daemonwatcher.so
-%{tde_tdelibdir}/kio_mrml.la
-%{tde_tdelibdir}/kio_mrml.so
-%{tde_tdelibdir}/libkmrmlpart.la
-%{tde_tdelibdir}/libkmrmlpart.so
-%{tde_tdelibdir}/mrmlsearch.la
-%{tde_tdelibdir}/mrmlsearch.so
-%{tde_libdir}/lib[kt]deinit_mrmlsearch.so
-%{tde_tdeappdir}/kcmkmrml.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
-%{tde_datadir}/mimelnk/text/mrml.desktop
-%{tde_datadir}/services/kded/daemonwatcher.desktop
-%{tde_datadir}/services/mrml.protocol
-%{tde_datadir}/services/mrml_part.desktop
-
-##########
-
-%package -n trinity-kolourpaint
-Summary:	A simple paint program for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kolourpaint
-KolourPaint is a very simple paint program for Trinity. It aims to be
-conceptually simple to understand; providing a level of functionality
-targeted towards the average user. It's designed for daily tasks like:
-
-* Painting - drawing diagrams and "finger painting" 
-* Image Manipulation - editing screenshots and photos; applying effects 
-* Icon Editing - drawing clipart and logos with transparency 
-
-It's not an unusable and monolithic program where simple tasks like
-drawing lines become near impossible. Nor is it so simple that it lacks
-essential features like Undo/Redo.
-
-Homepage: http://kolourpaint.sourceforge.net
-
-%files -n trinity-kolourpaint
-%defattr(-,root,root,-)
-%{tde_bindir}/kolourpaint
-%{tde_tdeappdir}/kolourpaint.desktop
-%{tde_datadir}/apps/kolourpaint/
-%{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
-%{tde_tdedocdir}/HTML/en/kolourpaint/
-
-##########
-
-%package -n trinity-kooka
-Summary:	Scanner program for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kooka
-Kooka is an open source GNU/Linux scan program based on SANE and
-KScan library.
-
-Kooka helps you to handle the most important scan parameters, find the
-correct image file format to save and manage your scanned images. It
-offers support for different OCR modules. Libkscan, a autonomous part
-of Kooka, provides a scan service for easy and consistent use to all
-KDE applications.
-
-Install ocrad or gocr if you wish to enable optical character recognition
-in kooka.
-
-Homepage: http://kooka.kde.org/
-
-%files -n trinity-kooka
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kookarc
-%{tde_bindir}/kooka
-%{tde_tdeappdir}/kooka.desktop
-%{tde_datadir}/apps/kooka/
-%{tde_tdedocdir}/HTML/en/kooka/
-
-##########
-
-%package -n trinity-kpdf
-Summary:	PDF viewer for Trinity
-Group:		Applications/Graphics
-#Recommends: kghostview-trinity (= ${binary:Version})
-
-%description -n trinity-kpdf
-KPDF allows you to view PDF (Portable Document Format) files. This package
-includes kpdfpart so you can embed in konqueror or run as a standalone
-application.
-
-%files -n trinity-kpdf
-%defattr(-,root,root,-)
-%{tde_bindir}/kpdf
-%{tde_tdelibdir}/libkpdfpart.la
-%{tde_tdelibdir}/libkpdfpart.so
-%{tde_tdeappdir}/kpdf.desktop
-%{tde_datadir}/apps/kpdf/shell.rc
-%{tde_datadir}/apps/kpdfpart/part.rc
-%{tde_datadir}/config.kcfg/kpdf.kcfg
-%{tde_tdedocdir}/HTML/en/kpdf/
-%{tde_datadir}/icons/hicolor/*/apps/kpdf.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
-%{tde_datadir}/services/kpdf_part.desktop
-
-##########
-
-%package -n trinity-kpovmodeler
-Summary:	A graphical editor for povray scenes
-Group:		Applications/Graphics
-#Requires:	povray
-
-%description -n trinity-kpovmodeler
-KPovmodeler is KDE's graphical editor for povray scenes. KPovModeler is a
-modeling and composition program for creating POV-Ray scenes in KDE.
-
-For most modelers, POV-Ray is nothing but a rendering engine. This greatly
-limits the innate possibilities of the POV-Ray scripted language. This
-is not the case for KPovModeler, which allows you to use all the features
-of POV-Ray through the translation of POV-Ray language into a graphical
-tree.
-
-kpovmodeler uses the povray package, currently available only in Debian's
-non-free, unsupported repository.
-
-Homepage: http://www.kpovmodeler.org
-
-%files -n trinity-kpovmodeler
-%defattr(-,root,root,-)
-%doc rpmdocs/kpovmodeler/
-%{tde_bindir}/kpovmodeler
-%{tde_libdir}/libkpovmodeler.so.*
-%{tde_tdelibdir}/libkpovmodelerpart.*
-%{tde_tdeappdir}/kpovmodeler.desktop
-%{tde_datadir}/apps/kpovmodeler/
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
-%{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
-%doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
-
-##########
-
-%package -n trinity-kruler
-Summary:	A screen ruler and color measurement tool for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kruler
-Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
-
-%files -n trinity-kruler
-%defattr(-,root,root,-)
-%{tde_bindir}/kruler
-%{tde_tdeappdir}/kruler.desktop
-%{tde_datadir}/applnk/Graphics/kruler.desktop
-%{tde_datadir}/apps/kruler/
-%{tde_datadir}/icons/hicolor/*/apps/kruler.png
-%{tde_tdedocdir}/HTML/en/kruler/
-
-##########
-
-%package -n trinity-ksnapshot
-Summary:	Screenshot utility for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-ksnapshot
-KSnapshot is a simple applet for taking screenshots. It is capable of 
-capturing images of either the whole desktop or just a single window. 
-The images can then be saved in a variety of formats.
-
-%files -n trinity-ksnapshot
-%defattr(-,root,root,-)
-%{tde_bindir}/ksnapshot
-%{tde_tdeappdir}/ksnapshot.desktop
-%{tde_tdedocdir}/HTML/en/ksnapshot/
-%{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
-
-##########
-
-%package -n trinity-ksvg
-Summary:	SVG viewer for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-ksvg
-KSVG allows you view SVG (scalable vector graphics) files. This package
-includes kpart so you can embed it in konqueror and a standalone
-application.
-
-%files -n trinity-ksvg
-%defattr(-,root,root,-)
-%{tde_bindir}/printnodetest
-%{tde_bindir}/svgdisplay
-%{tde_tdelibdir}/libksvgplugin.la
-%{tde_tdelibdir}/libksvgplugin.so
-%{tde_tdelibdir}/libksvgrendererlibart.la
-%{tde_tdelibdir}/libksvgrendererlibart.so
-%{tde_tdelibdir}/svgthumbnail.la
-%{tde_tdelibdir}/svgthumbnail.so
-%{tde_libdir}/libksvg.so.0
-%{tde_libdir}/libksvg.so.0.0.1
-%{tde_libdir}/libtext2path.so.0
-%{tde_libdir}/libtext2path.so.0.0.0
-%{tde_datadir}/apps/ksvg/ksvgplugin.rc
-%{tde_datadir}/services/ksvglibartcanvas.desktop
-%{tde_datadir}/services/ksvgplugin.desktop
-%{tde_datadir}/services/svgthumbnail.desktop
-%{tde_datadir}/servicetypes/ksvgrenderer.desktop
-
-##########
-
-%package -n trinity-kview
-Summary:	Simple image viewer/converter for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kview
-KView is a simple image viewer and converter application. It supports
-a number of plugins, which add an array of basic editing capabilities
-as well.
-
-%files -n trinity-kview
-%defattr(-,root,root,-)
-%{tde_bindir}/kview
-%{tde_tdelibdir}/kcm_kviewcanvasconfig.la
-%{tde_tdelibdir}/kcm_kviewcanvasconfig.so
-%{tde_tdelibdir}/kcm_kviewgeneralconfig.la
-%{tde_tdelibdir}/kcm_kviewgeneralconfig.so
-%{tde_tdelibdir}/kcm_kviewpluginsconfig.la
-%{tde_tdelibdir}/kcm_kviewpluginsconfig.so
-%{tde_tdelibdir}/kcm_kviewpresenterconfig.la
-%{tde_tdelibdir}/kcm_kviewpresenterconfig.so
-%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.la
-%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.so
-%{tde_tdelibdir}/kview.la
-%{tde_tdelibdir}/kview.so
-%{tde_tdelibdir}/kview_browserplugin.la
-%{tde_tdelibdir}/kview_browserplugin.so
-%{tde_tdelibdir}/kview_effectsplugin.la
-%{tde_tdelibdir}/kview_effectsplugin.so
-%{tde_tdelibdir}/kview_presenterplugin.la
-%{tde_tdelibdir}/kview_presenterplugin.so
-%{tde_tdelibdir}/kview_scannerplugin.la
-%{tde_tdelibdir}/kview_scannerplugin.so
-%{tde_tdelibdir}/libkviewcanvas.la
-%{tde_tdelibdir}/libkviewcanvas.so
-%{tde_tdelibdir}/libkviewviewer.la
-%{tde_tdelibdir}/libkviewviewer.so
-%{tde_libdir}/lib[kt]deinit_kview.so
-%{tde_libdir}/libkimageviewer.so.*
-%{tde_tdelibdir}/libphotobook.la
-%{tde_tdelibdir}/libphotobook.so
-%{tde_tdeappdir}/kview.desktop
-%{tde_datadir}/apps/kview/
-%{tde_datadir}/apps/kviewviewer/
-%{tde_datadir}/apps/photobook/photobookui.rc
-%{tde_datadir}/icons/crystalsvg/*/apps/photobook.png
-%{tde_datadir}/icons/hicolor/*/apps/kview.png
-%{tde_datadir}/services/kconfiguredialog/kviewcanvasconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewgeneralconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewpluginsconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewpresenterconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
-%{tde_datadir}/services/kviewcanvas.desktop
-%{tde_datadir}/services/kviewviewer.desktop
-%{tde_datadir}/services/photobook.desktop
-%{tde_datadir}/servicetypes/kimageviewer.desktop
-%{tde_datadir}/servicetypes/kimageviewercanvas.desktop
-%{tde_tdedocdir}/HTML/en/kview/
-
-##########
-
-%package -n trinity-kviewshell
-Summary:	Generic framework for viewer applications in Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kviewshell
-KViewShell is a generic viewing framework that allows the graphical
-applications, such as the kview image viewer, to be embedded in other
-KDE applications, such as Konqueror.
-
-KViewShell comes with a djvuviewpart plugin included, for viewing
-DjVu images.
-
-%files -n trinity-kviewshell
-%defattr(-,root,root,-)
-%{tde_bindir}/kviewshell
-%{tde_libdir}/libdjvu.la
-%{tde_libdir}/libdjvu.so
-%{tde_tdelibdir}/djvuviewpart.so
-%{tde_tdelibdir}/djvuviewpart.la
-%{tde_tdelibdir}/emptymultipagepart.la
-%{tde_tdelibdir}/emptymultipagepart.so
-%{tde_tdelibdir}/kviewerpart.la
-%{tde_tdelibdir}/kviewerpart.so
-%{tde_libdir}/libkmultipage.so.*
-%{tde_datadir}/apps/djvumultipage.rc
-%{tde_datadir}/apps/kviewerpart/
-%{tde_datadir}/apps/kviewshell/kviewshell.rc
-%{tde_datadir}/config.kcfg/djvumultipage.kcfg
-%{tde_datadir}/config.kcfg/kviewshell.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kviewshell.png
-%{tde_datadir}/services/emptymultipage.desktop
-%{tde_datadir}/services/djvumultipage.desktop
-%{tde_datadir}/servicetypes/kmultipage.desktop
-
-##########
-
-%package -n trinity-libkscan
-Summary:	Scanner library for Trinity
-Group:		Environment/Libraries
-
-%description -n trinity-libkscan
-KScan is TDE's scanner library. It's used by kooka and by koffice currently.
-It provides an easy-to-use library, which allows you to access your scanner
-(as long as it's sane compatible).
-
-%files -n trinity-libkscan
-%defattr(-,root,root,-)
-%{tde_libdir}/libkscan.so.*
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_color.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
-%{tde_datadir}/services/scanservice.desktop
-
-##########
-
-%package -n trinity-libkscan-devel
-Summary:	Development files for the Trinity scanner library
-Group:		Development/Libraries
-
-%description -n trinity-libkscan-devel
-This package contains development files for Trinity's scanner library.
-
-%files -n trinity-libkscan-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkscan.la
-%{tde_libdir}/libkscan.so
-
-##########
-
-%package libpoppler-tqt
-Summary:	TQt support for Poppler
-Group:		Environment/Libraries
-Provides:	poppler-tqt = %{version}-%{release}
-
-%description libpoppler-tqt
-TQt support library for Poppler.
-This library is used by the Trinity graphics file plugins for PDF support.
-
-%files libpoppler-tqt
-%defattr(-,root,root,-)
-%{tde_libdir}/libpoppler-tqt.so.*
-
-##########
-
-%package libpoppler-tqt-devel
-Summary:	Development files for TQt support for Poppler
-Group:		Development/Libraries
-Requires:	%{name}-libpoppler-tqt
-Provides:	poppler-tqt-devel = %{version}-%{release}
-
-%description libpoppler-tqt-devel
-Development files of TQt support library for Poppler.
-This package contains the development files needed to compile applications against poppler-tqt.
-
-%files libpoppler-tqt-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/poppler-link-qt3.h
-%{tde_tdeincludedir}/poppler-page-transition.h
-%{tde_tdeincludedir}/poppler-qt.h
-%{tde_libdir}/libpoppler-tqt.la
-%{tde_libdir}/libpoppler-tqt.so
-%{tde_libdir}/pkgconfig/poppler-tqt.pc
-
-##########
-
-%package devel
-Summary:	Development files for %{name} 
-Group:		Development/Libraries
-
-Obsoletes:	trinity-kdegraphics-devel < %{version}-%{release}
-Provides:	trinity-kdegraphics-devel = %{version}-%{release}
-
-Requires: trinity-libkscan-devel = %{version}-%{release}
-Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/dom/
-#%{tde_tdeincludedir}/kfaximage.h
-%{tde_tdeincludedir}/kmultipageInterface.h
-%{tde_tdeincludedir}/ksvg/
-%{tde_tdeincludedir}/kviewshell/
-%{tde_tdeincludedir}/libtext2path-0.1/BezierPath.h
-%{tde_tdeincludedir}/libtext2path-0.1/Glyph.h
-%{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h
-%{tde_libdir}/lib[kt]deinit_kview.la
-%{tde_libdir}/lib[kt]deinit_mrmlsearch.la
-%{tde_libdir}/libkghostviewlib.la
-%{tde_libdir}/libkghostviewlib.so
-%{tde_libdir}/libkimageviewer.la
-%{tde_libdir}/libkimageviewer.so
-%{tde_libdir}/libkmultipage.la
-%{tde_libdir}/libkmultipage.so
-%{tde_libdir}/libkpovmodeler.la
-%{tde_libdir}/libkpovmodeler.so
-%{tde_libdir}/libksvg.la
-%{tde_libdir}/libksvg.so
-%{tde_libdir}/libtext2path.la
-%{tde_libdir}/libtext2path.so
-# kfaxview
-%{tde_libdir}/libkfaximage.so
-%{tde_libdir}/libkfaximage.la
-# cmake
-%{tde_datadir}/cmake/*
-
-############
-
-# Excludes kuickshow (built separately)
-#%exclude %{tde_bindir}/kuickshow
-#%exclude %{tde_tdelibdir}/kuickshow.la
-#%exclude %{tde_tdelibdir}/kuickshow.so
-#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.la
-#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.so
-#%exclude %{tde_tdeappdir}/kuickshow.desktop
-#%exclude %{tde_datadir}/apps/kuickshow/
-#%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
-#%exclude %{tde_tdedocdir}/HTML/en/kuickshow/
-
-##########
-
-%prep
-%setup -q -n kdegraphics
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%if 0%{?rhel} && 0%{?rhel} <= 5
-%patch3 -p1 -b .mkstemps
-%endif
-%patch4 -p1
-%patch5 -p1 -b .gcc47
-%patch6 -p1 -b .poppler
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1 -b .kuickshowdoc
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-#export LD_LIBRARY_PATH="%{tde_libdir}"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWITH_T1LIB=ON \
-  -DWITH_LIBPAPER=ON \
-  -DWITH_TIFF=ON \
-  -DWITH_OPENEXR=ON \
-  -DWITH_PDF=ON \
-  -DWITH_PDF=ON \
-  -DBUILD_ALL=ON \
-  -DBUILD_KUICKSHOW=OFF \
-  ..
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# locale's
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# rpmdocs
-for dir in k* ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    if test -s "$dir/$file" ; then
-       install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-       echo "%doc rpmdocs/$dir/" >> %{name}.lang
-    fi
-  done
-done
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%changelog
-* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Add poppler-tqt.pc file [Commit #b2d01d00]
-
-* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Renames 'kdegraphics' to 'tdegraphics'
-- Split in several packages
-
-* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Rebuild with poppler 0.12 for RHEL 5
-- Re-adds qt-poppler include files
-
-* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Updates BuildRequires
-
-* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Fix kpovmodeler compilation on RHEL 5 (patch4)
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-- RHEL 5 build has some features disabled (see patches)
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 93bd2f708..8c1ddf26c 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -447,7 +447,7 @@ kimgio (image manipulation).
 %{tde_datadir}/applnk/tdeio_iso.desktop
 %{tde_datadir}/apps/*
 %exclude %{tde_datadir}/apps/ksgmltools2/
-%config(noreplace) %{tde_datadir}/config/*
+%{tde_datadir}/config/*
 %{tde_datadir}/emoticons/*
 %{tde_datadir}/icons/crystalsvg/
 %{tde_datadir}/icons/default.tde
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 73983a076..29a9a5acf 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -20,7 +20,9 @@
 #  Having KDE libraries may cause FTBFS here !
 
 # TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
+%define tde_pkg tdemultimedia
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -38,7 +40,7 @@
 %endif
 
 
-Name:		trinity-tdemultimedia
+Name:		trinity-%{tde_pkg}
 Summary:	Multimedia applications for the Trinity Desktop Environment (TDE)
 Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
@@ -73,22 +75,23 @@ BuildRequires:	trinity-arts-devel >= 2:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 BuildRequires:	autoconf automake libtool m4
+BuildRequires:	fdupes
 
 # TAGLIB support
-%define _with_taglib --with-taglib
+%define with_taglib 1
 BuildRequires: taglib-devel
 
 # AKODE support
-%define _with_akode --with-akode
+%define with_akode 1
 BuildRequires: trinity-akode-devel
-BuildRequires: trinity-akode-libmad
+%{?with_mad:BuildRequires: trinity-akode-libmad}
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	zlib-devel
 
 # MUSICBRAINZ support
 ## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define _with_musicbrainz --with-musicbrainz
+#define with_musicbrainz 1
 #BuildRequires: libmusicbrainz-devel libtunepimp-devel
 
 # Audio libraries
@@ -149,7 +152,6 @@ BuildRequires:	xorg-x11-devel
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
 BuildRequires:	libXxf86dga-devel
 BuildRequires:	libXxf86vm-devel
-BuildRequires:	libXt-devel
 %endif
 
 # XINE support
@@ -171,7 +173,8 @@ BuildRequires: libxine-devel
 %endif
 
 # LAME support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%if 0%{?opensuse_bs} == 0
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?with_lame}
 %define with_lame 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos}
@@ -187,6 +190,7 @@ BuildRequires:		libmp3lame-devel
 BuildRequires:		lame-devel
 %endif
 %endif
+%endif
 
 Requires: trinity-artsbuilder = %{version}-%{release}
 Requires: trinity-juk = %{version}-%{release}
@@ -201,7 +205,7 @@ Requires: trinity-krec = %{version}-%{release}
 Requires: trinity-kscd = %{version}-%{release}
 Requires: trinity-libarts-akode = %{version}-%{release}
 Requires: trinity-libarts-audiofile = %{version}-%{release}
-Requires: trinity-libarts-mpeglib = %{version}-%{release}
+%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}}
 %{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}}
 Requires: trinity-libkcddb = %{version}-%{release}
 Requires: trinity-mpeglib = %{version}-%{release}
@@ -635,6 +639,7 @@ Konqueror and the audiocd:/ URL.
 %{tde_datadir}/services/audiocd.protocol
 %{tde_tdedocdir}/HTML/en/tdeioslave/audiocd/
 %{tde_tdedocdir}/HTML/en/kcontrol/audiocd/
+%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png
 
 %post tdeio-plugins
 /sbin/ldconfig
@@ -843,7 +848,7 @@ This package contains akode plugins for aRts.
 %{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
 
 # Requires MAD support
-%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass
+%{?with_mad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
 
 %post -n trinity-libarts-akode
 /sbin/ldconfig
@@ -876,6 +881,7 @@ This package contains audiofile plugins for aRts.
 
 ##########
 
+%if 0%{?with_mpeg}
 %package -n trinity-libarts-mpeglib
 Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
 Group:		Environment/Libraries
@@ -905,6 +911,7 @@ This is the arts (TDE Sound daemon) plugin.
 
 %postun -n trinity-libarts-mpeglib
 /sbin/ldconfig
+%endif
 
 ##########
 
@@ -986,7 +993,9 @@ and WAV playback
 %{tde_bindir}/yaf-tplay
 %{tde_bindir}/yaf-vorbis
 %{tde_bindir}/yaf-yuv
+%if 0%{?with_mpeg}
 %{tde_libdir}/libmpeg-0.3.0.so
+%endif
 %{tde_libdir}/libyafcore.so
 %{tde_libdir}/libyafxplayer.so
 
@@ -1145,8 +1154,10 @@ noatun plugins.
 %{tde_libdir}/libtdeinit_noatun.la
 %{tde_libdir}/libtdemidlib.la
 %{tde_libdir}/libtdemidlib.so
+%if 0%{?with_mpeg}
 %{tde_libdir}/libmpeg.la
 %{tde_libdir}/libmpeg.so
+%endif
 %{tde_libdir}/libnoatun.la
 %{tde_libdir}/libnoatun.so
 %{tde_libdir}/libnoatuncontrols.la
@@ -1177,6 +1188,9 @@ noatun plugins.
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
+# Update icons for some control center modules
+%__sed -i "tdeioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|"
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -1208,10 +1222,10 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --with-vorbis \
   --with-alsa \
   --with-gstreamer \
-  --with-lame \
-  %{?_with_akode} %{!?_with_akode:--without-akode} \
-  %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
-  %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
+  %{?with_lame:--with-lame} %{!?with_lame:--without-lame} \
+  %{?with_akode:--with-akode} %{!?with_akode:--without-akode} \
+  %{?with_musicbrainz:--with-musicbrainz} %{!?with_musicbrainz:--without-musicbrainz} \
+  %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \
   %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
 
 %__make %{?_smp_mflags} || %__make
@@ -1222,6 +1236,25 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{?buildroot} 
 %__make install DESTDIR=%{buildroot}
 
+# Disable MPEG support entirely
+%if 0%{?with_mpeg} == 0
+  %__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
+  %__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
+  %__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
+  %__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass
+  %__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
+  %__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass
+  %__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass
+  %__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass
+  %__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass
+%endif
+
+# Copy missing icons from 'crystalsvg' theme (tdelibs)
+mkdir -p $RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64}/apps/
+pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/
+for i in {16,22,32,48,64}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png;done
+popd
+
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file krec           AudioVideo Recorder
@@ -1237,6 +1270,9 @@ export PATH="%{tde_bindir}:${PATH}"
 %suse_update_desktop_file audiocd
 %endif
 
+# Symlinks duplicate files
+%fdupes -s "%{?buildroot}%{tde_datadir}"
+
 
 %clean
 %__rm -rf %{buildroot}