RPM Packaging: update k3b

10 files changed, 62 insertions, 1325 deletions

diff --git a/redhat/applications/k3b/k3b-1.0.3-umount.patch b/redhat/applications/k3b/k3b-1.0.3-umount.patch
deleted file mode 100644
index 394aff152..000000000
--- a/redhat/applications/k3b/k3b-1.0.3-umount.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- k3b-1.0.3/libk3b/core/k3bglobals.cpp.umount	2007-07-27 21:26:30.000000000 +0200
-+++ k3b-1.0.3/libk3b/core/k3bglobals.cpp	2007-07-27 21:31:26.000000000 +0200
-@@ -569,7 +569,24 @@
-       return true;
-   }
- 
--  // now try pmount
-+#ifdef HAVE_HAL
-+    if (!K3bDevice::HalConnection::instance()->unmount( dev ))
-+      return true;
-+#endif
-+
-+  QString gumountBin = K3b::findExe( "gnome-umount" );
-+  if( !gumountBin.isEmpty() ) {
-+    KProcess p;
-+    p << gumountBin;
-+    p << "-u";
-+    p << "-d";
-+    p << dev->blockDeviceName();
-+    p.start( KProcess::Block );
-+    if( !p.exitStatus() )
-+      return true;
-+  }
-+  
-+// now try pmount
-   QString pumountBin = K3b::findExe( "pumount" );
-   if( !pumountBin.isEmpty() ) {
-     KProcess p;
-@@ -577,15 +592,11 @@
-     p << "-l"; // lazy unmount
-     p << dev->blockDeviceName();
-     p.start( KProcess::Block );
--    return !p.exitStatus();
--  }
--  else {
--#ifdef HAVE_HAL
--    return !K3bDevice::HalConnection::instance()->unmount( dev );
--#else
--    return false;
--#endif
-+    if( !p.exitStatus() )
-+      return true;
-   }
-+
-+  return false;
- }
- 
- 
diff --git a/redhat/applications/k3b/k3b-1.0.5-hidden.patch b/redhat/applications/k3b/k3b-1.0.5-hidden.patch
deleted file mode 100644
index f27f0b391..000000000
--- a/redhat/applications/k3b/k3b-1.0.5-hidden.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up k3b-1.0.5/src/Makefile.in.hidden k3b-1.0.5/src/Makefile.in
---- k3b-1.0.5/src/Makefile.in.hidden	2008-05-27 03:34:44.000000000 -0500
-+++ k3b-1.0.5/src/Makefile.in	2008-08-27 14:18:54.000000000 -0500
-@@ -512,9 +512,9 @@ k3b_LDADD = ./option/liboption.la ./rip/
- 	-lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
- 
- SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
--xdg_apps_DATA = k3b.desktop
--silent_DATA = k3b-iso.desktop k3b-cue.desktop
--silentdir = $(kde_appsdir)/.hidden/
-+xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
-+#silent_DATA = k3b-iso.desktop k3b-cue.desktop
-+#silentdir = $(kde_appsdir)/.hidden/
- 
- ###################
- # this 10 paths are KDE specific. Use them:
-diff -up k3b-1.0.5/src/Makefile.am.hidden k3b-1.0.5/src/Makefile.am
---- k3b-1.0.5/src/Makefile.am.hidden	2008-05-27 03:24:04.000000000 -0500
-+++ k3b-1.0.5/src/Makefile.am	2008-08-27 14:13:36.000000000 -0500
-@@ -32,10 +32,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
- 
- SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
- 
--xdg_apps_DATA = k3b.desktop
--
--silent_DATA = k3b-iso.desktop k3b-cue.desktop
--silentdir = $(kde_appsdir)/.hidden/
-+xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
- 
- ###################
- # this 10 paths are KDE specific. Use them:
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index 8e2310afb..0a5ba3c27 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -1,44 +1,57 @@
-# Default version for this component
-%define tde_pkg k3b
+#
+# spec file for package k3b (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg k3b
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
 Name:			trinity-%{tde_pkg}
-Summary:		CD/DVD burning application
-Epoch:			1
+Epoch:			%{tde_epoch}
 Version:		1.0.5
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:		CD/DVD burning application
+Group:			Applications/Archiving
 URL:			http://www.trinitydesktop.org/
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Group:			Applications/Archiving
-License:		GPLv2+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source2:		k3brc
@@ -47,12 +60,24 @@ Source2:		k3brc
 # manual bufsize (upstream?)
 Patch4:			k3b-1.0.4-manualbufsize.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 BuildRequires:	alsa-lib-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	gettext
