From 5a56636ea292402175893d43ad0d42c8716dd75b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 30 Sep 2011 14:53:40 +1000
Subject: [PATCH] xkeyboard-config 2.4.1 change source URL from ftp.x.org to
 http://xorg.freedesktop.org, ftp takes too long to update

---
 .gitignore            |  2 ++
 sources               |  2 +-
 xkeyboard-config.spec | 14 +++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e64255..11e45ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ xkeyboard-config-1.9.tar.bz2
 /xkeyboard-config-2.2.1.tar.bz2
 /xkeyboard-config-20110415.tar.bz2
 /xkeyboard-config-2.3.tar.bz2
+/xkeyboard-config-2.4.tar.bz2
+/xkeyboard-config-2.4.1.tar.bz2
diff --git a/sources b/sources
index fd785ea..b6de355 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0be9fbddcb19ac62a23e08fead5df8be  xkeyboard-config-2.3.tar.bz2
+9f6d7a37fd192264a3ca07ede5d183c3  xkeyboard-config-2.4.1.tar.bz2
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index eca0a9f..cc9144e 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -6,8 +6,8 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 2.3
-Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Version: 2.4.1
+Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -16,9 +16,8 @@ Source0:    %{name}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 %else
-Source0:    ftp://ftp.x.org/pub/individual/data/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2
 %endif
-Patch01:    0001-Use-XSL-to-generate-man-page-from-the-rules-XML.patch
 
 BuildArch: noarch
 
@@ -69,7 +68,7 @@ git add .
 git commit -a -q -m "%{name} %{version} baseline."
 %endif
 
-git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
+#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
 
 %build
 intltoolize
@@ -111,6 +110,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Wed Oct 05 2011 Peter Hutterer <peter.hutterer@redhat.com> 2.4.1-1
+- xkeyboard-config 2.4.1
+- change source URL from ftp.x.org to http://xorg.freedesktop.org, ftp takes
+  too long to update
+
 * Tue Jun 14 2011 Peter Hutterer <peter.hutterer@redhat.com> 2.3-2
 - Add 0001-Use-XSL-to-generate-man-page-from-the-rules-XML.patch, ship
   man-page