rpms/xorg-x11-xkb-utils/devel .cvsignore, 1.10, 1.11 sources, 1.8, 1.9 xorg-x11-xkb-utils.spec, 1.17, 1.18
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Tue Jul 24 15:12:59 UTC 2007
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19631/devel
Modified Files:
.cvsignore sources xorg-x11-xkb-utils.spec
Log Message:
setxkbmap 1.0.4, and renumber to Xorg katamari Version number.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 27 Apr 2006 22:09:37 -0000 1.10
+++ .cvsignore 24 Jul 2007 15:12:27 -0000 1.11
@@ -1,5 +1,5 @@
-setxkbmap-1.0.2.tar.bz2
xkbcomp-1.0.2.tar.bz2
+xkbevd-1.0.2.tar.bz2
xkbprint-1.0.1.tar.bz2
xkbutils-1.0.1.tar.bz2
-xkbevd-1.0.2.tar.bz2
+setxkbmap-1.0.4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 27 Apr 2006 22:09:37 -0000 1.8
+++ sources 24 Jul 2007 15:12:27 -0000 1.9
@@ -1,5 +1,5 @@
-0316b2ab6fea88ed76d231c3b47544d8 setxkbmap-1.0.2.tar.bz2
8b22a5e6d780ec70bf98d31cdbd65658 xkbcomp-1.0.2.tar.bz2
+68f2a143716c23b566f8509d9498f516 xkbevd-1.0.2.tar.bz2
b98ae2d8b21c545b7b322d0b302efefa xkbprint-1.0.1.tar.bz2
84396a3dd75337caaae29d8fa5616fb1 xkbutils-1.0.1.tar.bz2
-68f2a143716c23b566f8509d9498f516 xkbevd-1.0.2.tar.bz2
+6fab3bb176be9e510c5613d054ef1ca4 setxkbmap-1.0.4.tar.bz2
Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-xkb-utils.spec 8 Jan 2007 19:47:28 -0000 1.17
+++ xorg-x11-xkb-utils.spec 24 Jul 2007 15:12:27 -0000 1.18
@@ -1,35 +1,24 @@
-%define pkgname xkb-utils
-%define xkbutils_version 1.0.1
-
Summary: X.Org X11 xkb utilities
-Name: xorg-x11-%{pkgname}
-# FIXME: The version field should be the same as the xkbutils tarball version,
-# but it got accidentally bumped to 1.0.2. When xkbutils 1.0.2 is actually
-# released, please use the %%{xkbutils_version} macro here to help prevent
-# inadvertent bumps in the future.
-Version: 1.0.2
-# NOTE: Bump the release field when updating xkbcomp/xkbevd/xkbprint/setxkbmap,
-# as the package version is supposed to be the xkbutils version.
-Release: 3%{?dist}
+Name: xorg-x11-xkb-utils
+Version: 7.2
+Release: 1%{?dist}
License: MIT/X11
Group: User Interface/X
URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# use the macro so the doc dir is changed automagically
+%define xkbutils_version 1.0.1
Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.0.2.tar.bz2
Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.0.2.tar.bz2
Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.0.2.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.0.4.tar.bz2
BuildRequires: pkgconfig
-# libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
BuildRequires: libxkbfile-devel
-# libX11-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
BuildRequires: libX11-devel
-# libXaw-devel needed for xkbutils
BuildRequires: libXaw-devel
-# libXt-devel needed for xkbutils
BuildRequires: libXt-devel
# FIXME: xkbvleds requires libXext, but autotools doesn't check/require it:
# gcc -O2 -g -march=i386 -mcpu=i686 -o xkbvleds xkbvleds-xkbvleds.o
@@ -44,10 +33,7 @@
# libXpm-devel needed for xkbutils (from above error)
BuildRequires: libXpm-devel
-#Provides: %{pkgname}
Provides: setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
-# NOTE: The XFree86, and xorg-x11 packages used to contain the xkb utilities
-# in the previous monolithic based releases.
Obsoletes: XFree86, xorg-x11
%description
@@ -57,41 +43,27 @@
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
%build
-# Build everything
export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP"
-{
- for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
- pushd $pkg-*
- %configure
- make
- popd
- done
-}
+for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
+ pushd $pkg-*
+ %configure
+ make
+ popd
+done
%install
rm -rf $RPM_BUILD_ROOT
-
-# Install everything
-{
- for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
- pushd $pkg-*
- make install DESTDIR=$RPM_BUILD_ROOT
- popd
- done
-}
+for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
+ pushd $pkg-*
+ make install DESTDIR=$RPM_BUILD_ROOT
+ popd
+done
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-# FIXME: The package version is higher than the actual xkbutils version
-# currently, so this hack is necessary. When xkbutils 1.0.2 is actually
-# released, this should be restored to use the "version" macro, which will
-# also have the side effect of helping prevent premature package version
-# incrementation.
-#%doc xkbutils-%{version}/AUTHORS xkbutils-%{version}/COPYING xkbutils-%{version}/INSTALL
-#%doc xkbutils-%{version}/NEWS xkbutils-%{version}/README xkbutils-%{version}/ChangeLog
%doc xkbutils-%{xkbutils_version}/AUTHORS xkbutils-%{xkbutils_version}/COPYING xkbutils-%{xkbutils_version}/INSTALL
%doc xkbutils-%{xkbutils_version}/NEWS xkbutils-%{xkbutils_version}/README xkbutils-%{xkbutils_version}/ChangeLog
%{_bindir}/setxkbmap
@@ -101,16 +73,16 @@
%{_bindir}/xkbprint
%{_bindir}/xkbvleds
%{_bindir}/xkbwatch
-#%dir %{_mandir}/man1x
-# 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}/man1/setxkbmap.1x*
-%{_mandir}/man1/xkbcomp.1x*
-%{_mandir}/man1/xkbevd.1x*
-%{_mandir}/man1/xkbprint.1x*
+%{_mandir}/man1/setxkbmap.1*
+%{_mandir}/man1/xkbcomp.1*
+%{_mandir}/man1/xkbevd.1*
+%{_mandir}/man1/xkbprint.1*
%changelog
+* Tue Jul 24 2007 Adam Jackson <ajax at redhat.com> 7.2-1
+- setxkbmap 1.0.4
+- Arbitrary version number bump, to match X.org release numbering. Why not.
+
* Mon Jan 08 2007 Adam Jackson <ajax at redhat.com> 1.0.2-3
- From OLPC: jam -DHAVE_STRCASECMP into CFLAGS to make xkbcomp (and therefore
X server startup) slightly less painfully slow.
More information about the scm-commits
mailing list