diff --git a/xosd-defaults.patch b/xosd-defaults.patch deleted file mode 100644 index 914bd77..0000000 --- a/xosd-defaults.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naru xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c xosd-2.2.14/src/bmp_plugin/bmp_osd.c ---- xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c 2004-11-17 21:26:56.000000000 +0200 -+++ xosd-2.2.14/src/bmp_plugin/bmp_osd.c 2005-03-17 23:42:25.000000000 +0200 -@@ -177,8 +177,8 @@ - colour = NULL; - font = NULL; - timeout = 3; -- offset = 50; -- h_offset = 0; -+ offset = 60; -+ h_offset = 60; - shadow_offset = 1; - outline_offset = 0; - pos = XOSD_bottom; -diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c ---- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c 2004-11-04 21:47:50.000000000 +0200 -+++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c 2005-03-17 23:42:11.000000000 +0200 -@@ -177,8 +177,8 @@ - colour = NULL; - font = NULL; - timeout = 3; -- offset = 50; -- h_offset = 0; -+ offset = 60; -+ h_offset = 60; - shadow_offset = 1; - outline_offset = 0; - pos = XOSD_bottom; diff --git a/xosd.spec b/xosd.spec index e213881..c03966b 100644 --- a/xosd.spec +++ b/xosd.spec @@ -7,7 +7,6 @@ License: GPLv2+ URL: http://www.ignavus.net/software.html Source: http://ftp.debian.org/debian/pool/main/x/xosd/%{name}_%{version}.orig.tar.gz Patch0: %{name}-aclocal18.patch -Patch1: %{name}-defaults.patch BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXinerama-devel @@ -37,7 +36,6 @@ on-screen display. %prep %setup -q %patch0 -p0 -%patch1 -p1 for f in ChangeLog man/xosd_{create,destroy,display,is_onscreen,set_bar_length}.3 ; do iconv -f iso-8859-1 -t utf-8 "$f" > "${f}.utf8" touch -r "$f" "${f}.utf8" @@ -82,11 +80,12 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog -* Thu Nov 24 2011 Petr Pisar - 2.2.14-15 +* Fri Jan 13 2012 Petr Pisar - 2.2.14-15 - Disable XMMS plug-in because gdk-pixpuf-0 has been removed - Remove build-optional static library - Clean spec file up - Do not package XMMS plug-in pixmaps +- Remove patch changing default offset to keep closer with upstream * Tue Feb 08 2011 Fedora Release Engineering - 2.2.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild