From 909b7892362a8aa866e4e0d59f4cf944d4e7222a Mon Sep 17 00:00:00 2001
From: cvsextras <cvsextras@fedoraproject.org>
Date: Mon, 8 Nov 2004 05:35:45 +0000
Subject: [PATCH] auto-import changelog data from
 xosd-2.2.8-0.fdr.1.rh90.src.rpm 2.2.8-0.fdr.1 - Update to 2.2.8.
 2.2.7-0.fdr.1 - Update to 2.2.7. 2.2.5-0.fdr.2 - Clean up "xosd-config
 --cflags".

---
 .cvsignore |  2 +-
 sources    |  2 +-
 xosd.spec  | 18 ++++++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 2d364e4..21fdc6d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xosd-2.2.5.tar.gz
+xosd-2.2.8.tar.bz2
diff --git a/sources b/sources
index f720513..bd63723 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96bae6f0800c1710d7d4edb3b37b01e5  xosd-2.2.5.tar.gz
+85b00f6609603139855775d6213980cb  xosd-2.2.8.tar.bz2
diff --git a/xosd.spec b/xosd.spec
index 137e446..17e367f 100644
--- a/xosd.spec
+++ b/xosd.spec
@@ -1,15 +1,15 @@
-%define	plugdir	%(xmms-config --general-plugin-dir)
+%define	plugdir	%(xmms-config --general-plugin-dir 2>/dev/null)
 
 Name:           xosd
-Version:        2.2.5
-Release:        0.fdr.1.rh80
+Version:        2.2.8
+Release:        0.fdr.1.rh90
 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.5.tar.gz
+Source:         http://www.ignavus.net/xosd-2.2.8.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel
@@ -51,6 +51,7 @@ the XOSD library, similarly to TV OSD.
 # fine with older (0.18.0) versions.  This is needed for the XMMS plugin.
 %configure --disable-gdk_pixbuftest
 make %{?_smp_mflags}
+%{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config
 
 
 %install
@@ -91,6 +92,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul  5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.8-0.fdr.1
+- Update to 2.2.8.
+
+* Tue May 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.7-0.fdr.1
+- Update to 2.2.7.
+
+* Wed May 19 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.5-0.fdr.2
+- Clean up "xosd-config --cflags".
+
 * Sat Sep 27 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.5-0.fdr.1
 - Update to 2.2.5.