rpms/xfce4-settings/devel xfce4-settings.spec, 1.19, 1.20 xfce4-settings-4.6.1-xkl.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11791

Modified Files:
	xfce4-settings.spec 
Removed Files:
	xfce4-settings-4.6.1-xkl.patch 
Log Message:
drop libxklavier patch, also upstreamed


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xfce4-settings.spec	29 Sep 2009 22:35:04 -0000	1.19
+++ xfce4-settings.spec	29 Sep 2009 23:03:14 -0000	1.20
@@ -10,8 +10,6 @@ Group:          User Interface/Desktops
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-# new libxklavier 4 API in Fedora 12
-Patch1:         xfce4-settings-4.6.1-xkl.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,9 +39,6 @@ This package includes the settings manag
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 12
-%patch1 -p1 -b .xkl
-%endif
 %patch10 -p1 -b .vendor
 
 %build


--- xfce4-settings-4.6.1-xkl.patch DELETED ---