rpms/xkeyboard-config/devel .cvsignore, 1.5, 1.6 olpc-xkeyboard-config-kz-group.patch, 1.1, 1.2 sources, 1.6, 1.7 xkeyboard-config.spec, 1.15, 1.16
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Thu Feb 7 17:37:12 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/xkeyboard-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4609
Modified Files:
.cvsignore olpc-xkeyboard-config-kz-group.patch sources
xkeyboard-config.spec
Log Message:
1.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 20 Nov 2007 06:49:52 -0000 1.5
+++ .cvsignore 7 Feb 2008 17:36:24 -0000 1.6
@@ -1 +1 @@
-xkeyboard-config-1.1-20071120cvs.tar.bz2
+xkeyboard-config-1.2.tar.bz2
olpc-xkeyboard-config-kz-group.patch:
Index: olpc-xkeyboard-config-kz-group.patch
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/olpc-xkeyboard-config-kz-group.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- olpc-xkeyboard-config-kz-group.patch 20 Nov 2007 06:49:52 -0000 1.1
+++ olpc-xkeyboard-config-kz-group.patch 7 Feb 2008 17:36:24 -0000 1.2
@@ -1,13 +1,12 @@
-Index: symbols/kz
-===================================================================
-RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/kz,v
-retrieving revision 1.3
-diff -u -p -r1.3 kz
---- symbols/kz 7 Oct 2007 10:05:46 -0000 1.3
-+++ symbols/kz 20 Nov 2007 04:25:37 -0000
-@@ -213,4 +213,5 @@ xkb_symbols "olpc" {
+diff -up xkeyboard-config-1.2/symbols/kz.kzgroup xkeyboard-config-1.2/symbols/kz
+--- xkeyboard-config-1.2/symbols/kz.kzgroup 2008-01-24 18:21:06.000000000 -0500
++++ xkeyboard-config-1.2/symbols/kz 2008-02-07 12:23:56.000000000 -0500
+@@ -213,6 +213,7 @@ xkb_symbols "olpc" {
key <TLDE> { [ parenleft, parenright ] };
key <BKSL> { [ Cyrillic_io, Cyrillic_IO ] };
+-
+ key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
++
+ include "group(olpc)"
};
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 20 Nov 2007 06:49:52 -0000 1.6
+++ sources 7 Feb 2008 17:36:24 -0000 1.7
@@ -1 +1 @@
-cdcefc9bb3ab6031f78f528516d3c5bd xkeyboard-config-1.1-20071120cvs.tar.bz2
+667c582a54d5715d24110c20e8c4be38 xkeyboard-config-1.2.tar.bz2
Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xkeyboard-config.spec 20 Nov 2007 10:12:18 -0000 1.15
+++ xkeyboard-config.spec 7 Feb 2008 17:36:24 -0000 1.16
@@ -1,22 +1,17 @@
# INFO: Package contains data-only, no binaries, so no debuginfo is needed
%define debug_package %{nil}
-%define cvsdate 20071120cvs
Summary: xkeyboard-config alternative xkb data files
Name: xkeyboard-config
-Version: 1.1
-Release: 5.%{cvsdate}%{?dist}
+Version: 1.2
+Release: 1%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-Source0: %{name}-%{version}-%{cvsdate}.tar.bz2
-Patch0: olpc-xkeyboard-config-af.patch
+Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
Patch1: olpc-xkeyboard-config-kz-group.patch
-Patch2: olpc-xkeyboard-config-ng-group.patch
-Patch3: olpc-xkeyboard-config-ng-h.patch
BuildArch: noarch
@@ -45,10 +40,7 @@
%prep
%setup -q
-%patch0 -p0 -b .af
-%patch1 -p0 -b .kzgroup
-%patch2 -p0 -b .nggroup
-%patch3 -p0 -b .ngh
+%patch1 -p1 -b .kzgroup
%build
%configure \
@@ -88,6 +80,10 @@
%{_datadir}/X11/xkb/rules/xorg.xml
%changelog
+* Thu Feb 7 2008 Matthias Clasen <mclasen at redhat.com> - 1.2-1
+- Update to 1.2
+- Remove upstreamed olpc patches
+
* Mon Nov 19 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-5.20071119cvs
- Upgrade xkeyboard-config snapshot to cvs20071119
- Add olpc-xkeyboard-config-af.patch
More information about the fedora-extras-commits
mailing list