- Updated dep to "Requires(pre): xorg-x11-filesystem >= 0.99.2-3" for new

fix.
- Moved bitmap files back into the upstream default of _includedir
    (#173665).

xorg-x11-xbitmaps.spec

@@ -1,31 +1,22 @@
 %define pkgname xbitmaps
 
-# FIXME: The X11 bitmaps are used at both compile time and runtime if I am
-# not completely mistaken.  Either way, they are architecture independant
-# data, and should be stored in /usr/share/X11/bitmaps instead of under
-# /usr/include.  I'm leaving it as is for now, but this should be changed
-# before X11R7.  -- mharris
-#define _x11bitmapdir %{_datadir}
-%define _x11bitmapdir %{_includedir}
-
 Summary: X.Org X11 application bitmaps
 Name: xorg-x11-%{pkgname}
 Version: 0.99.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{pkgname}-%{version}.tar.bz2
-#Source0: %{pkgname}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{pkgname}-%{version}.tar.bz2
 
 # 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-1
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
-Provides: %{pkgname}
-Provides: %{pkgname}-devel
+Provides: xbitmaps
+Provides: xbitmaps-devel
 
 %description
 X.Org X11 application bitmaps
@@ -52,27 +43,48 @@ rm -rf $RPM_BUILD_ROOT
 # a separate devel subpackage, I've added a virtual Provide above so this
 # package provides both.  This should be fixed upstream IMHO to use
 # /usr/share by default.
+%if 0
 {
    mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11
    mv $RPM_BUILD_ROOT%{_includedir}/X11/bitmaps $RPM_BUILD_ROOT%{_datadir}/X11/
    ln -sf ../../..%{_datadir}/X11/bitmaps $RPM_BUILD_ROOT%{_includedir}/X11/
 }
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc
+%if 0
+
 %dir %{_datadir}
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/bitmaps
 %{_datadir}/X11/bitmaps/*
 # Symlink for devel linking
 %{_includedir}/X11/bitmaps
+
+%else
+
+%dir %{_includedir}
+%dir %{_includedir}/X11
+%dir %{_includedir}/X11/bitmaps
+%{_includedir}/X11/bitmaps/*
+# Symlink for devel linking
+%{_includedir}/X11/bitmaps
+
+%endif
+
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* Wed Nov 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-4
+- Updated dep to "Requires(pre): xorg-x11-filesystem >= 0.99.2-3" for new fix.
+- Moved bitmap files back into the upstream default of _includedir (#173665).
+
 * Mon Nov 21 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-3
 - Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-1" to attempt to
   workaround bug( #173384).