rpms/xorg-x11-proto-devel/F-12 sources, 1.60, 1.61 xorg-x11-proto-devel.spec, 1.110, 1.111

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18104

Modified Files:
	sources xorg-x11-proto-devel.spec 
Log Message:
oops, sync with devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	6 Oct 2009 14:25:02 -0000	1.60
+++ sources	6 Oct 2009 15:48:37 -0000	1.61
@@ -1,27 +1,27 @@
 d30c5dbf19ca6dffcd9788227ecff8c5  bigreqsproto-1.1.0.tar.bz2
-6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2
+3692f3f8b2ea10dff3d2cede8dc65e79  compositeproto-0.4.1.tar.bz2
 434b931b02bd83ed9fc44951df81cdac  damageproto-1.2.0.tar.bz2
-7bd9ccde42f022725c0086bd93d269f3  dmxproto-2.2.99.1.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
-1ab825ee2dbf32dd4a09cfca89d0fad7  recordproto-1.13.99.1.tar.bz2
+70f5998c673aa510e2acd6d8fb3799de  recordproto-1.14.tar.bz2
 b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2
 84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2
 9040c991a56ee9b5976936f8c65d5c8a  scrnsaverproto-1.2.0.tar.bz2
 fb762146a18207a1e8bc9f299dfc7ac0  videoproto-2.3.0.tar.bz2
 7b83e4a7e9f4edc9c6cfb0500f4a7196  xcmiscproto-1.2.0.tar.bz2
 120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2
-a0135bcc07009475a9db5aee362566fc  xf86dgaproto-2.0.99.1.tar.bz2
+a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
 309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
 acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
-128a61f6e275cb76566e4ce477631938  xf86vidmodeproto-2.2.99.1.tar.bz2
-ae9dde9a3a81880cb718b36d32198fcd  xineramaproto-1.1.99.1.tar.bz2
-1a2b31430d04340be2e49e8b6445e076  xproto-7.0.15.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
-1937db6f8881409a1fc8b45bcc01f4ad  inputproto-1.9.99.902.tar.bz2
-fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.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


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12/xorg-x11-proto-devel.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- xorg-x11-proto-devel.spec	6 Oct 2009 14:25:02 -0000	1.110
+++ xorg-x11-proto-devel.spec	6 Oct 2009 15:48:37 -0000	1.111
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -15,18 +15,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 
 Source0:  http://www.x.org/pub/individual/proto/bigreqsproto-1.1.0.tar.bz2
-Source1:  http://www.x.org/pub/individual/proto/compositeproto-0.4.tar.bz2
+Source1:  http://www.x.org/pub/individual/proto/compositeproto-0.4.1.tar.bz2
 Source2:  http://www.x.org/pub/individual/proto/damageproto-1.2.0.tar.bz2
-Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.2.99.1.tar.bz2
+Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.3.tar.bz2
 Source31: http://www.x.org/pub/individual/proto/dri2proto-2.1.tar.bz2
 Source4:  http://www.x.org/pub/individual/proto/evieext-1.1.0.tar.bz2
 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-1.9.99.902.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
 Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.1.tar.bz2
-Source14: http://www.x.org/pub/individual/proto/recordproto-1.13.99.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
 Source16: http://www.x.org/pub/individual/proto/resourceproto-1.1.0.tar.bz2
 Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.2.0.tar.bz2
@@ -34,12 +34,12 @@ Source19: http://www.x.org/pub/individua
 Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.2.0.tar.bz2
 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.0.99.1.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
-Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.2.99.1.tar.bz2
-Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.99.1.tar.bz2
-Source29: http://www.x.org/pub/individual/proto/xproto-7.0.15.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
 
 Patch1: dri2-page-flip.patch
@@ -53,6 +53,8 @@ Requires: libXau-devel
 %endif
 Requires: pkgconfig
 
+Conflicts: libXxf86dga-devel < 1.1
+
 %description
 X.Org X11 Protocol headers
 
@@ -209,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/xf86bigfont.h
 %{_includedir}/X11/extensions/xf86bigfproto.h
 %{_includedir}/X11/extensions/xf86bigfstr.h
+%{_includedir}/X11/extensions/xf86dga.h
 %{_includedir}/X11/extensions/xf86dga1const.h
 %{_includedir}/X11/extensions/xf86dga1proto.h
 %{_includedir}/X11/extensions/xf86dga1str.h
@@ -264,9 +267,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-32
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-33
+- Upload xf86dgaproto 2.1 tarball, this time for real.
+
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-32
+- compositeproto 0.4.1
+- xf86dgaproto 2.1
+- dmxproto 2.3
+- inputproto 2.0
 - fixesproto 4.1.1
 - randrproto 1.3.1
+- recordproto 1.14
+- xf86vidmodeproto 2.3
+- xineramaproto 1.2
+- xproto 7.0.16
 
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-31
 - bigreqsproto 1.1.0