rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.13,1.14

[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-serv23726

Modified Files:
	xorg-x11-xkb-utils.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
- Added xkbutils_version macro, which can be used in the Version field
  in the future, to help prevent accidental bumping of the package version.



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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-xkb-utils.spec	27 Apr 2006 22:09:37 -0000	1.13
+++ xorg-x11-xkb-utils.spec	22 Jun 2006 04:56:45 -0000	1.14
@@ -1,19 +1,26 @@
 %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
-Release: 1
+# NOTE: Bump the release field when updating xkbcomp/xkbevd/xkbprint/setxkbmap,
+# as the package version is supposed to be the xkbutils version.
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%define xorgurl http://xorg.freedesktop.org/releases/individual/app
-Source0: %{xorgurl}/xkbutils-1.0.1.tar.bz2
-Source1: %{xorgurl}/xkbcomp-1.0.2.tar.bz2
-Source2: %{xorgurl}/xkbevd-1.0.2.tar.bz2
-Source3: %{xorgurl}/xkbprint-1.0.1.tar.bz2
-Source4: %{xorgurl}/setxkbmap-1.0.2.tar.bz2
+
+Source0: http://xorg.freedesktop.org/releases/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.2.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.0.2.tar.bz2
+Source3: http://xorg.freedesktop.org/releases/individual/app/xkbprint-1.0.1.tar.bz2
+Source4: http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.0.2.tar.bz2
 
 BuildRequires: pkgconfig
 # libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
@@ -77,7 +84,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+# 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
 %{_bindir}/xkbbell
 %{_bindir}/xkbcomp
@@ -95,6 +110,10 @@
 %{_mandir}/man1/xkbprint.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
+- Added xkbutils_version macro, which can be used in the Version field
+  in the future, to help prevent accidental bumping of the package version.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update setxkbmap, xkbevd, and xkbcomp
 
@@ -126,7 +145,7 @@
 - Change manpage location to 'man1x' in file manifest.
 - Iterate over packages with for loop instead of serialized code duplication.
 
-* Wed Oct  5 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
+* Wed Oct 05 2005 Mike A. Harris <mharris at redhat.com> 0.99.0-2
 - Use Fedora-Extras style BuildRoot tag.
 - Update BuildRequires to use new library package names.
 - Tidy up spec file a bit.