From ca482e69283210f23d284a77e9bb86ca5c2d9227 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Jun 02 2006 16:55:13 +0000 Subject: update to 3.5.3 --- diff --git a/.cvsignore b/.cvsignore index 9857f96..8413a4f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -11,3 +11,4 @@ kdemultimedia-3.5.0.tar.bz2 kdemultimedia-3.5.0-patched.tar.bz2 kdemultimedia-3.5.1-patched.tar.bz2 kdemultimedia-3.5.2-patched.tar.bz2 +kdemultimedia-3.5.3-patched.tar.bz2 diff --git a/kdemultimedia.spec b/kdemultimedia.spec index ac23a38..5e31fcd 100644 --- a/kdemultimedia.spec +++ b/kdemultimedia.spec @@ -27,8 +27,8 @@ %define disable_gcc_check_and_hidden_visibility 1 -Version: 3.5.2 -Release: 2 +Version: 3.5.3 +Release: 1 Epoch: 6 Name: kdemultimedia Prefix: /usr @@ -117,11 +117,11 @@ perl -pi -e "s,examples,,g" kmid/Make* %build unset QTDIR || : ; . /etc/profile.d/qt.sh -FLAGS="$RPM_OPT_FLAGS -DNDEBUG" +FLAGS="%{optflags}" export KDEDIR=%{prefix} export PATH=%{prefix}/bin:$PATH export CFLAGS="$FLAGS" -export CXXFLAGS="$FLAGS -fno-use-cxa-atexit" +export CXXFLAGS="$FLAGS" %if %{arts} export CFLAGS="$CFLAGS `artsc-config --cflags`" @@ -131,7 +131,9 @@ export LDFLAGS="$LDFLAGS `artsc-config --libs`" %endif %configure \ +%if 0 --enable-new-ldflags \ +%endif --disable-dependency-tracking \ --with-qt-libraries=$QTDIR/lib \ --disable-motif \ @@ -170,27 +172,27 @@ make $SMP_MFLAGS make $SMP_MFLAGS -C kaudiocreator %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT -make -C kaudiocreator DESTDIR=$RPM_BUILD_ROOT install +make install DESTDIR=%{buildroot} +make -C kaudiocreator DESTDIR=%{buildroot} install %if %{redhatify} - for f in $RPM_BUILD_ROOT%{appdir}/*.desktop ; do - if [ -f $RPM_BUILD_ROOT%{appdir}/*.desktop ] ; then + for f in %{buildroot}%{appdir}/*.desktop ; do + if [ -f %{buildroot}%{appdir}/*.desktop ] ; then echo "OnlyShowIn=KDE;" >> $f fi done %endif %if ! %{juk} - rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/juk + rm -rf %{buildroot}%{_docdir}/HTML/en/juk %endif # don't make these world-writeable -chmod go-w $RPM_BUILD_ROOT/%{_datadir}/apps/kscd/* +chmod go-w %{buildroot}%{_datadir}/apps/kscd/* -cd $RPM_BUILD_ROOT/%{_docdir}/HTML/en +cd %{buildroot}%{_docdir}/HTML/en for i in *; do rm -f $i/common ln -sf ../common $i @@ -201,7 +203,7 @@ done %postun -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -239,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/kde/* %changelog +* Fri Jun 02 2006 Than Ngo 6:3.5.3-1 +- update to 3.5.3 + * Tue May 02 2006 Than Ngo 6:3.5.2-2 - add buildrequires on libtheora-devel #190321 - add buildrequires on libXxf86dga-devel #128599 diff --git a/sources b/sources index 83ff70c..b218606 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54f9947051ee5cf50c81a5ea382943f1 kdemultimedia-3.5.2-patched.tar.bz2 +52bb137a4605a35e56ec9dc1070e0e28 kdemultimedia-3.5.3-patched.tar.bz2