From e2fde12dda79ba471051d040f8e07ecc4955f30e Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Fri, 9 Jun 2006 13:27:15 +0000
Subject: [PATCH] - Replace "makeinstall" with "make install DESTDIR=..." -
 Added "Requires: xorg-x11-proto-devel" to devel for dmx.pc - Remove package
 ownership of mandir/libdir/etc.

---
 libdmx.spec | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/libdmx.spec b/libdmx.spec
index 6a51bf8..65b81ea 100644
--- a/libdmx.spec
+++ b/libdmx.spec
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libdmx runtime library
 Name: libdmx
 Version: 1.0.2
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
@@ -22,8 +23,11 @@ X.Org X11 libdmx runtime library
 %package devel
 Summary: X.Org X11 libdmx development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed for dmx.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -44,7 +48,8 @@ X.Org X11 libdmx development package
 
 %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
@@ -58,7 +63,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libdmx.so.1
 %{_libdir}/libdmx.so.1.0.0
 
@@ -68,24 +72,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdmx.a
 %endif
 %{_libdir}/libdmx.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/dmx.pc
-#FIXME: manpages should be in man3x?
-%dir %{_mandir}
-%dir %{_mandir}/man3/
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
-* Wed Jun  7 2006 Jeremy Katz <katzj@redhat.com> - 1.0.2-2
+* Fri Jun 09 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-3
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Added "Requires: xorg-x11-proto-devel" to devel for dmx.pc
+- Remove package ownership of mandir/libdir/etc.
+
+* Wed Jun 07 2006 Jeremy Katz <katzj@redhat.com> 1.0.2-2
 - rebuild for -devel deps
 
 * Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.0.2-1
 - Update to 1.0.2
 
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.1-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-1