From 89894e2b8c86e80bfcc39ad5cabfb320044d26bf Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Wed, 7 Jun 2006 18:17:25 +0000
Subject: [PATCH] - Added "BuildRequires: xorg-x11-proto-devel" - Added
 "Requires: xorg-x11-proto-devel" to devel package, needed by     xcursor.pc -
 Replace "makeinstall" with "make install DESTDIR=..." - Remove package
 ownership of mandir/libdir/etc.

---
 libXcursor.spec | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/libXcursor.spec b/libXcursor.spec
index 371baf3..f3c3493 100644
--- a/libXcursor.spec
+++ b/libXcursor.spec
@@ -1,16 +1,18 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
 Version: 1.1.6
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 Source1: index.theme
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXfixes-devel
 BuildRequires: libXrender-devel >= 0.8.2
@@ -23,8 +25,11 @@ X.Org X11 libXcursor runtime library
 %package devel
 Summary: X.Org X11 libXcursor development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xorg-x11-proto-devel os needed by xcursor.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -44,10 +49,11 @@ X.Org X11 libXcursor development package
 	--disable-static
 %endif
 make
-%install
 
+%install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons/default
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/icons/default/index.theme
@@ -64,7 +70,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXcursor.so.1
 %{_libdir}/libXcursor.so.1.0.2
 %dir %{_datadir}/icons
@@ -80,20 +85,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXcursor.a
 %endif
 %{_libdir}/libXcursor.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xcursor.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/Xcursor.3x*
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris@redhat.com> 1.1.6-2
+- Added "BuildRequires: xorg-x11-proto-devel"
+- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xcursor.pc
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.1.6-1
 - Update to 1.1.6
 
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.1.5.2-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.1.5.2-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.1.5.2-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.1.5.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris@redhat.com> 1.1.5.2-2