rpms/xosd/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xosd.spec, 1.6, 1.7

[Ville Skytta (scop)]

Changeset from: scop

Update of /cvs/extras/rpms/xosd/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv30022

Modified Files:
	.cvsignore sources xosd.spec 
Log Message:
Update to 2.2.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Nov 2004 05:36:03 -0000	1.5
+++ .cvsignore	29 Nov 2004 18:40:26 -0000	1.6
@@ -1 +1,2 @@
 xosd-2.2.12.tar.bz2
+xosd_2.2.14.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Nov 2004 05:36:03 -0000	1.5
+++ sources	29 Nov 2004 18:40:26 -0000	1.6
@@ -1 +1 @@
-756d714cec908e4d4c956ff0e7dcd4c4  xosd-2.2.12.tar.bz2
+4b349fe930e4eee2f504d6c02673e24d  xosd_2.2.14.orig.tar.gz


Index: xosd.spec
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/xosd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xosd.spec	11 Nov 2004 19:21:37 -0000	1.6
+++ xosd.spec	29 Nov 2004 18:40:26 -0000	1.7
@@ -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 @@
 %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 @@
 
 
 %changelog
+* Mon Nov 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-1
+- Update to 2.2.14 (from Debian).
+- Drop pre-FC1 gdk-pixbuf compatibility kludges.
+
 * Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 2.2.12-2
 - Bump release to provide Extras upgrade path.
 - Remove zero epochs.