rpms/kdemultimedia/devel kdemultimedia.spec,1.169,1.170

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6712

Modified Files:
	kdemultimedia.spec 
Log Message:
* Thu Jan 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-3
- (re)enable mplayerthumbs (fedora-only)



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- kdemultimedia.spec	11 Jan 2010 17:00:04 -0000	1.169
+++ kdemultimedia.spec	14 Jan 2010 14:28:02 -0000	1.170
@@ -2,7 +2,7 @@
 Name:    kdemultimedia
 Epoch:   6
 Version: 4.3.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
@@ -36,6 +36,7 @@ BuildRequires: taglib-devel
 BuildRequires: xine-lib-devel libxcb-devel
 # needed to build Kscd, keep
 BuildRequires: libtunepimp-devel libmusicbrainz-devel
+%global mplayerthumbs 1
 %endif
 
 Requires: %{name}-libs%{?isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -82,10 +83,13 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -n kdemultimedia-%{version}%{?alphatag}
 
+%if ! 0%{?mplayerthumbs}
 %patch1 -p1 -b .nomplayerthumbs
+%endif
 %patch2 -p1 -b .kscd_doc
 %patch3 -p1 -b .kmix_pa
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -147,6 +151,9 @@ fi
 %{_kde4_iconsdir}/oxygen/*/actions/kscd-dock.*
 %endif
 %{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
+%if 0%{?mplayerthumbs}
+%{_kde4_appsdir}/videothumbnail/
+%endif
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
@@ -164,7 +171,7 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -176,6 +183,9 @@ fi
 
 
 %changelog
+* Thu Jan 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-3
+- (re)enable mplayerthumbs (fedora-only)
+
 * Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-2
 - respin kmix_pa patch