- Un-require xorg-x11-filesystem

- Remove useless %dir

libX11.spec

@@ -4,7 +4,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.2.99
-Release: 1.%{gitdate}%{?dist}
+Release: 2.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -18,15 +18,13 @@ Source1:    make-git-snapshot.sh
 Patch2: dont-forward-keycode-0.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
-# xproto >= 7.0.6 required
 BuildRequires: xorg-x11-util-macros
-BuildRequires: xorg-x11-proto-devel >= 7.1-2
+BuildRequires: pkgconfig(xproto) >= 7.0.15
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 BuildRequires: libxcb-devel >= 1.2
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name}-common = %{version}-%{release}
 
 %description
@@ -43,11 +41,9 @@ libX11 common data
 %package devel
 Summary: X.Org X11 libX11 development package
 Group: Development/Libraries
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
-Requires: xorg-x11-proto-devel >= 7.1-2
-Requires: libXau-devel, libXdmcp-devel, libxcb-devel
+Requires: libXau-devel, libXdmcp-devel
 Requires: pkgconfig
 
 %description devel
@@ -101,7 +97,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/X11
 %{_includedir}/X11/ImUtil.h
 %{_includedir}/X11/XKBlib.h
 %{_includedir}/X11/Xcms.h
@@ -121,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jul 23 2009 Adam Jackson <ajax@redhat.com> 1.2.99-2.20090712
+- Un-require xorg-x11-filesystem
+- Remove useless %%dir
+
 * Sun Jul 12 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.2.99-1.20090712
 - Today's git snapshot
 - libX11-1.2.1-indic.patch: Drop.