[xosd] Remove patch changing default offset

Petr Pisar ppisar at fedoraproject.org
Fri Jan 13 13:55:06 UTC 2012


commit 2977fd3a7229334a5e6f12f82931562300be1de0
Author: Petr Písař <ppisar at redhat.com>
Date:   Fri Jan 13 11:04:38 2012 +0100

    Remove patch changing default offset

 xosd-defaults.patch |   28 ----------------------------
 xosd.spec           |    5 ++---
 2 files changed, 2 insertions(+), 31 deletions(-)
---
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 <ppisar at redhat.com> - 2.2.14-15
+* Fri Jan 13 2012 Petr Pisar <ppisar at redhat.com> - 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 <rel-eng at lists.fedoraproject.org> - 2.2.14-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


More information about the scm-commits mailing list