From 66425c7634af17fc7de9e9570add96d1111a3a4f Mon Sep 17 00:00:00 2001
From: Vlad Glagolev
Date: Sun, 30 Jan 2011 16:37:30 +0300
Subject: xkeyboard-config: => 2.1

---
 xorg-data/xkeyboard-config/BUILD   | 8 +++-----
 xorg-data/xkeyboard-config/DEPENDS | 1 -
 xorg-data/xkeyboard-config/DETAILS | 7 ++++---
 xorg-data/xkeyboard-config/HISTORY | 4 ++++
 4 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'xorg-data')

diff --git a/xorg-data/xkeyboard-config/BUILD b/xorg-data/xkeyboard-config/BUILD
index 01fada7f91..792c7724c9 100755
--- a/xorg-data/xkeyboard-config/BUILD
+++ b/xorg-data/xkeyboard-config/BUILD
@@ -1,7 +1,5 @@
-OPTS="$OPTS --enable-xkbcomp-symlink"               &&
-OPTS="$OPTS --enable-compat-rules"                  &&
-OPTS="$OPTS --with-xkb-base=/usr/share/X11/xkb"     &&
-OPTS="$OPTS --with-xkb-rules-symlink=xorg,xfree86"  &&
+OPTS="--enable-compat-rules \
+         --with-xkb-base=$INSTALL_ROOT/usr/share/X11/xkb \
+--with-xkb-rules-symlink=xorg,xfree86" &&
 
-./autogen.sh &&
 default_build
diff --git a/xorg-data/xkeyboard-config/DEPENDS b/xorg-data/xkeyboard-config/DEPENDS
index 10df2c3b25..c08c9e09d2 100755
--- a/xorg-data/xkeyboard-config/DEPENDS
+++ b/xorg-data/xkeyboard-config/DEPENDS
@@ -3,4 +3,3 @@ depends util-macros &&
 depends xkbcomp &&
 depends xml-parser-expat &&
 depends glib2
-
diff --git a/xorg-data/xkeyboard-config/DETAILS b/xorg-data/xkeyboard-config/DETAILS
index 92e917cb6a..afabc9500d 100755
--- a/xorg-data/xkeyboard-config/DETAILS
+++ b/xorg-data/xkeyboard-config/DETAILS
@@ -1,8 +1,9 @@
            SPELL=xkeyboard-config
-         VERSION=2.0
-     SOURCE_HASH=sha512:2ccbfedf7bbf8138c1982c2e4d97cef51090fb6f3fdf4643843c73e306d8a9805d93b7c4ca269f922c86a4c999cdcc86b4fb4dbf6bc233112c7f8dc4e058c3ec
+         VERSION=2.1
+     SOURCE_HASH=sha512:fd52753e81e7e41585d0fdd190bd05f0aad9b055d74119913fa72a1fdc1da2bef60f62a82a08558afc23a7f589297ffd84a1d0c1db4a452d4755d88548df51ff
           SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://people.freedesktop.org/~svu/$SOURCE
+   SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/data/$SPELL/$SOURCE
+   SOURCE_URL[1]=http://people.freedesktop.org/~svu/$SOURCE
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://xorg.freedesktop.org/
diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY
index d433b334f6..9b0587dc66 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,3 +1,7 @@
+2011-01-30 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.1; added 1st source url
+	* BUILD: removed autogen.sh, deprecated flags; use INSTALL_ROOT
+
 2010-11-01 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 2.0
 
-- 
cgit v1.2.3