- kbproto 1.0.4

- xf86miscproto 0.9.3
- xproxymanagementprotocol 1.0.3

.cvsignore

@@ -26,3 +26,6 @@ randrproto-1.3.1.tar.bz2
 glproto-1.4.10.tar.bz2
 dri2proto-2.1.tar.bz2
 inputproto-2.0.tar.bz2
+kbproto-1.0.4.tar.bz2
+xf86miscproto-0.9.3.tar.bz2
+xproxymanagementprotocol-1.0.3.tar.bz2

sources

@@ -4,7 +4,6 @@ d30c5dbf19ca6dffcd9788227ecff8c5  bigreqsproto-1.1.0.tar.bz2
 880a41720b2937e2660dcdc0d34a8791  dmxproto-2.3.tar.bz2
 5c74f61d6f77b2e6a083b2b31000be42  evieext-1.1.0.tar.bz2
 f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2
-6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
 70f5998c673aa510e2acd6d8fb3799de  recordproto-1.14.tar.bz2
 b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2
 84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2
@@ -14,14 +13,15 @@ fb762146a18207a1e8bc9f299dfc7ac0  videoproto-2.3.0.tar.bz2
 120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2
 a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
 309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
-acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
 4434894fc7d4eeb4a22e6b876d56fdaa  xf86vidmodeproto-2.3.tar.bz2
 a8aadcb281b9c11a91303e24cdea45f5  xineramaproto-1.2.tar.bz2
 75c9edff1f3823e5ab6bb9e66821a901  xproto-7.0.16.tar.bz2
-d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
 0f7acbc14a082f9ae03744396527d23d  inputproto-2.0.tar.bz2
 a5c244c36382b0de39b2828cea4b651d  randrproto-1.3.1.tar.bz2
 fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2
 4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2
+7f439166a9b2bf81471a33951883019f  kbproto-1.0.4.tar.bz2
+ca63bbb31cf5b7f37b2237e923ff257a  xf86miscproto-0.9.3.tar.bz2
+9de22ca1522008c28fb03dfc41ba2d30  xproxymanagementprotocol-1.0.3.tar.bz2

xorg-x11-proto-devel.spec

@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -24,7 +24,7 @@ Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.1.1.tar.bz2
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.1.0.tar.bz2
 Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.10.tar.bz2
 Source9:  http://www.x.org/pub/individual/proto/inputproto-2.0.tar.bz2
-Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
+Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.4.tar.bz2
 Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.1.tar.bz2
 Source14: http://www.x.org/pub/individual/proto/recordproto-1.14.tar.bz2
 Source15: http://www.x.org/pub/individual/proto/renderproto-0.11.tar.bz2
@@ -36,11 +36,11 @@ Source21: http://www.x.org/pub/individual/proto/xextproto-7.1.1.tar.bz2
 Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
 Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.1.tar.bz2
 Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.1.0.tar.bz2
-Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
+Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.3.tar.bz2
 Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.3.tar.bz2
 Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.tar.bz2
 Source29: http://www.x.org/pub/individual/proto/xproto-7.0.16.tar.bz2
-Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
+Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
 
 Patch1: dri2-page-flip.patch
 
@@ -67,8 +67,6 @@ cd ..
 
 %build
 
-
-
 # Proceed through each proto package directory, building them all
 for dir in $(ls -1) ; do
 	pushd $dir
@@ -89,8 +87,9 @@ for dir in $(ls -1) ; do
 	popd
 done
 for i in composite damage fixes randr render ; do
-    mv $RPM_BUILD_ROOT/usr/share/doc/${i}proto/${i}proto.txt .
+    mv $RPM_BUILD_ROOT%{_docdir}/${i}proto/${i}proto.txt .
 done
+mv $RPM_BUILD_ROOT%{_docdir}/xproxymanagementprotocol/PM_spec .
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc fixesproto.txt
 %doc randrproto.txt
 %doc renderproto.txt
+%doc PM_spec
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
 %{_includedir}/GL/glxmd.h
@@ -267,6 +267,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax@redhat.com> 7.4-34
+- kbproto 1.0.4
+- xf86miscproto 0.9.3
+- xproxymanagementprotocol 1.0.3
+
 * Tue Oct 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 7.4-33
 - Upload xf86dgaproto 2.1 tarball, this time for real.