rpms/xorg-x11-xkb-utils/devel .cvsignore, 1.6, 1.7 sources, 1.4, 1.5 xorg-x11-xkb-utils.spec, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26424/devel

Modified Files:
	.cvsignore sources xorg-x11-xkb-utils.spec 
Log Message:
auto-import xorg-x11-xkb-utils-1.0.0-1 on branch devel from xorg-x11-xkb-utils-1.0.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Nov 2005 00:57:01 -0000	1.6
+++ .cvsignore	19 Dec 2005 20:02:12 -0000	1.7
@@ -1 +1,5 @@
-*.tar.bz2
+setxkbmap-1.0.0.tar.bz2
+xkbcomp-1.0.0.tar.bz2
+xkbevd-1.0.0.tar.bz2
+xkbprint-1.0.0.tar.bz2
+xkbutils-1.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 00:55:10 -0000	1.4
+++ sources	19 Dec 2005 20:02:13 -0000	1.5
@@ -1,5 +1,5 @@
-e3be2a68607a78b45d03196c95212235  xkbcomp-0.99.1.tar.bz2
-2edc07c688d49d2d46f665708e3cae57  xkbprint-0.99.1.tar.bz2
-0fe78ecd51b6460876dff7f7538d0d08  setxkbmap-0.99.2.tar.bz2
-c243bbe5c4ea60fc3d27da1737e5335c  xkbevd-0.99.2.tar.bz2
-37dc54514207cddd7ce22bb04e6a50b0  xkbutils-0.99.1.tar.bz2
+eb34daed4fb2ecd2f00134aec2997679  setxkbmap-1.0.0.tar.bz2
+2bee4c0bb3475d3ef07c035798fcae85  xkbcomp-1.0.0.tar.bz2
+b4dacff8d6cca4aa2d14effc970e2522  xkbevd-1.0.0.tar.bz2
+0eda96d08abf2f6a7e7d87b2bbfa02dc  xkbprint-1.0.0.tar.bz2
+e63c5ca479162e45d18190c703b03b5b  xkbutils-1.0.0.tar.bz2


Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-xkb-utils.spec	13 Nov 2005 08:13:52 -0000	1.6
+++ xorg-x11-xkb-utils.spec	19 Dec 2005 20:02:14 -0000	1.7
@@ -2,22 +2,20 @@
 
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-%{pkgname}
-Version: 0.99.1
-Release: 2
+Version: 1.0.0
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-%define xorgurl http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything
-Source0: %{xorgurl}/xkbutils-0.99.1.tar.bz2
-Source1: %{xorgurl}/xkbcomp-0.99.1.tar.bz2
-Source2: %{xorgurl}/xkbevd-0.99.2.tar.bz2
-Source3: %{xorgurl}/xkbprint-0.99.1.tar.bz2
-Source4: %{xorgurl}/setxkbmap-0.99.2.tar.bz2
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define xorgurl http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything
+Source0: %{xorgurl}/xkbutils-1.0.0.tar.bz2
+Source1: %{xorgurl}/xkbcomp-1.0.0.tar.bz2
+Source2: %{xorgurl}/xkbevd-1.0.0.tar.bz2
+Source3: %{xorgurl}/xkbprint-1.0.0.tar.bz2
+Source4: %{xorgurl}/setxkbmap-1.0.0.tar.bz2
 
-# setxkbmap (xkbfile x11)
-
+BuildRequires: pkgconfig
 # libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
 BuildRequires: libxkbfile-devel
 # libX11-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
@@ -69,7 +67,7 @@
 {
    for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
       pushd $pkg-*
-      %makeinstall
+      make install DESTDIR=$RPM_BUILD_ROOT
       popd
    done
 }
@@ -89,16 +87,20 @@
 %{_bindir}/xkbvleds
 %{_bindir}/xkbwatch
 %dir %{_mandir}
-%dir %{_mandir}/man1x
+%dir %{_mandir}/man1
 # FIXME: manpages are missing for xkbbell, xkbvleds, xkbwatch.  I examined
 # the monolithic packaging however, and it does not appear to have manpages
 # for them either.
-%{_mandir}/man1x/setxkbmap.1x*
-%{_mandir}/man1x/xkbcomp.1x*
-%{_mandir}/man1x/xkbevd.1x*
-%{_mandir}/man1x/xkbprint.1x*
+%{_mandir}/man1/setxkbmap.1x*
+%{_mandir}/man1/xkbcomp.1x*
+%{_mandir}/man1/xkbevd.1x*
+%{_mandir}/man1/xkbprint.1x*
 
 %changelog
+* Sat Dec 17 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
+- Updated all apps to version 1.0.0 from X11R7 RC4.
+- Changed manpage dir from man1x to man1 to match upstream default.
+
 * Sun Nov 13 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2
 - Change from "Conflicts" to "Obsoletes: XFree86, xorg-x11" for upgrades.
 - Rebuild against new libXaw 0.99.2-2, which has fixed DT_SONAME. (#173027)