From f77993b75ca5ecc66f2f78a013f4e09fbbbaea44 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Fri, 9 Jun 2006 13:20:24 +0000
Subject: [PATCH] - Added "Requires: xorg-x11-proto-devel" - Remove package
 ownership of mandir/libdir/etc.

---
 libXxf86vm.spec | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/libXxf86vm.spec b/libXxf86vm.spec
index d2d0c13..d3353fe 100644
--- a/libXxf86vm.spec
+++ b/libXxf86vm.spec
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
 Version: 1.0.1
-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
@@ -21,8 +22,11 @@ X.Org X11 libXxf86vm runtime library
 %package devel
 Summary: X.Org X11 libXxf86vm development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xxf86vm.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -44,6 +48,7 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
@@ -59,7 +64,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 # FIXME: missing some of these files %doc AUTHORS COPYING README INSTALL ChangeLog
 %doc COPYING ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXxf86vm.so.1
 %{_libdir}/libXxf86vm.so.1.0.0
 
@@ -69,13 +73,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXxf86vm.a
 %endif
 %{_libdir}/libXxf86vm.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xxf86vm.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel"
+- Remove package ownership of mandir/libdir/etc.
+
 * Mon Jun 05 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193509)
 - Use "make install DESTDIR=..." instead of makeinstall macro, to fix (#192731)
@@ -83,10 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-1
 - Update to 1.0.1
 
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-2
@@ -108,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-* Tue Nov 1 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2
+* Tue Nov 01 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2
 - Bump release and rebuild to satiate beehive wonkiness.
 
 * Mon Oct 24 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1