diff --git a/libXp.spec b/libXp.spec index 99496cf..4258a33 100644 --- a/libXp.spec +++ b/libXp.spec @@ -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 @@ BuildRequires: libXau-devel 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 @@ X.Org X11 libXp development package %prep %setup -q -b0 -b1 +%patch1 -p1 -b .proto-check + # Disable static library creation by default. %define with_static 0 @@ -69,6 +73,10 @@ popd %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 @@ make install DESTDIR=$RPM_BUILD_ROOT } %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 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Aug 18 2006 Soren Sandmann - 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 - 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). diff --git a/proto-check.patch b/proto-check.patch new file mode 100644 index 0000000..01346aa --- /dev/null +++ b/proto-check.patch @@ -0,0 +1,11 @@ +--- 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)