Merge branch 'master' into f17

This commit is contained in:
Ray Strode 2012-03-12 13:14:49 -04:00
commit d184bcde10

View File

@ -6,7 +6,7 @@
Summary: Graphical Boot Animation and Logger Summary: Graphical Boot Animation and Logger
Name: plymouth Name: plymouth
Version: 0.8.4 Version: 0.8.4
Release: 0.20110810.5%{?dist} Release: 0.20110810.6%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@ -24,7 +24,9 @@ Requires: initscripts >= 8.83-1
Conflicts: filesystem < 3 Conflicts: filesystem < 3
BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libdrm)
%ifarch %{ix86} x86_64 ia64
BuildRequires: pkgconfig(libdrm_intel) BuildRequires: pkgconfig(libdrm_intel)
%endif
BuildRequires: pkgconfig(libdrm_radeon) BuildRequires: pkgconfig(libdrm_radeon)
BuildRequires: pkgconfig(libdrm_nouveau) BuildRequires: pkgconfig(libdrm_nouveau)
BuildRequires: kernel-headers BuildRequires: kernel-headers
@ -494,6 +496,9 @@ fi
%defattr(-, root, root) %defattr(-, root, root)
%changelog %changelog
* Mon Mar 12 2012 Ray Strode <rstrode@redhat.com> 0.8.4-0.20110810.6
- Don't require libdrm_intel on non intel arches
* Mon Feb 20 2012 Adam Williamson <awilliam@redhat.com> 0.8.4-0.20110810.5 * Mon Feb 20 2012 Adam Williamson <awilliam@redhat.com> 0.8.4-0.20110810.5
- make plymouth-scripts require plymouth (RH #794894) - make plymouth-scripts require plymouth (RH #794894)