rpms/libXres/devel libXres.spec,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/libXres/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14330

Modified Files:
	libXres.spec 
Log Message:
* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added "Requires: xorg-x11-proto-devel" to devel package for xres.pc



Index: libXres.spec
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXres.spec	6 Jun 2006 04:51:53 -0000	1.12
+++ libXres.spec	9 Jun 2006 12:06:39 -0000	1.13
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXres runtime library
 Name: libXres
 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: libX11-devel
 BuildRequires: libXext-devel
@@ -20,8 +21,11 @@
 %package devel
 Summary: X.Org X11 libXres development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xres.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -35,7 +39,6 @@
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -44,6 +47,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
@@ -70,12 +74,14 @@
 %{_libdir}/libXRes.a
 %endif
 %{_libdir}/libXRes.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xres.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel" to devel package for xres.pc
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#193502)
 - Replace "makeinstall" with "make install DESTDIR=..." for (#192725)