ARM is now supported, Remove old Fedora release conditionals

This commit is contained in:
Peter Robinson 2014-06-07 00:04:22 +01:00
parent 0791a88048
commit 6fb0e10c8d

View File

@ -17,15 +17,9 @@
%global with_system_nvtt 1 %global with_system_nvtt 1
%global without_nvtt 0 %global without_nvtt 0
%if 0%{?fedora} <= 16
%global with_system_enet 0
%else
%global with_system_enet 1
%endif
Name: 0ad Name: 0ad
Version: 0.0.16 Version: 0.0.16
Release: 2%{?dist} Release: 3%{?dist}
# BSD License: # BSD License:
# build/premake/* # build/premake/*
# libraries/valgrind/* (not built/used) # libraries/valgrind/* (not built/used)
@ -75,9 +69,7 @@ BuildRequires: boost-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: DevIL-devel BuildRequires: DevIL-devel
%if %{with_system_enet}
BuildRequires: enet-devel BuildRequires: enet-devel
%endif
BuildRequires: gamin-devel BuildRequires: gamin-devel
BuildRequires: gloox-devel BuildRequires: gloox-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
@ -102,7 +94,7 @@ BuildRequires: SDL-devel
BuildRequires: subversion BuildRequires: subversion
BuildRequires: wxGTK-devel BuildRequires: wxGTK-devel
ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 %{arm}
# http://trac.wildfiregames.com/ticket/1421 # http://trac.wildfiregames.com/ticket/1421
Patch0: %{name}-rpath.patch Patch0: %{name}-rpath.patch
@ -153,9 +145,7 @@ build/workspaces/update-workspaces.sh \
--bindir %{_bindir} \ --bindir %{_bindir} \
--datadir %{_datadir}/%{name} \ --datadir %{_datadir}/%{name} \
--libdir %{_libdir}/%{name} \ --libdir %{_libdir}/%{name} \
%if %{with_system_enet}
--with-system-enet \ --with-system-enet \
%endif
--with-system-mozjs24 \ --with-system-mozjs24 \
--with-system-miniupnpc \ --with-system-miniupnpc \
%if %{with_system_nvtt} %if %{with_system_nvtt}
@ -185,10 +175,6 @@ for name in AtlasUI%{dbg} Collada%{dbg}; do
install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so
done done
%if !%{with_system_enet}
install -p -m 755 binaries/system/libenet.so.1 %{buildroot}%{_libdir}/%{name}/libenet.so.1
%endif
%if !%{without_nvtt} && !%{with_system_nvtt} %if !%{without_nvtt} && !%{with_system_nvtt}
for name in nvcore nvimage nvmath nvtt; do for name in nvcore nvimage nvmath nvtt; do
install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so
@ -239,6 +225,10 @@ export STRIP=/bin/true
%{_mandir}/man6/*.6* %{_mandir}/man6/*.6*
%changelog %changelog
* Fri Jun 6 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.0.16-3
- ARM is now supported
- Remove old Fedora release conditionals
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 0.0.16-2 * Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 0.0.16-2
- Rebuild for boost 1.55.0 - Rebuild for boost 1.55.0