- Updated to xauth 0.99.1 from X11R7 RC1

- Change manpage location to 'man1x' in file manifest
This commit is contained in:
mharris 2005-10-31 16:46:07 +00:00
parent bbbf37845d
commit 89227d908f

View File

@ -1,20 +1,10 @@
%define pkgname xauth
# FIXME: Upstream version of xfs tarball is 0.99.0, which would require
# us to add an "Epoch: 1" to this package in order for rpm to upgrade from
# the FC4 (and earlier) monolithic xorg-x11-xfs-6.8.x rpm package. Since
# it is currently unknown what the final upstream tarball version is likely
# to be called, I am avoiding adding Epoch, and instead using a 6.99.99.x
# version number for the time being. This allows us to make sure xfs will
# upgrade from older releases to the new release, allows us to avoid adding
# an Epoch tag possibly unnecessarily - as Epoch is permanent and very evil.
# If upstream later names it "xfs-7.0", then we bump the version to that,
# and everything just works.
%define upstreamversion 0.99.0
%define upstreamversion 0.99.1
Summary: X.Org X11 X authority utilities
Name: xorg-x11-%{pkgname}
Version: 6.99.99.0
Release: 2
Release: 3
License: MIT/X11
Group: User Interface/X
URL: http://www.x.org
@ -23,15 +13,11 @@ Source10: mkxauth
Source11: mkxauth.man
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# x11 xau xext xmu
BuildRequires: libX11-devel
BuildRequires: libXau-devel
BuildRequires: libXext-devel
BuildRequires: libXmu-devel
# FIXME: monolithic twm packaging has a hard dep on xterm, which might still
# be required. We'll have to examine the twm configuration files.
#Requires: xterm
Provides: xauth
Provides: mkxauth
Obsoletes: XFree86-xauth, mkxauth
@ -60,7 +46,7 @@ cd %{pkgname}-%{upstreamversion}
# Install mkxauth
{
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/mkxauth.1
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1x/mkxauth.1
}
%clean
@ -73,11 +59,15 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/xauth
%{_bindir}/mkxauth
%dir %{_mandir}
%dir %{_mandir}/man1
%{_mandir}/man1/xauth.1*
%{_mandir}/man1/mkxauth.1*
%dir %{_mandir}/man1x
%{_mandir}/man1x/xauth.1*
%{_mandir}/man1x/mkxauth.1*
%changelog
* Wed Aug 24 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.0-3
- Updated to xauth 0.99.1 from X11R7 RC1
- Change manpage location to 'man1x' in file manifest
* Wed Aug 24 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.0-2
- Use Fedora-Extras style BuildRoot tag
- Update BuildRequires to use new library package names