rpms/kdemultimedia/FC-4 kdemultimedia.spec, 1.47, 1.48 sources, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdemultimedia/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6013

Modified Files:
	kdemultimedia.spec sources 
Log Message:
update to 3.5.2



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/kdemultimedia.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdemultimedia.spec	22 Feb 2006 16:55:29 -0000	1.47
+++ kdemultimedia.spec	11 Apr 2006 21:13:46 -0000	1.48
@@ -26,8 +26,8 @@
 %define patch_name -patched
 %endif
 
-Version: 3.5.1
-Release: 0.2.fc4
+Version: 3.5.2
+Release: 0.1.fc4
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -106,11 +106,6 @@
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 
-# remove aktion, we don't ship xanim (license problems)
-%if %{redhatify}
-   rm -rf doc/aktion aktion
-%endif
-
 perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in
 perl -pi -e "s,examples,,g" kmid/Make*
 
@@ -120,27 +115,15 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-export KDEDIR=%{prefix}
-export PATH=%{prefix}/bin:$PATH
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
-
-%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  \
+%configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --disable-motif \
    --with-motif-includes=none \
    --with-motif-libraries=none \
-   --with-extra-includes=/usr/include/cdda \
+   --with-extra-includes=%{_includedir}/cdda \
 %if %{debug} == 0
    --disable-debug \
    --without-debug \
@@ -173,27 +156,27 @@
 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
@@ -204,7 +187,7 @@
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -214,6 +197,7 @@
 %doc %{_docdir}/HTML/en/juk
 %endif
 %doc %{_docdir}/HTML/en/kaboodle
+%doc %{_docdir}/HTML/en/kaudiocreator
 %doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs
 %doc %{_docdir}/HTML/en/kioslave
 %doc %{_docdir}/HTML/en/kmid
@@ -241,6 +225,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4 
+- update to 3.5.2
+
 * Wed Feb 22 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.2.fc4
 - add missing protocol audiocd #176637
 - remove useless rpm macro #180009


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	1 Feb 2006 20:28:33 -0000	1.30
+++ sources	11 Apr 2006 21:13:46 -0000	1.31
@@ -1 +1 @@
-31630864143d052b8f4342da0fa098fd  kdemultimedia-3.5.1-patched.tar.bz2
+54f9947051ee5cf50c81a5ea382943f1  kdemultimedia-3.5.2-patched.tar.bz2