From 43a2af21de2569a8d53e6c393c2eec098c4baed5 Mon Sep 17 00:00:00 2001
From: cvsextras <cvsextras@fedoraproject.org>
Date: Mon, 8 Nov 2004 05:35:51 +0000
Subject: [PATCH] auto-import changelog data from xosd-2.2.10-0.fdr.1.1.src.rpm
 2.2.10-0.fdr.1 - Update to 2.2.10. - Patch to eliminate aclocal >= 1.8
 warnings from libxosd.m4.

---
 .cvsignore           |  2 +-
 sources              |  2 +-
 xosd-aclocal18.patch | 11 +++++++++++
 xosd.spec            | 15 +++++++++++----
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 xosd-aclocal18.patch

diff --git a/.cvsignore b/.cvsignore
index 21fdc6d..daf8127 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xosd-2.2.8.tar.bz2
+xosd-2.2.10.tar.bz2
diff --git a/sources b/sources
index bd63723..aee95d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85b00f6609603139855775d6213980cb  xosd-2.2.8.tar.bz2
+2a598c1e9f940830d04167c48845758c  xosd-2.2.10.tar.bz2
diff --git a/xosd-aclocal18.patch b/xosd-aclocal18.patch
new file mode 100644
index 0000000..921d922
--- /dev/null
+++ b/xosd-aclocal18.patch
@@ -0,0 +1,11 @@
+--- libxosd.m4~	2004-08-20 01:39:40.000000000 +0300
++++ libxosd.m4	2004-08-28 16:37:57.343670228 +0300
+@@ -6,7 +6,7 @@
+ dnl AM_PATH_LIBXOSD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+ dnl Test to see if libxosd is installed, and define LIBXOSD_CFLAGS, LIBXOSDLIBS
+ dnl
+-AC_DEFUN(AM_PATH_LIBXOSD,
++AC_DEFUN([AM_PATH_LIBXOSD],
+ [dnl
+ dnl Get the cflags and libraries from the xosd-config script
+ dnl
diff --git a/xosd.spec b/xosd.spec
index 17e367f..83d05f4 100644
--- a/xosd.spec
+++ b/xosd.spec
@@ -1,15 +1,16 @@
 %define	plugdir	%(xmms-config --general-plugin-dir 2>/dev/null)
 
 Name:           xosd
-Version:        2.2.8
-Release:        0.fdr.1.rh90
+Version:        2.2.10
+Release:        0.fdr.1.1
 Epoch:          0
 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-2.2.8.tar.bz2
+Source:         http://www.ignavus.net/xosd-2.2.10.tar.bz2
+Patch:          %{name}-aclocal18.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel
@@ -44,6 +45,8 @@ the XOSD library, similarly to TV OSD.
 
 %prep
 %setup -q
+%patch -p0
+chmod -x AUTHORS ChangeLog COPYING README `find src -type f`
 
 
 %build
@@ -82,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/*.a
 %{_libdir}/*.so
-%{_datadir}/aclocal/*
+%{_datadir}/aclocal/libxosd.m4
 %{_mandir}/man1/xosd-config*
 %{_mandir}/man3/*
 
@@ -92,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 28 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.10-0.fdr.1
+- Update to 2.2.10.
+- Patch to eliminate aclocal >= 1.8 warnings from libxosd.m4.
+
 * Mon Jul  5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.8-0.fdr.1
 - Update to 2.2.8.