rpms/kdemultimedia/devel kdemultimedia.spec,1.75,1.76

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	kdemultimedia.spec 
Log Message:
fix file conflict #202944



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdemultimedia.spec	10 Aug 2006 13:43:16 -0000	1.75
+++ kdemultimedia.spec	6 Sep 2006 14:17:43 -0000	1.76
@@ -12,7 +12,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 Name: kdemultimedia
 Summary: Multimedia applications for the K Desktop Environment (KDE).
@@ -181,9 +181,13 @@
 %doc %{_docdir}/HTML/en/kscd
 %doc %{_docdir}/HTML/en/noatun
 %{_libdir}/mcop/*
-%{_libdir}/lib*.so.*
 %{_libdir}/*.la
 %{_libdir}/libkdeinit_*.so
+%{_libdir}/lib*.so.*
+%{_libdir}/libartseffects.so
+%{_libdir}/libnoatunarts.so
+%{_libdir}/liboggarts.so
+%{_libdir}/libwinskinvis.so
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin/*
 %{_bindir}/*
@@ -202,9 +206,16 @@
 %{_includedir}/kde/*
 %{_libdir}/*.so
 %exclude %{_libdir}/libkdeinit_*
+%exclude %{_libdir}/libartseffects.so
+%exclude %{_libdir}/libnoatunarts.so
+%exclude %{_libdir}/liboggarts.so
+%exclude %{_libdir}/libwinskinvis.so
 
 %changelog
-* Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1%{?dist}
+* Wed Sep 06 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
+- fix file conflict #202944
+
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - rebuild
 
 * Mon Jul 24 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.pre1