rpms/kdemultimedia/devel kdemultimedia.spec,1.80,1.81
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu May 10 03:08:35 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8061
Modified Files:
kdemultimedia.spec
Log Message:
* Wed May 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-6
- extras=1
Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdemultimedia.spec 19 Apr 2007 10:34:52 -0000 1.80
+++ kdemultimedia.spec 10 May 2007 03:08:01 -0000 1.81
@@ -1,21 +1,28 @@
-%define extras 0
%define debug 0
%define final 0
%define make_cvs 1
-
%define appdir %{_datadir}/applications/kde
-Version: 3.5.6
-Release: 4%{?dist}
-Epoch: 6
+# former extras bits
+%define _with_akode --with-akode
+## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
+#define _with_musicbrainz --with-musicbrainz
+%define _with_libsamplerate --with-libsamplerate
+%define _with_taglib --with-taglib
+%define _with_xine --with-xine
+
Name: kdemultimedia
Summary: Multimedia applications for the K Desktop Environment (KDE)
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Epoch: 6
+Version: 3.5.6
+Release: 6%{?dist}
+
License: GPL
+Group: Applications/Multimedia
Url: http://www.kde.org
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch2: kdemultimedia-3.5.6-config.patch
Patch3: kdemultimedia-3.4.0-xdg.patch
@@ -42,25 +49,19 @@
BuildRequires: cdparanoia
BuildRequires: cdparanoia-devel
BuildRequires: gstreamer-devel
-
%if %{make_cvs}
-BuildRequires: autoconf automake libtool
-%endif
-
-%if %{extras}
-BuildRequires: taglib-devel
-BuildRequires: libmusicbrainz-devel
-BuildRequires: libtunepimp-devel
-BuildRequires: akode-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: xine-lib-devel >= 0:1.0
+BuildRequires: automake libtool
%endif
+%{?_with_akode:BuildRequires: akode-devel}
+%{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
+%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
+%{?_with_taglib:BuildRequires: taglib-devel}
+%{?_with_xine:BuildRequires: xine-lib-devel}
%description
The K Desktop Environment (KDE) is a GUI desktop for the X Window
System. The kdemultimedia package contains multimedia applications for
KDE, including:
-
kmid, a midi player
kmix, an audio mixer
arts, additional functionality for the aRts sound system
@@ -68,14 +69,12 @@
kscd, an Audio-CD player
kaudiocreator, a graphical frontend for audio file creation
-
%package devel
Summary: Development files for aRts plugins
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-extras = %{epoch}:%{version}-%{release}
Requires: kdebase-devel
-
%description devel
Development files for aRts and noatun plugins.
Install kdemultimedia-devel if you wish to develop or compile any
@@ -86,7 +85,6 @@
Summary: Extras packages from kdemultimedia
Group: Applications/Multimedia
Requires: %{name} = %{epoch}:%{version}-%{release}
-
%description extras
More multimedia applications for the K Desktop Environment:
* juk, a media player
@@ -110,25 +108,19 @@
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-%if !%{extras}
- DO_NOT_COMPILE=""
- export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"
-%endif
-
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
--with-extra-includes=%{_includedir}/cdda \
--includedir=%{_includedir}/kde \
- --disable-gcc-hidden-visibility \
--with-cdparanoia \
--with-flac \
--with-theora \
--with-vorbis \
--with-alsa \
--with-arts-alsa \
- --with-xinerama \
--with-gstreamer \
+ --without-lame \
%if %{debug} == 0
--disable-debug \
--without-debug \
@@ -137,14 +129,12 @@
%if %{final}
--enable-final \
%endif
-%if %{extras}
- --with-akode \
- --with-taglib \
- --with_libsamplerate \
- --with-xine \
-%endif
- --disable-rpath
-
+ --disable-rpath \
+ %{?_with_akode} %{!?_with_akode:--without-akode} \
+ %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
+ %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
+ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \
+ %{?_with_xine} %{!?_with_xine:--without-xine}
make %{?_smp_mflags}
make %{?_smp_mflags} -C kaudiocreator
@@ -246,7 +236,6 @@
%{_datadir}/icons/hicolor/*/apps/noatun.png
%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
-%if %{extras}
# juk
%doc %lang(en) %{_docdir}/HTML/en/juk/
%{_bindir}/juk
@@ -255,7 +244,6 @@
%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
%{_datadir}/icons/crystalsvg/*/*/juk*
%{_datadir}/icons/hicolor/*/apps/juk.png
-%endif
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -288,7 +276,6 @@
%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png
%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
-%if %{extras}
# juk
%exclude %{_docdir}/HTML/en/juk/
%exclude %{_bindir}/juk
@@ -297,7 +284,6 @@
%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
-%endif
/etc/xdg/menus/applications-merged/*
%{_libdir}/mcop/*
@@ -319,7 +305,7 @@
%{_datadir}/servicetypes/*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_includedir}/kde/*
%{_libdir}/*.so
%exclude %{_libdir}/libkdeinit_*
@@ -329,6 +315,9 @@
%exclude %{_libdir}/libwinskinvis.so
%changelog
+* Wed May 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-6
+- extras=1
+
* Wed Apr 18 2007 Than Ngo <than at redhat.com> - 6:3.5.6-4.fc7
- kaboodle, noatun, juk Split into an extra package
More information about the fedora-extras-commits
mailing list