rpms/libXp/devel proto-check.patch,NONE,1.1 libXp.spec,1.16,1.17

[fedora-cvs-commits at redhat.com]

Author: sandmann

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13614

Modified Files:
	libXp.spec 
Added Files:
	proto-check.patch 
Log Message:
* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
- Add patch to not check for printproto.pc. (Since it's part of this
  package now, it isn't installed at the time libXp is configured).



proto-check.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE proto-check.patch ---
--- libXp-1.0.0/configure.ac.proto-check	2006-08-18 13:41:35.000000000 -0400
+++ libXp-1.0.0/configure.ac	2006-08-18 13:41:49.000000000 -0400
@@ -36,7 +36,7 @@
 AC_PROG_LIBTOOL
 
 # Check for X and print proto
-PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto)
+PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau)
 
 AC_SUBST(XPRINT_CFLAGS)
 AC_SUBST(XPRINT_LIBS)


Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXp.spec	18 Aug 2006 03:36:42 -0000	1.16
+++ libXp.spec	18 Aug 2006 17:52:20 -0000	1.17
@@ -12,7 +12,7 @@
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 5
+Release: 6
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -30,6 +30,8 @@
 
 Obsoletes: XFree86-libs, xorg-x11-libs, xorg-x11-deprecated-libs
 
+Patch1: proto-check.patch
+
 %description
 X.Org X11 libXp runtime library
 
@@ -52,6 +54,8 @@
 %prep
 %setup -q -b0 -b1
 
+%patch1 -p1 -b .proto-check
+
 # Disable static library creation by default.
 %define with_static 0
 
@@ -69,6 +73,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+pushd ../printproto-1.0.3
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %if %{without_devel}
@@ -80,10 +88,6 @@
 }
 %endif
 
-pushd ../printproto-1.0.3
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-
 # Don't encourage people to use the deprecated Xprint APIs.
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 
@@ -121,6 +125,10 @@
 %endif
 
 %changelog
+* Fri Aug 18 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-6
+- Add patch to not check for printproto.pc. (Since it's part of this
+  package now, it isn't installed at the time libXp is configured).
+
 * Thu Aug 17 2006 Soren Sandmann <sandmann at redhat.com> - 1.0.0-5
 - Moved Print.h, Printstr.h and printproto.pc into the devel package here
   (they used to be in xorg-x11-proto-devel).