diff --git a/.cvsignore b/.cvsignore index c7f1ce3..60e62bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xosd-2.2.12.tar.bz2 +xosd_2.2.14.orig.tar.gz diff --git a/sources b/sources index 7d6315c..c0f472e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -756d714cec908e4d4c956ff0e7dcd4c4 xosd-2.2.12.tar.bz2 +4b349fe930e4eee2f504d6c02673e24d xosd_2.2.14.orig.tar.gz diff --git a/xosd.spec b/xosd.spec index d88f927..020619a 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,18 +1,18 @@ %define plugdir %(xmms-config --general-plugin-dir 2>/dev/null) Name: xosd -Version: 2.2.12 -Release: 2 +Version: 2.2.14 +Release: 1 Summary: On-screen display library for X Group: System Environment/Libraries License: GPL URL: http://www.ignavus.net/software.html -Source: http://www.ignavus.net/xosd-%{version}.tar.bz2 +Source: http://ftp.debian.org/debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz Patch0: %{name}-aclocal18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel +BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel >= 1:0.22.0, xmms-devel %description XOSD displays text on your screen, sounds simple right? The difference @@ -45,13 +45,10 @@ the XOSD library, similarly to TV OSD. %prep %setup -q %patch0 -p0 -chmod -x AUTHORS ChangeLog COPYING README TODO `find src -type f` %build -# XOSD 2.2.1+ says it requires gdk-pixbuf >= 0.22.0, but it seems to work -# fine with older (0.18.0) versions. This is needed for the XMMS plugin. -%configure --disable-gdk_pixbuftest --disable-dependency-tracking +%configure --disable-dependency-tracking make %{?_smp_mflags} %{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config @@ -94,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 29 2004 Ville Skyttä - 2.2.14-1 +- Update to 2.2.14 (from Debian). +- Drop pre-FC1 gdk-pixbuf compatibility kludges. + * Wed Nov 10 2004 Matthias Saou 2.2.12-2 - Bump release to provide Extras upgrade path. - Remove zero epochs.