OBS User unknown 2009-02-09 11:53:17 +00:00 committed by Git OBS Bridge
parent b3f2f479ac
commit f6de87fb07
3 changed files with 53 additions and 10 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Feb 9 10:27:48 CET 2009 - sndirsch@suse.de
- sr@Latn no longer exists; moved it to sr@latin
-------------------------------------------------------------------
Thu Feb 5 09:49:28 CET 2009 - sndirsch@suse.de
- added /usr/share/locale/sr@Latn{,LC_MESSAGES} as directories to
filelist to fix build for factory
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 15 16:24:33 CEST 2008 - sndirsch@suse.de Mon Sep 15 16:24:33 CEST 2008 - sndirsch@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package xkeyboard-config (Version 1.3) # spec file for package xkeyboard-config (Version 1.3)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,7 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
PreReq: /bin/ln /bin/rm PreReq: /bin/ln /bin/rm
AutoReqProv: on AutoReqProv: on
Version: 1.3 Version: 1.3
Release: 32 Release: 33
Summary: The X Keyboard Extension Summary: The X Keyboard Extension
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
Patch4: xkeyboard-config.mainline-cvs.mac-es.patch Patch4: xkeyboard-config.mainline-cvs.mac-es.patch
@ -45,6 +45,7 @@ Patch109: disable-2xalt_2xctrl-toggle.diff
Patch110: MDSW-change-keycode.diff Patch110: MDSW-change-keycode.diff
Patch111: unknown-keysym.diff Patch111: unknown-keysym.diff
Patch112: ucw_suse.diff Patch112: ucw_suse.diff
Patch113: xkeyboard-config.sr@latin.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
@ -80,6 +81,8 @@ Authors:
%patch110 %patch110
%patch111 %patch111
%patch112 -p1 %patch112 -p1
%patch113 -p0
mv po/sr@{Latn,latin}.po
%build %build
%configure --with-xkb-rules-symlink=xfree86,xorg \ %configure --with-xkb-rules-symlink=xfree86,xorg \
@ -109,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/X11/xkb/ /usr/share/X11/xkb/
%changelog %changelog
* Mon Feb 09 2009 sndirsch@suse.de
- sr@Latn no longer exists; moved it to sr@latin
* Thu Feb 05 2009 sndirsch@suse.de
- added /usr/share/locale/sr@Latn{,LC_MESSAGES} as directories to
filelist to fix build for factory
* Mon Sep 15 2008 sndirsch@suse.de * Mon Sep 15 2008 sndirsch@suse.de
- updated ucw_suse.diff - updated ucw_suse.diff
* patching rules/compat/layoutRename.lst instead of * patching rules/compat/layoutRename.lst instead of
@ -145,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT
- fixed keycodes of MS nek4k (bnc #366515) - fixed keycodes of MS nek4k (bnc #366515)
* Mon Mar 10 2008 sndirsch@suse.de * Mon Mar 10 2008 sndirsch@suse.de
- more work on support for MS nek4k - more work on support for MS nek4k
* Sun Mar 09 2008 sndirsch@suse.de * Sat Mar 08 2008 sndirsch@suse.de
- added support for 'Microsoft Natural Ergonomic Keyboard 4000' - added support for 'Microsoft Natural Ergonomic Keyboard 4000'
(bnc #366515) (bnc #366515)
* Tue Mar 04 2008 sndirsch@suse.de * Tue Mar 04 2008 sndirsch@suse.de
@ -222,7 +230,7 @@ rm -rf $RPM_BUILD_ROOT
- update mac/es, add euro to mac/us and mac/dk - update mac/es, add euro to mac/us and mac/dk
* Tue Oct 17 2006 olh@suse.de * Tue Oct 17 2006 olh@suse.de
- more fixes from cvs, restore previous macintosh behaviour - more fixes from cvs, restore previous macintosh behaviour
* Tue Oct 17 2006 olh@suse.de * Mon Oct 16 2006 olh@suse.de
- fix symbols on macintosh - fix symbols on macintosh
* Tue Oct 10 2006 sndirsch@suse.de * Tue Oct 10 2006 sndirsch@suse.de
- updated to release 0.9: - updated to release 0.9:
@ -271,7 +279,7 @@ rm -rf $RPM_BUILD_ROOT
- added missing xorg rules symlinks (Bug #150245) - added missing xorg rules symlinks (Bug #150245)
* Wed Jan 25 2006 mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Mon Jan 23 2006 sndirsch@suse.de * Sun Jan 22 2006 sndirsch@suse.de
- numlock-scrollLock.diff: - numlock-scrollLock.diff:
* fix for Numlock/ScrollLock problem (X.Org Bug #5635) * fix for Numlock/ScrollLock problem (X.Org Bug #5635)
* Mon Jan 16 2006 sndirsch@suse.de * Mon Jan 16 2006 sndirsch@suse.de
@ -319,14 +327,14 @@ rm -rf $RPM_BUILD_ROOT
* fixes GNOME print-screen functionality (Bug #103990) * fixes GNOME print-screen functionality (Bug #103990)
* Wed Aug 10 2005 sndirsch@suse.de * Wed Aug 10 2005 sndirsch@suse.de
- updated to current CVS release (2005-08-10) - updated to current CVS release (2005-08-10)
* Wed Aug 03 2005 schwab@suse.de * Tue Aug 02 2005 schwab@suse.de
- Fix reference to eject key in macintosh keymap. - Fix reference to eject key in macintosh keymap.
- Make noarch. - Make noarch.
* Fri Jul 29 2005 sndirsch@suse.de * Fri Jul 29 2005 sndirsch@suse.de
- xkeyboard-config-0.5.diff: - xkeyboard-config-0.5.diff:
* fixes typo: options --> option (Bug #98980) * fixes typo: options --> option (Bug #98980)
- enabled use of xkeyboard-config again - enabled use of xkeyboard-config again
* Fri Jul 29 2005 sndirsch@suse.de * Thu Jul 28 2005 sndirsch@suse.de
- make xkeyboard-config optional again; currently to big problems - make xkeyboard-config optional again; currently to big problems
(Bug #98980) (Bug #98980)
* Tue Jul 26 2005 sndirsch@suse.de * Tue Jul 26 2005 sndirsch@suse.de
@ -339,7 +347,7 @@ rm -rf $RPM_BUILD_ROOT
- add "Prereq: xorg-x11" to make sure that /etc/X11/xkb/symbols/pc/ - add "Prereq: xorg-x11" to make sure that /etc/X11/xkb/symbols/pc/
directory will be removed before xkeyboard-config installs directory will be removed before xkeyboard-config installs
/etc/X11/xkb/symbols/pc file (Bug #95914). /etc/X11/xkb/symbols/pc file (Bug #95914).
* Thu Jul 07 2005 sndirsch@suse.de * Wed Jul 06 2005 sndirsch@suse.de
- add symlink /usr/X11R6/lib/X11/xkb --> /etc/X11/xkb - add symlink /usr/X11R6/lib/X11/xkb --> /etc/X11/xkb
* Wed Jul 06 2005 sndirsch@suse.de * Wed Jul 06 2005 sndirsch@suse.de
- install package during update when xorg-x11/XFree86 package was - install package during update when xorg-x11/XFree86 package was
@ -360,7 +368,7 @@ rm -rf $RPM_BUILD_ROOT
Some translations are updated (though the overall translation Some translations are updated (though the overall translation
activity is disappointinly low). activity is disappointinly low).
* obsoletes p_xkb-cherryblueb.diff * obsoletes p_xkb-cherryblueb.diff
* Mon Oct 25 2004 sndirsch@suse.de * Sun Oct 24 2004 sndirsch@suse.de
- updated patches - updated patches
- removed obsolete patches - removed obsolete patches
* Sun Oct 03 2004 sndirsch@suse.de * Sun Oct 03 2004 sndirsch@suse.de
@ -376,7 +384,7 @@ rm -rf $RPM_BUILD_ROOT
* adjusted filelist (.mo files no longer exist, added HOWTO.testing) * adjusted filelist (.mo files no longer exist, added HOWTO.testing)
* Wed Jul 21 2004 sndirsch@suse.de * Wed Jul 21 2004 sndirsch@suse.de
- added README.SuSE - added README.SuSE
* Sun Jun 13 2004 sndirsch@suse.de * Sat Jun 12 2004 sndirsch@suse.de
- added required hunks of X.Org patches for xkb: - added required hunks of X.Org patches for xkb:
* p_suse.diff * p_suse.diff
* p_fixes.diff * p_fixes.diff

View File

@ -0,0 +1,24 @@
diff -u -r ../xkeyboard-config-1.3.orig//configure ./configure
--- ../xkeyboard-config-1.3.orig//configure 2009-02-09 10:34:06.033713364 +0100
+++ ./configure 2009-02-09 10:36:26.615973356 +0100
@@ -6072,7 +6072,7 @@
< $srcdir/po/POTFILES.in > po/POTFILES
-ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@latin sv tr uk vi zh_CN zh_TW"
diff -u -r ../xkeyboard-config-1.3.orig//configure.in ./configure.in
--- ../xkeyboard-config-1.3.orig//configure.in 2009-02-09 10:34:09.669875248 +0100
+++ ./configure.in 2009-02-09 10:35:36.817755760 +0100
@@ -46,7 +46,7 @@
AM_GLIB_GNU_GETTEXT
-ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@latin sv tr uk vi zh_CN zh_TW"
AC_SUBST(xkb_base)
AC_SUBST(xkb_rules_symlink)