From 4d26dbc2e01b8d6ab2ddbc0223e7c93427a52e11 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Wed, 7 Jun 2006 17:58:15 +0000
Subject: [PATCH] - Replace "makeinstall" with "make install DESTDIR=..." -
 Added "Requires: xorg-x11-proto-devel >= 7.0-10, libXfixes-devel to devel    
 subpackage needed by xcomposite.pc - Remove package ownership of
 mandir/libdir/etc.

---
 libXcomposite.spec | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/libXcomposite.spec b/libXcomposite.spec
index 4090977..3490ff0 100644
--- a/libXcomposite.spec
+++ b/libXcomposite.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
 Version: 0.3
-Release: 4
+Release: 5
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -22,8 +22,11 @@ X.Org X11 libXcomposite runtime library
 %package devel
 Summary: X.Org X11 libXcomposite development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+Requires: xorg-x11-proto-devel >= 7.0-10
+Requires: libXfixes-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -47,7 +50,7 @@ make
 %install
 
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -61,7 +64,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXcomposite.so.1
 %{_libdir}/libXcomposite.so.1.0.0
 
@@ -74,10 +76,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXcomposite.a
 %endif
 %{_libdir}/libXcomposite.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris@redhat.com> 0.3-5
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Added "Requires: xorg-x11-proto-devel >= 7.0-10, libXfixes-devel to devel
+  subpackage needed by xcomposite.pc
+- Remove package ownership of mandir/libdir/etc.
+
 * Mon Apr 10 2006 Kristian Høgsberg <krh@redhat.com> 0.3-4
 - Bump for build in fc5-bling.