@@ -82,6 +107,11 @@ Requires:		dvd+rw-tools
 Requires:		cdrdao
 %endif
 
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires:	libudev-devel
+%endif
+
 # DBUS support
 #  TQT bindings not available for RHEL4
 %if 0%{?rhel} == 4
@@ -140,6 +170,7 @@ BuildRequires:	libmad-devel
 %endif
 
 # LAME support
+%if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define with_lame 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -156,8 +187,10 @@ BuildRequires:	libmp3lame-devel
 BuildRequires:	lame-devel
 %endif
 %endif
+%endif
 
 # FFMPEG support
+%if 0%{?opensuse_bs} == 0
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define with_ffmpeg 1
 %if 0%{?mdkversion} || 0%{?mgaversion}
@@ -167,6 +200,7 @@ BuildRequires:	%{_lib}ffmpeg-devel
 BuildRequires:	ffmpeg-devel
 %endif
 %endif
+%endif
 
 
 %description
@@ -375,7 +409,7 @@ and a generic audio and video file converter.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -463,5 +497,5 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.0.5-2
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.5-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/k3b/k3b-3.5.12.spec b/redhat/applications/k3b/k3b-3.5.12.spec
deleted file mode 100644
index 0d17f7958..000000000
--- a/redhat/applications/k3b/k3b-3.5.12.spec
+++ /dev/null
@@ -1,282 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 7
-
-# 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-k3b
-Summary: CD/DVD burning application
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
-
-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)
-
-%if "%{?_prefix}" == "/usr"
-Obsoletes: k3b
-%endif
-
-Group:   Applications/Archiving
-License: GPLv2+
-
-Source0: k3b-%{version}.tar.gz
-Source1: k3b-i18n-1.0.5.tar.bz2
-Source2: k3brc
-
-# Legacy RedHat / Fedora patches
-Patch2: k3b-1.0.3-umount.patch
-# manual bufsize (upstream?)
-Patch4: k3b-1.0.4-manualbufsize.patch
-# 3rd time is a charm, https://bugs.kde.org/show_bug.cgi?id=156684#c30 
-Patch102: reload-for-verification.diff
-# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
-# upstreamed 2008-08-27
-Patch105: k3b-1.0.5-hidden.patch
-# RHEL6: Fix K3B icon
-Patch106: trinity-k3b-icons.patch
-
-
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: desktop-file-utils
-BuildRequires: alsa-lib-devel
-BuildRequires: audiofile-devel
-BuildRequires: dbus-qt-devel hal-devel
-BuildRequires: flac-devel
-BuildRequires: gettext
-BuildRequires: libdvdread-devel
-%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5
-BuildRequires: libmpcdec-devel
-%else
-BuildRequires: musepack-tools-devel
-%endif
-BuildRequires: libmusicbrainz-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libvorbis-devel
-BuildRequires: taglib-devel
-BuildRequires: zlib-devel
-
-Obsoletes: k3b-extras < 0:1.0-1
-Provides:  k3b-extras = %{version}-%{release} 
-
-Obsoletes: %{name}-i18n
-Provides: %{name}-i18n
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-
-Requires: cdrecord mkisofs
-Requires: cdrdao
-Requires: dvd+rw-tools
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-%package common
-Summary:  Common files of %{name}
-Group:    Applications/Archiving
-Requires: %{name} = %{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildArch: noarch
-%endif
-%description common
-%{summary}.
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-%package devel
-Summary: Files for the development of applications which will use %{name} 
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-%description devel
-%{summary}.
-
-
-%prep
-%setup -q -a 1 -n applications/k3b
-
-%patch2 -p1 -b .umount
-# set in k3brc too 
-%patch4 -p1 -b .manualbufsize
-%patch102 -p0 -b .kde#156684
-%patch106 -p1 -b .desktopfile
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%patch105 -p1 -b .hidden
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-CFLAGS="%optflags -fno-strict-aliasing" \
-CXXFLAGS="%optflags -fno-strict-aliasing" \
-%configure \
-  --includedir=%{_includedir}/k3b \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-k3bsetup=no \
-  --without-cdrecord-suid-root \
-  --with-oggvorbis \
-  --with-flac \
-  --with-external-libsamplerate \
-  --with-libdvdread \
-  --with-musicbrainz \
-  --with-sndfile \
-  --without-ffmpeg --without-lame --without-libmad \
-  --with-musepack \
-  --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-# Build for i18n tarball
-pushd k3b-i18n-1.0.5
-%configure
-%__make %{?_smp_mflags}
-popd
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-%__make install DESTDIR=%{buildroot} -C k3b-i18n-1.0.5
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
-
-# remove the .la files
-%__rm -f %{buildroot}%{_libdir}/libk3b*.la 
-
-# remove i18n for Plattdeutsch (Low Saxon)
-%__rm -fr %{buildroot}%{_datadir}/locale/nds
-
-%find_lang k3b --with-kde
-%find_lang k3bsetup 
-%find_lang libk3b
-%find_lang libk3bdevice
-cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
-
-
-%check
-export PATH="%{_bindir}:${PATH}"
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-%post common
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%postun common
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null
-fi
-
-%posttrans common
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING TODO ChangeLog
-%{_bindir}/k3b
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
-%doc %{tde_docdir}/HTML/*/k3b/*
-
-%files common -f all.lang
-%defattr(-,root,root,-)
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/apps/k3b/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{_datadir}/config/k3brc
-%{_datadir}/mimelnk/application/x-k3b.desktop
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/services/kfile_k3b.desktop
-%{_datadir}/services/videodvd.protocol
-%{_datadir}/sounds/k3b_*.wav
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/libk3b.so.3*
-%{_libdir}/libk3bdevice.so.5*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/libk3b.so
-%{_libdir}/libk3bdevice.so
-
-
-%changelog
-* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
-- Add support for RHEL5
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Add fix for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Correct macro to install under "/opt", if desired
-
-* Thu Apr 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Fix config file '/usr/share/config/k3brc'
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Add i18n translations
-- Add patches from RHEL 6.0 (except Patch106, redundant with our 'patch0')
-- Renamed 'patch0' to 'patch106'
-
-* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
-- Add '--with-extra-includes=%{_includedir}/tqt'
-
-* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version built for RHEL 6.0
-- Add 'patch0' : invalid syntax in 'k3b.desktop'
-
diff --git a/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch b/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch
deleted file mode 100644
index 3de442b61..000000000
--- a/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- k3b/src/projects/k3baudioeditorwidget.cpp
-+++ k3b/src/projects/k3baudioeditorwidget.cpp	2012-04-18 16:48:00.794902506 -0500
-@@ -663,15 +663,16 @@
- {
-   m_draggedRange = 0;
-   m_draggedMarker = 0;
--
-   bool end;
--  if( Range* r = findRangeEdge( e->pos(), &end ) ) {
-+  Range* r = findRangeEdge( e->pos(), &end );
-+
-+  if (r) {
-     m_draggedRange = r;
-     m_draggingRangeEnd = end;
-     setSelectedRange( r );
-   }
-   else {
--    Range* r = findRange( e->pos() );
-+    r = findRange( e->pos() );
-     d->movedRange = r;
-     d->lastMovePosition = posToMsf( e->pos().x() );
-     setSelectedRange( r );
diff --git a/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch b/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch
deleted file mode 100644
index fcd293c01..000000000
--- a/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- k3b/applications/k3b/libk3bdevice/configure.in.in.ORI	2012-08-04 14:47:03.081813892 +0200
-+++ k3b/applications/k3b/libk3bdevice/configure.in.in	2012-08-04 14:47:25.421612485 +0200
-@@ -165,7 +165,7 @@
-   dbusqt_lib=NOTFOUND
-   dbusqt=NOTFOUND
- 
--  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /opt/trinity/include/dbus-1.0"
-   AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
- 
-   if test -r $dbusqt_incdir/dbus/connection.h ; then
---- k3b/libk3bdevice/configure.in.in.ORI	2012-08-04 14:57:19.624255359 +0200
-+++ k3b/libk3bdevice/configure.in.in	2012-08-04 14:57:33.719128285 +0200
-@@ -165,7 +165,7 @@
-   dbusqt_lib=NOTFOUND
-   dbusqt=NOTFOUND
- 
--  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /opt/trinity/include/dbus-1.0"
-   AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
- 
-   if test -r $dbusqt_incdir/dbus/connection.h ; then
diff --git a/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch b/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 1ae2079e9..000000000
--- a/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- k3b/libk3bdevice/Makefile.am.ORI	2012-08-04 14:09:53.794930123 +0200
-+++ k3b/libk3bdevice/Makefile.am	2012-08-04 14:10:08.246593402 +0200
-@@ -6,7 +6,7 @@
- 
- lib_LTLIBRARIES = libk3bdevice.la
- 
--libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS)
-+libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) $(LIB_QT) $(LIB_KDECORE)
- 
- # lib version 5 for K3b 1.0
- libk3bdevice_la_LDFLAGS = $(all_libraries) -version-info 5:0:0 -no-undefined
---- k3b/libk3b/Makefile.am.ORI	2012-08-04 14:13:26.067400663 +0200
-+++ k3b/libk3b/Makefile.am	2012-08-04 14:13:34.150243648 +0200
-@@ -16,7 +16,7 @@
- 	plugin/libk3bplugin.la \
- 	tools/libk3btools.la \
- 	jobs/libjobs.la \
--	$(VIDEODVDLIB) \
-+	$(VIDEODVDLIB) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIBDL) -lkdefx -lDCOP \
- 	../libk3bdevice/libk3bdevice.la
- 
- libk3b_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
---- k3b/plugins/decoder/wave/Makefile.am.ORI	2012-08-04 15:26:55.434435396 -0400
-+++ k3b/plugins/decoder/wave/Makefile.am	2012-08-04 15:27:06.802685139 -0400
-@@ -4,7 +4,7 @@
- 
- libk3bwavedecoder_la_SOURCES = k3bwavedecoder.cpp
- 
--libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) ../../../libk3b/libk3b.la
-+libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la
- libk3bwavedecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/decoder/ogg/Makefile.am.ORI	2012-08-04 15:33:41.805310213 -0400
-+++ k3b/plugins/decoder/ogg/Makefile.am	2012-08-04 15:34:09.767685132 -0400
-@@ -5,6 +5,6 @@
- libk3boggvorbisdecoder_la_SOURCES = k3boggvorbisdecoder.cpp
- 
--libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la -logg -lvorbis -lvorbisfile 
-+libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
- libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/decoder/flac/Makefile.am.ORI	2012-08-04 15:39:28.418435409 -0400
-+++ k3b/plugins/decoder/flac/Makefile.am	2012-08-04 15:39:41.490685093 -0400
-@@ -4,7 +4,7 @@
- 
- libk3bflacdecoder_la_SOURCES = k3bflacdecoder.cpp
- 
--libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lFLAC++ -lFLAC $(taglib_libs) 
-+libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lFLAC++ -lFLAC $(taglib_libs)
- libk3bflacdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/decoder/libsndfile/Makefile.am.ORI	2012-08-04 15:43:24.035435310 -0400
-+++ k3b/plugins/decoder/libsndfile/Makefile.am	2012-08-04 15:43:33.579684947 -0400
-@@ -4,7 +4,7 @@
- 
- libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp
- 
--libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lsndfile
-+libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lsndfile
- libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/decoder/musepack/Makefile.am.ORI	2012-08-04 15:46:29.503435327 -0400
-+++ k3b/plugins/decoder/musepack/Makefile.am	2012-08-04 15:46:37.662685065 -0400
-@@ -7,7 +7,7 @@
- 
- libk3bmpcdecoder_la_SOURCES = k3bmpcdecoder.cpp k3bmpcwrapper.cpp
- 
--libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(MPC_LIBS)
-+libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
- libk3bmpcdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/encoder/sox/Makefile.am.ORI	2012-08-04 15:48:44.045310191 -0400
-+++ k3b/plugins/encoder/sox/Makefile.am	2012-08-04 15:48:53.509685113 -0400
-@@ -4,7 +4,7 @@
- 
- libk3bsoxencoder_la_SOURCES = base_k3bsoxencoderconfigwidget.ui k3bsoxencoder.cpp
- 
--libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
-+libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT)
- libk3bsoxencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/encoder/external/Makefile.am.ORI	2012-08-04 15:51:06.900310165 -0400
-+++ k3b/plugins/encoder/external/Makefile.am	2012-08-04 15:51:16.084435154 -0400
-@@ -6,7 +6,7 @@
- 	base_k3bexternalencodereditwidget.ui k3bexternalencoder.cpp \
- 	k3bexternalencoderconfigwidget.cpp k3bexternalencodercommand.cpp
- 
--libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
-+libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
- libk3bexternalencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/encoder/ogg/Makefile.am.ORI	2012-08-04 15:53:42.509310180 -0400
-+++ k3b/plugins/encoder/ogg/Makefile.am	2012-08-04 15:53:52.493684861 -0400
-@@ -4,7 +4,7 @@
- 
- libk3boggvorbisencoder_la_SOURCES = base_k3boggvorbisencodersettingswidget.ui k3boggvorbisencoder.cpp
- 
--libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc
-+libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc $(LIB_QT) $(LIB_KDEUI)
- libk3boggvorbisencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/audiooutput/arts/Makefile.am.ORI	2012-08-04 15:56:16.309435344 -0400
-+++ k3b/plugins/audiooutput/arts/Makefile.am	2012-08-04 15:56:26.541685090 -0400
-@@ -4,7 +4,7 @@
- 
- libk3bartsoutputplugin_la_SOURCES = k3bartsoutputplugin.cpp
- 
--libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc
-+libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc $(LIB_KDECORE) $(LIB_QT)
- libk3bartsoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/audiooutput/alsa/Makefile.am.ORI	2012-08-04 15:58:27.539435332 -0400
-+++ k3b/plugins/audiooutput/alsa/Makefile.am	2012-08-04 15:58:42.595685074 -0400
-@@ -5,7 +5,7 @@
- libk3balsaoutputplugin_la_SOURCES = k3balsaoutputplugin.cpp
- 
- libk3balsaoutputplugin_la_CFLAGS = $(ALSA_CFLAGS)
--libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS)
-+libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
- libk3balsaoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/redhat/applications/k3b/k3b-3.5.13.1.spec b/redhat/applications/k3b/k3b-3.5.13.1.spec
deleted file mode 100644
index 5cb371b5f..000000000
--- a/redhat/applications/k3b/k3b-3.5.13.1.spec
+++ /dev/null
@@ -1,409 +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_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/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-k3b
-Summary:	CD/DVD burning application
-Version:	3.5.13.1
-Release:	2%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group:		Applications/Archiving
-License:	GPLv2+
-
-Source0:	k3b-%{version}.tar.gz
-Source2:	k3brc
-
-# Legacy RedHat / Fedora patches
-# manual bufsize (upstream?)
-Patch4:		k3b-1.0.4-manualbufsize.patch
-# RHEL6: Fix K3B icon
-Patch106:	trinity-k3b-icons.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-dbus-tqt-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	alsa-lib-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	hal-devel
-BuildRequires:	gettext
-BuildRequires:	libdvdread-devel
-BuildRequires:	libmpcdec-devel
-BuildRequires:	libmusicbrainz-devel
-BuildRequires:	libsamplerate-devel
-BuildRequires:	libsndfile-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	taglib-devel
-BuildRequires:	zlib-devel
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-
-Requires: cdrecord mkisofs
-Requires: cdrdao
-Requires: dvd+rw-tools
-
-# FLAC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}flac-devel
-BuildRequires:	%{_lib}flac++-devel
-%else
-BuildRequires:	flac-devel
-%endif
-
-# MAD support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define with_mad 1
-BuildRequires:		%{_lib}mad-devel
-%endif
-
-# LAME support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define with_lame 1
-BuildRequires:		%{_lib}lame-devel
-%endif
-
-# FFMPEG support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define with_ffmpeg 1
-BuildRequires:		%{_lib}ffmpeg-devel
-%endif
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING TODO ChangeLog
-%{tde_bindir}/k3b
-%{tde_tdelibdir}/kfile_k3b.la
-%{tde_tdelibdir}/kfile_k3b.so
-%{tde_tdelibdir}/kio_videodvd.la
-%{tde_tdelibdir}/kio_videodvd.so
-%{tde_tdelibdir}/libk3balsaoutputplugin.la
-%{tde_tdelibdir}/libk3balsaoutputplugin.so
-%{tde_tdelibdir}/libk3bartsoutputplugin.la
-%{tde_tdelibdir}/libk3bartsoutputplugin.so
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so
-%{tde_tdelibdir}/libk3bexternalencoder.la
-%{tde_tdelibdir}/libk3bexternalencoder.so
-%{tde_tdelibdir}/libk3bflacdecoder.la
-%{tde_tdelibdir}/libk3bflacdecoder.so
-%{tde_tdelibdir}/libk3blibsndfiledecoder.la
-%{tde_tdelibdir}/libk3blibsndfiledecoder.so
-%{tde_tdelibdir}/libk3bmpcdecoder.la
-%{tde_tdelibdir}/libk3bmpcdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisdecoder.la
-%{tde_tdelibdir}/libk3boggvorbisdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisencoder.la
-%{tde_tdelibdir}/libk3boggvorbisencoder.so
-%{tde_tdelibdir}/libk3bsoxencoder.la
-%{tde_tdelibdir}/libk3bsoxencoder.so
-%{tde_tdelibdir}/libk3bwavedecoder.la
-%{tde_tdelibdir}/libk3bwavedecoder.so
-%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
-
-##########
-
-%package common
-Summary:  Common files of %{name}
-Group:    Applications/Archiving
-Requires: %{name} = %{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildArch: noarch
-%endif
-
-%description common
-%{summary}.
-
-%files common
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/k3b.desktop
-%{tde_datadir}/applnk/.hidden/k3b-cue.desktop
-%{tde_datadir}/applnk/.hidden/k3b-iso.desktop
-%{tde_datadir}/apps/k3b/
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_datadir}/config/k3brc
-%{tde_datadir}/mimelnk/application/x-k3b.desktop
-%{tde_datadir}/icons/hicolor/*/apps/k3b.png
-%{tde_datadir}/services/kfile_k3b.desktop
-%{tde_datadir}/services/videodvd.protocol
-%{tde_datadir}/sounds/k3b_error1.wav
-%{tde_datadir}/sounds/k3b_success1.wav
-%{tde_datadir}/sounds/k3b_wait_media1.wav
-
-
-%post common
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-
-%postun common
-if [ $1 -eq 0 ] ; then
-  touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-  update-desktop-database %{tde_appdir} -q &> /dev/null
-fi
-
-%posttrans common
-gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database %{tde_appdir} -q &> /dev/null
-
-##########
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/libk3b.so.3
-%{tde_libdir}/libk3b.so.3.0.0
-%{tde_libdir}/libk3bdevice.so.5
-%{tde_libdir}/libk3bdevice.so.5.0.0
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-##########
-
-%package devel
-Summary: Files for the development of applications which will use %{name} 
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libk3b.so
-%{tde_libdir}/libk3bdevice.so
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?with_mad}
-%package plugin-mad
-Summary: The MAD plugin for K3B
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-mad
-%{summary}.
-
-MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
-and the MPEG-2  extension to Lower Sampling Frequencies, as well as the
-so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
-and Layer III a.k.a. MP3) are fully implemented.
-
-%files plugin-mad
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bmaddecoder.la
-%{tde_tdelibdir}/libk3bmaddecoder.so
-%endif
-
-##########
-
-%if 0%{?with_lame}
-%package plugin-lame
-Summary: The LAME plugin for K3B
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-lame
-%{summary}.
-
-Personal and commercial use of compiled versions of LAME (or any other mp3
-encoder) requires a patent license in some countries.
-
-This package is in tainted, as MP3 encoding is covered by software patents.
-
-%files plugin-lame
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3blameencoder.la
-%{tde_tdelibdir}/libk3blameencoder.so
-%endif
-
-##########
-
-%if 0%{?with_ffmpeg}
-%package plugin-ffmpeg
-Summary: The FFMPEG plugin for K3B
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-ffmpeg
-%{summary}.
-
-ffmpeg is a hyper fast realtime audio/video encoder, a streaming server
-and a generic audio and video file converter.
-
-%files plugin-ffmpeg
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bffmpegdecoder.la
-%{tde_tdelibdir}/libk3bffmpegdecoder.so
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -a 0 -n k3b-3.5.13.1
-
-# set in k3brc too 
-%patch4 -p1 -b .manualbufsize
-%patch106 -p1 -b .desktopfile
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-k3bsetup=no \
-  --without-cdrecord-suid-root \
-  --with-oggvorbis \
-  --with-flac \
-  --with-external-libsamplerate \
-  --with-libdvdread \
-  --with-musicbrainz \
-  --with-sndfile \
-  %{?with_ffmpeg:--with-ffmpeg} %{?!with_ffmpeg:--without-ffmpeg} \
-  %{?with_lame:--with-lame} %{?!with_lame:--without-lame} \
-  %{?with_mad:--with-libmad} %{?!with_mad:--without-libmad} \
-  --with-musepack \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc
-
-# remove the .la files
-%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
-
-# remove i18n for Plattdeutsch (Low Saxon)
-#%__rm -fr %{buildroot}%{tde_datadir}/locale/nds
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%changelog
-* Sun Jan 06 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2
-- Enables FFMPEG support
-- Enables LAME support
-- Enables MAD support
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
-- Remove requirement for resmgr
-
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Add support for Mageia 2 and Mandriva 2011
-- Fix DBUS-TQT detection that prevented HAL support
-- Adds requirement for resmgr
-
-* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Removes i18 files (built separately)
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Rebuilt for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
diff --git a/redhat/applications/k3b/k3b-3.5.13.spec b/redhat/applications/k3b/k3b-3.5.13.spec
deleted file mode 100644
index aca04f95e..000000000
--- a/redhat/applications/k3b/k3b-3.5.13.spec
+++ /dev/null
@@ -1,319 +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_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/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-k3b
-Summary:	CD/DVD burning application
-Version:	3.5.13
-Release:	5%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group:		Applications/Archiving
-License:	GPLv2+
-
-Source0:	k3b-%{version}.tar.gz
-Source2:	k3brc
-
-# Legacy RedHat / Fedora patches
-# manual bufsize (upstream?)
-Patch4:		k3b-1.0.4-manualbufsize.patch
-# RHEL6: Fix K3B icon
-Patch106:	trinity-k3b-icons.patch
-# [k3b] Fix compilation with GCC 4.7 [Bug #958]
-Patch108:	k3b-3.5.13-fix_Range_r_3-gcc47.patch
-# [k3b] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011
-Patch109:	k3b-3.5.13-missing_ldflags.patch
-# [k3b] Fix dbus-tqt header detection, required for HAL support
-Patch110:	k3b-3.5.13-fix_dbus_tqt_detection.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: desktop-file-utils
-BuildRequires: alsa-lib-devel
-BuildRequires: audiofile-devel
-BuildRequires: dbus-tqt-devel hal-devel
-BuildRequires: gettext
-BuildRequires: libdvdread-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: libmusicbrainz-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libvorbis-devel
-BuildRequires: taglib-devel
-BuildRequires: zlib-devel
-BuildRequires: %{_lib}resmgr-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}flac-devel
-BuildRequires:	%{_lib}flac++-devel
-%else
-BuildRequires:	flac-devel
-%endif
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-
-Requires: cdrecord mkisofs
-Requires: cdrdao
-Requires: dvd+rw-tools
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING TODO ChangeLog
-%{tde_bindir}/k3b
-%{tde_tdelibdir}/kfile_k3b.la
-%{tde_tdelibdir}/kfile_k3b.so
-%{tde_tdelibdir}/kio_videodvd.la
-%{tde_tdelibdir}/kio_videodvd.so
-%{tde_tdelibdir}/libk3balsaoutputplugin.la
-%{tde_tdelibdir}/libk3balsaoutputplugin.so
-%{tde_tdelibdir}/libk3bartsoutputplugin.la
-%{tde_tdelibdir}/libk3bartsoutputplugin.so
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so
-%{tde_tdelibdir}/libk3bexternalencoder.la
-%{tde_tdelibdir}/libk3bexternalencoder.so
-%{tde_tdelibdir}/libk3bflacdecoder.la
-%{tde_tdelibdir}/libk3bflacdecoder.so
-%{tde_tdelibdir}/libk3blibsndfiledecoder.la
-%{tde_tdelibdir}/libk3blibsndfiledecoder.so
-%{tde_tdelibdir}/libk3bmpcdecoder.la
-%{tde_tdelibdir}/libk3bmpcdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisdecoder.la
-%{tde_tdelibdir}/libk3boggvorbisdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisencoder.la
-%{tde_tdelibdir}/libk3boggvorbisencoder.so
-%{tde_tdelibdir}/libk3bsoxencoder.la
-%{tde_tdelibdir}/libk3bsoxencoder.so
-%{tde_tdelibdir}/libk3bwavedecoder.la
-%{tde_tdelibdir}/libk3bwavedecoder.so
-%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
-
-##########
-
-%package common
-Summary:  Common files of %{name}
-Group:    Applications/Archiving
-Requires: %{name} = %{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildArch: noarch
-%endif
-
-%description common
-%{summary}.
-
-%files common
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/k3b.desktop
-%{tde_datadir}/applnk/.hidden/k3b-cue.desktop
-%{tde_datadir}/applnk/.hidden/k3b-iso.desktop
-%{tde_datadir}/apps/k3b/
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_datadir}/config/k3brc
-%{tde_datadir}/mimelnk/application/x-k3b.desktop
-%{tde_datadir}/icons/hicolor/*/apps/k3b.png
-%{tde_datadir}/services/kfile_k3b.desktop
-%{tde_datadir}/services/videodvd.protocol
-%{tde_datadir}/sounds/k3b_error1.wav
-%{tde_datadir}/sounds/k3b_success1.wav
-%{tde_datadir}/sounds/k3b_wait_media1.wav
-
-
-%post common
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-
-%postun common
-if [ $1 -eq 0 ] ; then
-  touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-  update-desktop-database %{tde_appdir} -q &> /dev/null
-fi
-
-%posttrans common
-gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database %{tde_appdir} -q &> /dev/null
-
-##########
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/libk3b.so.3
-%{tde_libdir}/libk3b.so.3.0.0
-%{tde_libdir}/libk3bdevice.so.5
-%{tde_libdir}/libk3bdevice.so.5.0.0
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-##########
-
-%package devel
-Summary: Files for the development of applications which will use %{name} 
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/k3b/
-%{tde_libdir}/libk3b.so
-%{tde_libdir}/libk3bdevice.so
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%prep
-%setup -q -a 0 -n applications/k3b
-
-# set in k3brc too 
-%patch4 -p1 -b .manualbufsize
-%patch106 -p1 -b .desktopfile
-%patch108 -p1
-%patch109 -p1 -b .ldflags
-%patch110 -p1 -b .dbustqt
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir}/k3b \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-k3bsetup=no \
-  --without-cdrecord-suid-root \
-  --with-oggvorbis \
-  --with-flac \
-  --with-external-libsamplerate \
-  --with-libdvdread \
-  --with-musicbrainz \
-  --with-sndfile \
-  --without-ffmpeg --without-lame --without-libmad \
-  --with-musepack \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc
-
-# remove the .la files
-%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
-
-# remove i18n for Plattdeutsch (Low Saxon)
-#%__rm -fr %{buildroot}%{tde_datadir}/locale/nds
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%changelog
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Add support for Mageia 2 and Mandriva 2011
-- Fix DBUS-TQT detection that prevented HAL support
-- Adds requirement for resmgr
-
-* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Removes i18 files (built separately)
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Rebuilt for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
diff --git a/redhat/applications/k3b/reload-for-verification.diff b/redhat/applications/k3b/reload-for-verification.diff
deleted file mode 100644
index a94298181..000000000
--- a/redhat/applications/k3b/reload-for-verification.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- libk3b/jobs/k3bverificationjob.cpp.sav	2008-05-27 10:24:20.000000000 +0200
-+++ libk3b/jobs/k3bverificationjob.cpp	2009-06-11 17:58:58.000000000 +0200
-@@ -154,6 +154,20 @@ void K3bVerificationJob::start()
-   emit newTask( i18n("Checking medium") );
- 
-   d->mediumHasBeenReloaded = false;
-+  connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::LOAD, d->device ),
-+           SIGNAL(finished(K3bDevice::DeviceHandler*)),
-+           this,
-+           SLOT(slotMediaLoaded()) );
-+}
-+
-+void K3bVerificationJob::slotMediaLoaded()
-+{
-+    // we always need to wait for the medium. Otherwise the diskinfo below
-+    // may run before the drive is ready!
-+    waitForMedia( d->device,
-+                  K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
-+                  K3bDevice::MEDIA_WRITABLE );
-+
-   connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
-            SIGNAL(finished(K3bDevice::DeviceHandler*)),
-            this,
---- libk3b/jobs/k3bverificationjob.h.sav	2008-05-27 10:24:20.000000000 +0200
-+++ libk3b/jobs/k3bverificationjob.h	2009-06-11 17:13:37.000000000 +0200
-@@ -75,6 +75,7 @@ class K3bVerificationJob : public K3bJob
-   void setGrownSessionSize( const K3b::Msf& );
- 
-  private slots:
-+  void slotMediaLoaded();
-   void slotMediaReloaded( bool success );
-   void slotDiskInfoReady( K3bDevice::DeviceHandler* dh );
-   void readTrack( int trackIndex );