[kdemultimedia] drop monolithic conditional use pkgconfig deps
Rex Dieter
rdieter at fedoraproject.org
Tue Sep 20 20:07:20 UTC 2011
commit e6ff6ab7247358651595101d1fa1e13c50c57b3a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Sep 20 15:07:05 2011 -0500
drop monolithic conditional
use pkgconfig deps
kdemultimedia.spec | 182 ++++++++++++++++++----------------------------------
1 files changed, 63 insertions(+), 119 deletions(-)
---
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 4499ffc..f522b51 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -3,14 +3,10 @@
%global tunepimp 1
%endif
-%if 0%{?fedora} && 0%{?fedora} < 16
-%global monolithic 1
-%endif
-
Name: kdemultimedia
Epoch: 6
Version: 4.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: KDE Multimedia applications
Group: Applications/Multimedia
@@ -28,56 +24,32 @@ Patch1: kdemultimedia-4.6.2-no_thumbs.patch
# will be in 4.8
Patch100: kdemultimedia-4.7.1-dragonplayer-phonon-dvd-menu.patch
-BuildRequires: alsa-lib-devel
BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: flac-devel
-BuildRequires: glib2-devel
BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: libtheora-devel
-BuildRequires: libvorbis-devel
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: taglib-devel
%if 0%{?tunepimp}
# juk/kscd
BuildRequires: libtunepimp-devel
%endif
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(flac)
+BuildRequires: pkgconfig(glib-2.0)
%if 0%{?kscd}
-BuildRequires: libmusicbrainz3-devel
+BuildRequires: pkgconfig(libmusicbrainz3)
%endif
+BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
+BuildRequires: pkgconfig(taglib)
+BuildRequires: pkgconfig(theora)
+BuildRequires: pkgconfig(vorbis)
+BuildRequires: pkgconfig(taglib)
-%if 0%{?monolithic}
-Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kdebase-runtime%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
-# compat obsoletes/provides
-#Obsoletes: %{name}-dragonplayer < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-dragonplayer = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: dragonplayer = %{version}-%{release}
-#Obsoletes: %{name}-juk < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-juk = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: juk = %{version}-%{release}
-#Obsoletes: %{name}-kio_audiocd < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-kio_audiocd = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: kio_audiocd = %{version}-%{release}
-#Obsoletes: %{name}-kmix < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-kmix = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: kmix = %{version}-%{release}
-%if 0%{?kscd}
-Provides: %{name}-kscd = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%else
-## would mark this noarch, but rpm complains in monolthic=1 case
-#BuildArch: noarch
+# empty main meta-package to ease upgrades...
Requires: %{name}-dragonplayer = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-juk = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-kio_audiocd = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-kmix = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?kscd}
Requires: %{name}-kscd = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
-
-%if ! 0%{?kscd}
+%else
Obsoletes: %{name}-kscd < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
@@ -195,25 +167,14 @@ rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/cddbretrieval/
rm -rf %{buildroot}
-%if 0%{?monolithic}
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+%files common
+%defattr(-,root,root,-)
+%doc COPYING README
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
+%files
+%defattr(-,root,root,-)
+#empty!
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
- touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
- gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
- update-desktop-database -q &> /dev/null ||:
-fi
-%else
%post dragonplayer
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -232,62 +193,8 @@ if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null ||:
fi
-%post juk
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%posttrans juk
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
-
-%postun juk
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
- update-desktop-database -q &> /dev/null ||:
-fi
-
-%post kmix
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%posttrans kmix
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%postun kmix
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-fi
-
-%if 0%{?kscd}
-%post kscd
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%posttrans kscd
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%postun kscd
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
- gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-fi
-%endif
-%endif
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%files common
-%defattr(-,root,root,-)
-%doc COPYING README
-
-%files
-%defattr(-,root,root,-)
-%if ! 0%{?monolithic}
%files dragonplayer
%defattr(-,root,root,-)
-%endif
%{_kde4_appsdir}/dragonplayer/
%{_kde4_bindir}/dragon
%{_kde4_libdir}/kde4/dragonpart.so
@@ -300,10 +207,22 @@ fi
%{_kde4_datadir}/kde4/services/dragonplayer_part.desktop
%{_kde4_iconsdir}/oxygen/*/actions/player-volume-muted.*
-%if ! 0%{?monolithic}
+%post juk
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans juk
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+
+%postun juk
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ update-desktop-database -q &> /dev/null ||:
+fi
+
%files juk
%defattr(-,root,root,-)
-%endif
%{_kde4_appsdir}/juk/
%{_kde4_bindir}/juk
%{_datadir}/dbus-1/interfaces/org.kde.juk.*.xml
@@ -312,10 +231,8 @@ fi
%{_kde4_docdir}/HTML/en/juk/
%{_kde4_iconsdir}/hicolor/*/apps/juk.*
-%if ! 0%{?monolithic}
%files kio_audiocd
%defattr(-,root,root,-)
-%endif
%{_kde4_appsdir}/kconf_update/audiocd.upd
%{_kde4_appsdir}/kconf_update/upgrade-metadata.sh
# own these to avoid dep on kdebase
@@ -331,10 +248,20 @@ fi
%{_kde4_libdir}/kde4/kcm_audiocd.so
%{_kde4_libdir}/kde4/kio_audiocd.so
-%if ! 0%{?monolithic}
+%post kmix
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans kmix
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%postun kmix
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
%files kmix
%defattr(-,root,root,-)
-%endif
%{_kde4_appsdir}/kmix/
%{_kde4_appsdir}/plasma/services/mixer.operations
%{_kde4_bindir}/kmix*
@@ -351,10 +278,20 @@ fi
%{_kde4_libdir}/kde4/plasma_engine_mixer.so
%if 0%{?kscd}
-%if ! 0%{?monolithic}
+%post kscd
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans kscd
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%postun kscd
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
%files kscd
%defattr(-,root,root,-)
-%endif
%{_kde4_appsdir}/kscd/
%{_kde4_bindir}/kscd
%{_kde4_appsdir}/solid/actions/kscd-play-audiocd.desktop
@@ -366,6 +303,9 @@ fi
%{_kde4_datadir}/config.kcfg/kscd.kcfg
%endif
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%files libs
%defattr(-,root,root,-)
%{_kde4_appsdir}/kconf_update/kcmcddb-emailsettings.upd
@@ -391,6 +331,10 @@ fi
%changelog
+* Tue Sep 20 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.7.1-5
+- drop monolithic conditional
+- use pkgconfig deps
+
* Fri Sep 16 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:4.7.1-4
- make Dragon Player use Phonon instead of xine-lib for DVD menus
More information about the scm-commits
mailing list