%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 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 # 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 Provides: %{pkgname} Provides: %{pkgname}-devel %description X.Org X11 application bitmaps %prep %setup -q -n xbitmaps-%{version} %build # Build xbitmaps %configure make %install rm -rf $RPM_BUILD_ROOT %makeinstall # FIXME: Upstream installs the bitmaps into /usr/include by default, however # they are used both at compiletime via #include, as well as at runtime by # other apps. Being pedantically correct, it makes sense to install them # into the FHS sanctioned /usr/share heirarchy instead for runtime arch # independent data. Then provide a symlink from /usr/include to the # runtime dir for apps to link to. Since this is too much overhead for # 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. { 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/ } %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %dir %{_datadir} %dir %{_datadir}/X11 %dir %{_datadir}/X11/bitmaps %{_datadir}/X11/bitmaps/* # Symlink for devel linking %{_includedir}/X11/bitmaps %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xbitmaps.pc %changelog * Mon Nov 21 2005 Mike A. Harris 0.99.1-3 - Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-1" to attempt to workaround bug( #173384). * Fri Nov 11 2005 Mike A. Harris 0.99.1-2 - Clean up specfile. * Fri Nov 11 2005 Mike A. Harris 0.99.1-1 - Updated to xbitmaps 0.99.1 from X11R7 RC2 * Fri Aug 26 2005 Mike A. Harris 0.99.0-1 - Initial build.