rpms/kdemultimedia/devel kdemultimedia.spec,1.178,1.179

Rex Dieter rdieter at fedoraproject.org
Thu Apr 1 19:30:57 UTC 2010


Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12160

Modified Files:
	kdemultimedia.spec 
Log Message:
fix Version
apply kscd patch conditionally



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- kdemultimedia.spec	29 Mar 2010 16:04:54 -0000	1.178
+++ kdemultimedia.spec	1 Apr 2010 19:30:56 -0000	1.179
@@ -1,8 +1,8 @@
 
 Name:    kdemultimedia
 Epoch:   6
-Version: 4.4.1
-Release: 2%{?dist}
+Version: 4.4.2
+Release: 1%{?dist}
 Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
@@ -37,8 +37,9 @@ BuildRequires: taglib-devel
 %if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
 # needed to build Kscd, keep
+%define kscd 1
 BuildRequires: libtunepimp-devel libmusicbrainz-devel
-%global mplayerthumbs 1
+%define mplayerthumbs 1
 %endif
 
 Requires: %{name}-libs%{?isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -57,7 +58,7 @@ The %{name} package contains multimedia 
 * dragonplayer (a simple video player)
 * juk (a music manager and player)
 * kmix (an audio mixer)
-%if 0%{?fedora}
+%if 0%{?kscd}
 * kscd (an Audio-CD player)
 %endif
 
@@ -88,7 +89,9 @@ Requires: kdelibs4-devel
 %if ! 0%{?mplayerthumbs}
 %patch1 -p1 -b .nomplayerthumbs
 %endif
+%if ! 0%{?kscd}
 %patch2 -p1 -b .kscd_doc
+%endif
 %patch3 -p1 -b .kmix-pulse
 
 
@@ -144,7 +147,7 @@ fi
 %{_kde4_appsdir}/kmix/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/konqsidebartng/
-%if 0%{?fedora}
+%if 0%{?kscd}
 %{_kde4_appsdir}/profiles/
 %{_kde4_appsdir}/kscd/
 %{_kde4_appsdir}/solid/actions/kscd-play-audiocd.desktop



More information about the scm-commits mailing list