rpms/libXcomposite/devel libXcomposite.spec,1.14,1.15

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9978

Modified Files:
	libXcomposite.spec 
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at 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.



Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXcomposite.spec	10 Apr 2006 22:08:40 -0000	1.14
+++ libXcomposite.spec	7 Jun 2006 17:58:15 -0000	1.15
@@ -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 @@
 %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 @@
 %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 @@
 %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 @@
 %{_libdir}/libXcomposite.a
 %endif
 %{_libdir}/libXcomposite.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at 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 at redhat.com> 0.3-4
 - Bump for build in fc5-bling.