- Drop explicit virtual Provides, we get them for free from pkgconfig

- Drop some ancient upgrade Prov/Req/Obs

xorg-x11-proto-devel.spec

@@ -2,74 +2,49 @@
 # avoid build loops.
 %define build_bootstrap 0
 
-# INFO: This package contains only C header files and pkg-config *.pc files,
-# and does not contain any ELF binaries or DSOs, so we disable debuginfo
-# generation.
 %define debug_package %{nil}
 
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Add virtual provides lazily as they get updated, so the server and libs
-# can depend on specific proto versions instead of this package's version.
 Source0:  http://www.x.org/pub/individual/proto/bigreqsproto-1.0.2.tar.bz2
 Source1:  http://www.x.org/pub/individual/proto/compositeproto-0.4.tar.bz2
-Provides: compositeproto = 0.4
 Source2:  http://www.x.org/pub/individual/proto/damageproto-1.1.0.tar.bz2
-Provides: damageproto = 1.1.0
 Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.2.2.tar.bz2
 Source31: http://www.x.org/pub/individual/proto/dri2proto-1.99.1.tar.bz2
-Provides: dri2proto = 1.99.1
 Source4:  http://www.x.org/pub/individual/proto/evieext-1.0.2.tar.bz2
 Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.0.tar.bz2
-Provides: fixesproto = 4.0
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
 Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.9.tar.bz2
-Provides: glproto = 1.4.9
 Source9:  http://www.x.org/pub/individual/proto/inputproto-1.4.4.tar.bz2
-Provides: inputproto = 1.4.4
 Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
-Provides: kbproto = 1.0.3
 Source13: http://www.x.org/pub/individual/proto/randrproto-1.2.2.tar.bz2
-Provides: randrproto = 1.2.2
 Source14: http://www.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
 Source15: http://www.x.org/pub/individual/proto/renderproto-0.9.3.tar.bz2
-Provides: renderproto = 0.9.3
 Source16: http://www.x.org/pub/individual/proto/resourceproto-1.0.2.tar.bz2
 Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.1.0.tar.bz2
-Provides: scrnsaverproto = 1.1.0
 Source19: http://www.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
 Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
 Source21: http://www.x.org/pub/individual/proto/xextproto-7.0.3.tar.bz2
-Provides: xextproto = 7.0.3
 Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
 Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
-Provides: xf86dgaproto = 2.0.3
 Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.0.4.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.2.tar.bz2
 Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2
 Source29: http://www.x.org/pub/individual/proto/xproto-7.0.14.tar.bz2
-Provides: xproto = 7.0.14
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
-Obsoletes: XFree86-devel, xorg-x11-devel
-
-# NOTE: This dependency on xorg-x11-filesystem is required to work around
-# a nasty upgrade problem when going from FC4->FC5 or monolithic to
-# modular X.Org.  Bug #173384.
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
-
 %if ! %{build_bootstrap}
 Requires: mesa-libGL-devel
 Requires: libXau-devel
@@ -284,6 +259,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Mon Nov 10 2008 Adam Jackson <ajax@redhat.com> 7.4-5
+- Drop explicit virtual Provides, we get them for free from pkgconfig
+- Drop some ancient upgrade Prov/Req/Obs
+
 * Thu Oct 23 2008 Peter Hutterer <peter.hutterer@redhat.com> 7.4-4
 - xproto 7.0.14