rpms/xorg-x11-xauth/devel xorg-x11-xauth.spec,1.10,1.11

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xauth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16517

Modified Files:
	xorg-x11-xauth.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
- Add missing documentation to doc manifest.
- Use "make install" instead of makeinstall macro.



Index: xorg-x11-xauth.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-xauth.spec	1 Mar 2006 06:45:45 -0000	1.10
+++ xorg-x11-xauth.spec	22 Jun 2006 04:00:34 -0000	1.11
@@ -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 @@
 
 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 @@
 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 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 %{_bindir}/xauth
 %{_bindir}/mkxauth
 #%dir %{_mandir}/man1x
@@ -64,6 +66,10 @@
 %{_mandir}/man1/mkxauth.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at 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 at redhat.com> 1:1.0.1-1.2
 - bump again for double-long bug on ppc(64)