diff --git a/.cvsignore b/.cvsignore index 93ace94..6be4746 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdemultimedia-3.2.2-patched.tar.bz2 +kdemultimedia-3.2.3-patched.tar.bz2 diff --git a/kdemultimedia.spec b/kdemultimedia.spec index 149449b..104e88d 100644 --- a/kdemultimedia.spec +++ b/kdemultimedia.spec @@ -1,24 +1,22 @@ %define debug 0 %define final 0 -%define rpm_clean 1 # support mp3 %define build_mpeglib 0 -%define cdparanoia 1 - %define my_vendor kde -%define qt_version 3.3.1 +%define qt_version 3.3.2 %define libtool 1 %define alsa 1 %define juk 0 +%define cdparanoia 1 +%define koncd 0 %define redhatify 1 -%define koncd 0 %define appdir %{_datadir}/applications/kde %if %{build_mpeglib} @@ -27,13 +25,8 @@ %define patch_name -patched %endif -## workaround for gcc bug -%ifarch ia64 s390 s390x -%define optflags -O0 -g -%endif - -Version: 3.2.2 -Release: 2 +Version: 3.2.3 +Release: 1 Epoch: 6 Name: kdemultimedia Prefix: /usr @@ -56,11 +49,10 @@ Requires: kdebase >= 6:%{version} BuildRequires: qt-devel >= %{qt_version} BuildRequires: zlib-devel BuildRequires: XFree86-devel -BuildRequires: kdebase-devel >= 6:3.2.1 +BuildRequires: kdebase-devel >= 6:%{version} BuildRequires: libjpeg-devel BuildRequires: gcc-c++ BuildRequires: glibc-devel -BuildRequires: perl BuildRequires: libvorbis-devel BuildRequires: audiofile-devel BuildRequires: glib2-devel @@ -87,8 +79,9 @@ Obsoletes: kmix Obsoletes: koncd Obsoletes: kscd Obsoletes: aktion +%if %{juk} Obsoletes: juk - +%endif Provides: %{name}-libs Provides: %{name}-brahms Provides: %{name}-arts @@ -139,18 +132,14 @@ noatun plugins. rm -rf doc/aktion aktion %endif +# disable noatun temporary, gcc-3.4 bug +rm -rf noatun +perl -pi -e "s,noatun,,g" subdirs + perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in perl -pi -e "s,examples,,g" kmid/Make* -# Workaround for legacy auto* tools -%if %{libtool} - [ -x /usr/bin/autoconf-2.5? ] && ln -sf /usr/bin/autoconf-2.5? autoconf - [ -x /usr/bin/autoheader-2.5? ] && ln -sf /usr/bin/autoheader-2.5? autoheader - [ -x /usr/bin/aclocal-1.5 ] && ln -sf /usr/bin/aclocal-1.5 aclocal - [ -x /usr/bin/automake-1.5 ] && ln -sf /usr/bin/automake-1.5 automake - export PATH=`pwd`:$PATH - make -f admin/Makefile.common cvs -%endif +make -f admin/Makefile.common cvs %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -190,12 +179,7 @@ export LDFLAGS="$LDFLAGS `artsc-config --libs`" %endif --disable-xaw -# workaround for memory problem on s390x in buildsystem -%ifarch s390x ia64 - SMP_MFLAGS="" -%else - SMP_MFLAGS=%{?_smp_mflags} -%endif +SMP_MFLAGS=%{?_smp_mflags} make $SMP_MFLAGS make $SMP_MFLAGS -C doc @@ -247,9 +231,7 @@ done %postun -p /sbin/ldconfig %clean -%if %{rpm_clean} rm -rf $RPM_BUILD_ROOT -%endif %files %defattr(-,root,root) @@ -283,6 +265,12 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/kde/* %changelog +* Sat Jun 19 2004 Than Ngo 3.2.3-1 +- update to 3.2.3 + +* Wed Jun 02 2004 Than Ngo 6:3.2.2-3 +- remove -O0 on s390/s390x/ia64 + * Wed May 05 2004 Than Ngo 6:3.2.2-2 - cleanup KDE/GNOME menu - add obsolete juk diff --git a/sources b/sources index 6ebef13..cf26974 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8909297362ca8976827990b13f3634b8 kdemultimedia-3.2.2-patched.tar.bz2 +2a4a1f4479368c38ab44e5440df5a970 kdemultimedia-3.2.3-patched.tar.bz2