xkeyboard-config: update to 1.8

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@814 ec354946-7b23-47d6-9f5a-488ba84defc7

x/xkeyboard-config/xkeyboard-config-vl.spec

@@ -1,17 +1,13 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
-Version: 1.6
+Version: 1.8
 Release: 1%{?_dist_release}
 License: MIT
 Group: User Interface/X
-URL: http://www.x.org
+URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 
-# upstream patch
-Patch1: xkeyboard-config-1.6-caps-super.patch
-Patch2: xkeyboard-config-1.6-caps-hyper.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: pkgconfig
@@ -42,27 +38,33 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # Remove unnecessary symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%find_lang %{name}
 
 # Create filelist
 {
    FILESLIST=${PWD}/files.list
    pushd $RPM_BUILD_ROOT
-   find ./usr/share/X11 -type d | sed -e "s/^\./%dir /g" > $FILESLIST
-   find ./usr/share/X11 -type f | sed -e "s/^\.//g" >> $FILESLIST
+   find ./usr/share/X11/xkb -type d | sed -e "s/^\./%dir /g" > $FILESLIST
+   find ./usr/share/X11/xkb -type f | sed -e "s/^\.//g" >> $FILESLIST
    popd
 }
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f files.list
+%files -f files.list -f %{name}.lang
 %defattr(-,root,root,-)
 %{_datadir}/X11/xkb/rules/xorg
 %{_datadir}/X11/xkb/rules/xorg.lst
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Apr 12 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.18-1
+- new upstream release
+- update URL:
+- drop upstreamed patch(1,2)
+- use %%find_lang macro
+
 * Mon Sep 14 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.16-1
 - new upstream release
 - drop upstreamed patch