diff --git a/xosd.spec b/xosd.spec index cac18a9..a1b37b5 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,10 +1,8 @@ %bcond_with static -%define xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null) - Name: xosd Version: 2.2.14 -Release: 14%{?dist} +Release: 15%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -21,12 +19,14 @@ BuildRequires: libXinerama-devel # As of 2.2.14, the default font *must* be found, even if not used (#183971) Requires: xorg-x11-fonts-base +# XMMS is dead, gdk-pixbuf-0 is dead. Dropping xmms plug-in. +Obsoletes: xmms-%{name} < 2.2.14-15 +Obsoletes: %{name}-xmms <= 2.2.12 + %description XOSD displays text on your screen, sounds simple right? The difference is it is unmanaged and shaped, so it appears transparent. This gives -the effect of an On Screen Display, like your TV/VCR etc.. The package -also includes an xmms plugin, which automatically displays various -interesting things as they change (song name, volume etc...) +the effect of an On Screen Display, like your TV/VCR etc. %package devel Summary: Development files for the XOSD on-screen display library @@ -41,20 +41,6 @@ The xosd-devel package contains static libraries, header files and documentation for developing applications that use the XOSD on-screen display. -%package -n xmms-%{name} -Summary: XMMS plugin for on-screen display using the XOSD library -Group: Applications/Multimedia -BuildRequires: gtk+-devel >= 1:1.2.2 -BuildRequires: gdk-pixbuf-devel >= 1:0.22.0 -BuildRequires: xmms-devel -Requires: %{name} = %{version}-%{release} -Requires: xmms -Obsoletes: %{name}-xmms <= 2.2.12 - -%description -n xmms-%{name} -X MultiMedia System plugin to display information on-screen through -the XOSD library, similarly to TV OSD. - %prep %setup -q %patch0 -p0 @@ -65,7 +51,10 @@ done %build -%configure --disable-dependency-tracking %{!?with_static:--disable-static} +%configure --disable-dependency-tracking %{!?with_static:--disable-static} \ + --disable-gtktest --disable-gdk_pixbuftest \ + --disable-new-plugin --disable-old-plugin \ + --disable-beep_media_player_plugin make %{?_smp_mflags} %{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config @@ -105,11 +94,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xosd-config.1* %{_mandir}/man3/xosd*.3* -%files -n xmms-%{name} -%defattr(-,root,root,-) -%{xmms_plugdir}/libxmms_osd.so - %changelog +* Thu Nov 24 2011 Petr Pisar - 2.2.14-15 +- Disable XMMS plug-in because gdk-pixpuf-0 has been removed + * Tue Feb 08 2011 Fedora Release Engineering - 2.2.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild