From 359fdcdd9edab4e0cbee3780a7fba118db87f4ac69ddfb6c8a66c5c304f10b40 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 2 Oct 2007 23:17:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=10 --- xkeyboard-config-1.0.tar.bz2 | 3 --- xkeyboard-config-1.1.tar.bz2 | 3 +++ xkeyboard-config.changes | 7 +++++++ xkeyboard-config.macintosh.patch | 21 ++++++++++----------- xkeyboard-config.spec | 19 +++++++++++-------- 5 files changed, 31 insertions(+), 22 deletions(-) delete mode 100644 xkeyboard-config-1.0.tar.bz2 create mode 100644 xkeyboard-config-1.1.tar.bz2 diff --git a/xkeyboard-config-1.0.tar.bz2 b/xkeyboard-config-1.0.tar.bz2 deleted file mode 100644 index 4861e9f..0000000 --- a/xkeyboard-config-1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44e4765c90b4ff3791eee40bdd95ab24d5b0089e39badedc2155cf10d4072ffb -size 534180 diff --git a/xkeyboard-config-1.1.tar.bz2 b/xkeyboard-config-1.1.tar.bz2 new file mode 100644 index 0000000..620cebe --- /dev/null +++ b/xkeyboard-config-1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fef905029f033859c7f8897f19dce6b7f10d107c51b8ad7c782214d7b2035ce6 +size 540972 diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index b425257..50c05ea 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 29 14:17:20 CEST 2007 - sndirsch@suse.de + +- xkeyboard-config 1.1 + * some bug fixes (27) + * new layouts/models + ------------------------------------------------------------------- Sat Aug 25 13:15:14 CEST 2007 - sndirsch@suse.de diff --git a/xkeyboard-config.macintosh.patch b/xkeyboard-config.macintosh.patch index fedc692..0392c02 100644 --- a/xkeyboard-config.macintosh.patch +++ b/xkeyboard-config.macintosh.patch @@ -8,17 +8,6 @@ alt+e gives euro, alt+l gives @, etc rules/base.ml_s.part | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: rules/base.ml1_s.part -=================================================================== ---- rules/base.ml1_s.part.orig -+++ rules/base.ml1_s.part -@@ -5,5 +5,5 @@ - macintosh_old us = macintosh_vndr/us(oldmac) - macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) - macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) -- $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) -+ $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])+altwin(swap_lalt_lwin)+level3(alt_switch) - * * = pc+%l[1]%(v[1]) Index: rules/base.ml_s.part =================================================================== --- rules/base.ml_s.part.orig @@ -28,3 +17,13 @@ Index: rules/base.ml_s.part - $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) + $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch) * jp = pc+jp(latin)+jp:2 +--- rules/base.ml1_s.part.orig 2007-09-29 14:28:06.512621000 +0200 ++++ rules/base.ml1_s.part 2007-09-29 14:29:01.956086000 +0200 +@@ -5,6 +5,6 @@ + macintosh_old us = macintosh_vndr/us(oldmac) + macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) + macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) +- $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) ++ $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])+altwin(swap_lalt_lwin)+level3(alt_switch) + thinkpad br = pc+%l[1](thinkpad) + * * = pc+%l[1]%(v[1]) diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index ac45989..f048624 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,5 +1,5 @@ # -# spec file for package xkeyboard-config (Version 1.0) +# spec file for package xkeyboard-config (Version 1.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,15 +12,15 @@ Name: xkeyboard-config BuildRequires: intltool perl-XML-Parser xorg-x11 -URL: http://www.freedesktop.org/Software/XKeyboardConfig -License: GPL v2 or later, LGPL v2 or later +Url: http://www.freedesktop.org/Software/XKeyboardConfig +License: GPL v2 or later; LGPL v2 or later; X11/MIT Group: System/X11/Utilities Requires: xorg-x11 Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm -Autoreqprov: on -Version: 1.0 -Release: 19 +AutoReqProv: on +Version: 1.1 +Release: 1 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch4: xkeyboard-config.mainline-cvs.mac-es.patch @@ -29,7 +29,7 @@ Patch40: xkeyboard-config.macintosh.patch Patch100: p_suse.diff Patch101: ibm_space_saver.diff Patch103: xkeyboard-config.powerbook-usb-iso-keyboard.patch -patch104: xkeyboard-config.inet.patch +Patch104: xkeyboard-config.inet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -82,8 +82,11 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING README docs/HOWTO.* docs/README.* %dir /var/lib/xkb /usr/share/X11/xkb/ - %changelog +* Sat Sep 29 2007 - sndirsch@suse.de +- xkeyboard-config 1.1 + * some bug fixes (27) + * new layouts/models * Sat Aug 25 2007 - sndirsch@suse.de - reverted tp-menu.diff (wrong approach, Bug #302099) * Thu Jul 12 2007 - sndirsch@suse.de