MGA2/MDV2012: add some applications ...

3 files changed, 327 insertions, 94 deletions

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
new file mode 100644
index 000000000..fcd293c01
--- /dev/null
+++ b/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch
@@ -0,0 +1,22 @@
+--- 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
new file mode 100644
index 000000000..1ae2079e9
--- /dev/null
+++ b/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch
@@ -0,0 +1,131 @@
+--- 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/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
index 544b3ca5b..d33cfb2fe 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
@@ -1,54 +1,66 @@
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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
 
-Name:    trinity-k3b
-Summary: CD/DVD burning application
-Version: 3.5.13
-Release: 4%{?dist}%{?_variant}
+%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:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{?_prefix}" == "/usr"
 Obsoletes: k3b
 %endif
 
-Group:   Applications/Archiving
-License: GPLv2+
+Group:		Applications/Archiving
+License:	GPLv2+
 
-Source0: k3b-%{version}.tar.gz
-Source2: k3brc
+Source0:	k3b-%{version}.tar.gz
+Source2:	k3brc
 
 # Legacy RedHat / Fedora patches
 # manual bufsize (upstream?)
-Patch4: k3b-1.0.4-manualbufsize.patch
-
+Patch4:		k3b-1.0.4-manualbufsize.patch
 # RHEL6: Fix K3B icon
-Patch106: trinity-k3b-icons.patch
-
+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
-
-BuildRequires: trinity-kdelibs-devel
+# [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: flac-devel
 BuildRequires: gettext
 BuildRequires: libdvdread-devel
 BuildRequires: libmpcdec-devel
@@ -58,9 +70,14 @@ BuildRequires: libsndfile-devel
 BuildRequires: libvorbis-devel
 BuildRequires: taglib-devel
 BuildRequires: zlib-devel
+BuildRequires: %{_lib}resmgr-devel
 
-Obsoletes: k3b-extras < 0:1.0-1
-Provides:  k3b-extras = %{version}-%{release} 
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}flac-devel
+BuildRequires:	%{_lib}flac++-devel
+%else
+BuildRequires:	flac-devel
+%endif
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -79,30 +96,137 @@ 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
+%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
@@ -111,13 +235,15 @@ Requires: %{name}-libs = %{version}-%{release}
 %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|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+%__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"
@@ -126,13 +252,17 @@ Requires: %{name}-libs = %{version}-%{release}
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
-CFLAGS="%optflags -fno-strict-aliasing" \
-CXXFLAGS="%optflags -fno-strict-aliasing" \
 %configure \
-  --includedir=%{_includedir}/k3b \
+  --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 \
@@ -147,85 +277,35 @@ CXXFLAGS="%optflags -fno-strict-aliasing" \
   --with-sndfile \
   --without-ffmpeg --without-lame --without-libmad \
   --with-musepack \
-  --with-extra-includes=%{_includedir}/tqt
+  --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}%{_datadir}/config/k3brc
+%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc
 
 # remove the .la files
-%__rm -f %{buildroot}%{_libdir}/libk3b*.la 
+%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
 
 # remove i18n for Plattdeutsch (Low Saxon)
-#%__rm -fr %{buildroot}%{_datadir}/locale/nds
-
+#%__rm -fr %{buildroot}%{tde_datadir}/locale/nds
 
-%check
-export PATH="%{_bindir}:${PATH}"
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /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
-%{tde_docdir}/HTML/en/k3b
-
-%files common
-%defattr(-,root,root,-)
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/applnk/.hidden/*.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
+* 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)