Merge branch 'master' into f17

This commit is contained in:
Peter Jones 2012-05-25 15:10:24 -04:00
commit 85ef16307b

View File

@ -69,11 +69,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: flex bison binutils python BuildRequires: flex bison binutils python
BuildRequires: ncurses-devel xz-devel BuildRequires: ncurses-devel xz-devel
BuildRequires: freetype-devel libusb-devel BuildRequires: freetype-devel libusb-devel
%ifarch %{sparc} x86_64 BuildRequires: glibc-devel glibc-static
BuildRequires: /usr/lib64/crt1.o glibc-static
%else
BuildRequires: /usr/lib/crt1.o glibc-static
%endif
BuildRequires: autoconf automake autogen device-mapper-devel BuildRequires: autoconf automake autogen device-mapper-devel
BuildRequires: freetype-devel gettext-devel git BuildRequires: freetype-devel gettext-devel git
BuildRequires: texinfo BuildRequires: texinfo