- Add missing documentation to doc manifest.
- Use "make install" instead of makeinstall macro.
This commit is contained in:
parent
c77a25be7c
commit
7469bebed1
@ -3,16 +3,17 @@
|
||||
Summary: X.Org X11 X authority utilities
|
||||
Name: xorg-x11-%{pkgname}
|
||||
Version: 1.0.1
|
||||
Release: 1.2
|
||||
Release: 2
|
||||
# NOTE: Remove Epoch line if package gets renamed
|
||||
Epoch: 1
|
||||
License: MIT/X11
|
||||
Group: User Interface/X
|
||||
URL: http://www.x.org
|
||||
Source0: http://xorg.freedesktop.org/releasesX11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: http://xorg.freedesktop.org/releases/individual/app/%{pkgname}-%{version}.tar.bz2
|
||||
Source10: mkxauth
|
||||
Source11: mkxauth.man
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: libX11-devel
|
||||
@ -22,7 +23,9 @@ BuildRequires: libXmu-devel
|
||||
|
||||
Provides: xauth
|
||||
Provides: mkxauth
|
||||
|
||||
Obsoletes: XFree86-xauth, mkxauth
|
||||
|
||||
# NOTE: xauth moved from the XFree86 package to XFree86-xauth in
|
||||
# XFree86-4.2.0-50.11, so this Obsoletes line is required for upgrades
|
||||
# from RHL 8 and older, and RHEL 2.1 to work properly when upgrading to
|
||||
@ -34,17 +37,16 @@ xauth is used to edit and display the authorization information
|
||||
used in connecting to an X server.
|
||||
|
||||
%prep
|
||||
%setup -q -n xauth-%{version}
|
||||
%setup -q -n %{pkgname}-%{version}
|
||||
|
||||
%build
|
||||
#cd %{pkgname}-%{version}
|
||||
%configure
|
||||
make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
#cd %{pkgname}-%{version}
|
||||
%makeinstall
|
||||
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
# Install mkxauth
|
||||
{
|
||||
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/
|
||||
@ -56,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc
|
||||
%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
|
||||
%{_bindir}/xauth
|
||||
%{_bindir}/mkxauth
|
||||
#%dir %{_mandir}/man1x
|
||||
@ -64,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man1/mkxauth.1x*
|
||||
|
||||
%changelog
|
||||
* Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1:1.0.1-2
|
||||
- Add missing documentation to doc manifest.
|
||||
- Use "make install" instead of makeinstall macro.
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1:1.0.1-1.2
|
||||
- bump again for double-long bug on ppc(64)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user