- Moved Print.h, Printstr.h and printproto.pc into the devel package here

(they used to be in xorg-x11-proto-devel).

.cvsignore

@@ -1 +1,2 @@
 libXp-1.0.0.tar.bz2
+printproto-1.0.3.tar.bz2

libXp.spec

@@ -12,13 +12,14 @@
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 4.1
+Release: 5
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/proto/printproto-1.0.3.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -49,7 +50,7 @@ X.Org X11 libXp development package
 %endif
 
 %prep
-%setup -q
+%setup -q -b0 -b1
 
 # Disable static library creation by default.
 %define with_static 0
@@ -61,6 +62,10 @@ X.Org X11 libXp development package
 %endif
 make
 
+pushd ../printproto-1.0.3
+%configure
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,6 +79,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
    rm -rf $RPM_BUILD_ROOT%{_mandir}
 }
 %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}
 
@@ -98,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with_static}
 %{_libdir}/libXp.a
 %endif
+%{_includedir}/X11/extensions/Print.h
+%{_includedir}/X11/extensions/Printstr.h
+%{_libdir}/pkgconfig/printproto.pc
 # FIXME: Should we remove the shared lib during deprecation, so that things
 # that keep linking to libXp, will always get the static lib and not break
 # when we eventually drop libXp?
@@ -108,6 +121,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 17 2006 Soren Sandmann <sandmann@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). 
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control
 - rebuild
 

sources

@@ -1 +1,2 @@
 0f4ac39108c1ae8c443cdfac259b58fa  libXp-1.0.0.tar.bz2
+0f4e7982c6d4ec3b2cf38502dd1293a3  printproto-1.0.3.tar.bz2