From 74da740d27074277798c2b51309a961a1353810d Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Jun 26 2006 13:10:36 +0000 Subject: fix #196605, BR: cdparanoia --- diff --git a/kdemultimedia-3.5.3-examples.patch b/kdemultimedia-3.5.3-examples.patch new file mode 100644 index 0000000..4b672d0 --- /dev/null +++ b/kdemultimedia-3.5.3-examples.patch @@ -0,0 +1,22 @@ +--- kdemultimedia-3.5.3-patched/kmid/Makefile.in.orig 2006-06-26 14:33:57.000000000 +0200 ++++ kdemultimedia-3.5.3-patched/kmid/Makefile.in 2006-06-26 14:34:09.000000000 +0200 +@@ -556,7 +556,7 @@ + #>- METASOURCES = AUTO + servicetype_DATA = audiomidi.desktop + servicetypedir = $(kde_servicetypesdir) +-SUBDIRS = maps examples pics ++SUBDIRS = maps pics + xdg_apps_DATA = kmid.desktop + mime_DATA = x-karaoke.desktop + mimedir = $(kde_mimedir)/audio +--- kdemultimedia-3.5.3-patched/kmid/Makefile.am.orig 2006-06-26 14:32:27.000000000 +0200 ++++ kdemultimedia-3.5.3-patched/kmid/Makefile.am 2006-06-26 14:32:40.000000000 +0200 +@@ -38,7 +38,7 @@ + servicetype_DATA = audiomidi.desktop + servicetypedir = $(kde_servicetypesdir) + +-SUBDIRS = maps examples pics ++SUBDIRS = maps pics + + xdg_apps_DATA = kmid.desktop + diff --git a/kdemultimedia.spec b/kdemultimedia.spec index e3f7cfd..cdfd637 100644 --- a/kdemultimedia.spec +++ b/kdemultimedia.spec @@ -2,81 +2,52 @@ %define final 0 %define make_cvs 1 -# support mp3 -%define build_mpeglib 0 - -%define my_vendor kde - -%define qt_version 3.3.5 +%define qt_version 3.3.6 %define libtool 1 -%define alsa 1 -%define juk 0 -%define cdparanoia 1 %define arts 1 %define redhatify 1 %define appdir %{_datadir}/applications/kde -%if %{build_mpeglib} -%define patch_name %{nil} -%else -%define patch_name -patched -%endif - -%define disable_gcc_check_and_hidden_visibility 1 - Version: 3.5.3 -Release: 3 +Release: 4 Epoch: 6 Name: kdemultimedia Prefix: /usr Summary: Multimedia applications for the K Desktop Environment (KDE). Group: Applications/Multimedia -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Url: http://www.kde.org -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2 +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2 Patch1: kde-libtool.patch Patch2: kdemultimedia-3.5.3-config.patch Patch3: kdemultimedia-3.4.0-xdg.patch +Patch4: kdemultimedia-3.5.3-examples.patch -Prereq: /sbin/ldconfig - -Requires: kdelibs >= 6:%{version} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig Requires: kdebase >= 6:%{version} BuildRequires: zlib-devel BuildRequires: kdebase-devel >= %{version} -BuildRequires: libjpeg-devel BuildRequires: gcc-c++ BuildRequires: glibc-devel BuildRequires: perl BuildRequires: libvorbis-devel BuildRequires: audiofile-devel BuildRequires: glib2-devel -BuildRequires: libmng-devel BuildRequires: /usr/bin/desktop-file-install BuildRequires: libtheora-devel +BuildRequires: flac-devel %if %{make_cvs} BuildRequires: autoconf automake libtool %endif -%if %{build_mpeglib} -BuildRequires: libXxf86dga-devel -%endif -%if %{alsa} BuildRequires: alsa-lib-devel >= 1.0.2 -%endif -%if %{cdparanoia} +BuildRequires: cdparanoia BuildRequires: cdparanoia-devel -%endif -%if %{juk} -BuildRequires: taglib => 1.0 -BuildRequires: libmusicbrainz >= 2.1 -BuildRequires: libtunepimp -Obsoletes: juk -%endif %description The K Desktop Environment (KDE) is a GUI desktop for the X Window @@ -106,13 +77,11 @@ applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or noatun plugins. %prep -%setup -q -n %{name}-%{version}%{patch_name} +%setup -q -n %{name}-%{version}-patched %patch1 -p1 %patch2 -p1 -b .config %patch3 -p1 -b .xdg - -perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in -perl -pi -e "s,examples,,g" kmid/Make* +%patch4 -p1 -b .examples %if %{make_cvs} make -f admin/Makefile.common cvs @@ -120,44 +89,22 @@ perl -pi -e "s,examples,,g" kmid/Make* %build unset QTDIR || : ; . /etc/profile.d/qt.sh -FLAGS="%{optflags}" -export KDEDIR=%{prefix} -export PATH=%{prefix}/bin:$PATH -export CFLAGS="$FLAGS" -export CXXFLAGS="$FLAGS" - -%if %{arts} -export CFLAGS="$CFLAGS `artsc-config --cflags`" -export CXXFLAGS="$CXXFLAGS `artsc-config --cflags`" -export CPPFLAGS="$CPPFLAGS `artsc-config --cflags`" -export LDFLAGS="$LDFLAGS `artsc-config --libs`" -%endif %configure \ -%if 0 --enable-new-ldflags \ -%endif --disable-dependency-tracking \ - --with-qt-libraries=$QTDIR/lib \ - --disable-motif \ - --with-motif-includes=none \ - --with-motif-libraries=none \ - --with-extra-includes=/usr/include/cdda \ -%if %{disable_gcc_check_and_hidden_visibility} + --with-extra-includes=%{_includedir}/cdda \ + --includedir=%{_includedir}/kde \ --disable-gcc-hidden-visibility \ -%endif -%if %{cdparanoia} == 0 - --disable-cdparanoia \ -%endif + --with-cdparanoia \ + --with-flac \ + --with-theora \ + --with-vorbis \ %if %{arts} == 0 --without-arts \ %endif -%if %{alsa} --with-alsa \ --with-arts-alsa \ -%endif - --disable-rpath \ - --includedir=%{_includedir}/kde \ --with-xinerama \ %if %{debug} == 0 --disable-debug \ @@ -167,12 +114,11 @@ export LDFLAGS="$LDFLAGS `artsc-config --libs`" %if %{final} --enable-final \ %endif - --disable-xaw + --disable-rpath -SMP_MFLAGS=%{?_smp_mflags} -make $SMP_MFLAGS -make $SMP_MFLAGS -C kaudiocreator +make %{?_smp_mflags} +make %{?_smp_mflags} -C kaudiocreator %install rm -rf %{buildroot} @@ -188,10 +134,6 @@ make -C kaudiocreator DESTDIR=%{buildroot} install done %endif -%if ! %{juk} - rm -rf %{buildroot}%{_docdir}/HTML/en/juk -%endif - # don't make these world-writeable chmod go-w %{buildroot}%{_datadir}/apps/kscd/* @@ -212,12 +154,10 @@ rm -rf %{buildroot} %defattr(-,root,root) /etc/xdg/menus/applications-merged/* %doc %{_docdir}/HTML/en/artsbuilder -%if %{juk} -%doc %{_docdir}/HTML/en/juk -%endif +%exclude %doc %{_docdir}/HTML/en/juk %doc %{_docdir}/HTML/en/kaboodle %doc %{_docdir}/HTML/en/kaudiocreator -%doc %{_docdir}/HTML/en/kdemultimedia%{patch_name}-apidocs +%doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs %doc %{_docdir}/HTML/en/kioslave %doc %{_docdir}/HTML/en/kmid %doc %{_docdir}/HTML/en/kmix @@ -247,6 +187,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libkdeinit_* %changelog +* Mon Jun 26 2006 Than Ngo 6:3.5.3-4 +- fix #196605, BR: cdparanoia + * Thu Jun 08 2006 Than Ngo 6:3.5.3-3 - move only *.so symlinks to -devel subpackage