- Un-require xorg-x11-filesystem

This commit is contained in:
Adam Jackson 2009-07-23 14:18:16 +00:00
parent c88c3af8bb
commit 069934864b

View File

@ -5,7 +5,7 @@
Summary: X.Org X11 application bitmaps Summary: X.Org X11 application bitmaps
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 1.0.1 Version: 1.0.1
Release: 7%{?dist} Release: 8%{?dist}
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -13,11 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.x.org/pub/individual/data/xbitmaps-%{version}.tar.bz2 Source0: ftp://ftp.x.org/pub/individual/data/xbitmaps-%{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-3
Provides: xbitmaps Provides: xbitmaps
Provides: xbitmaps-devel Provides: xbitmaps-devel
@ -43,7 +38,6 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
#%doc #%doc
%dir %{_includedir}/X11
%dir %{_includedir}/X11/bitmaps %dir %{_includedir}/X11/bitmaps
%{_includedir}/X11/bitmaps/* %{_includedir}/X11/bitmaps/*
# Symlink for devel linking # Symlink for devel linking
@ -51,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/xbitmaps.pc %{_libdir}/pkgconfig/xbitmaps.pc
%changelog %changelog
* Thu Jul 23 2009 Adam Jackson <ajax@redhat.com> 1.0.1-8
- Un-require xorg-x11-filesystem
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-7 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild