Update to 1.2 GA, Don't fail build on make check failure for some architectures

This commit is contained in:
Peter Robinson 2014-10-13 19:05:31 +01:00
parent 8b74790ead
commit 4be7bb34ed
3 changed files with 25 additions and 12 deletions

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
/libepoxy-d4ad80fb8e7c85c4df455ade75f8dd78579c4d7c.tar.gz
/libepoxy-6eb075c70e2f91a9c45a90677bd46e8fb0432655.tar.gz
/libepoxy-*.tar.gz
/v*.tar.gz

View File

@ -1,19 +1,22 @@
%global gitdate 20140411
#global gitdate 20140411
%global commit 6eb075c70e2f91a9c45a90677bd46e8fb0432655
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#global commit 6eb075c70e2f91a9c45a90677bd46e8fb0432655
#global shortcommit %(c=%{commit}; echo ${c:0:7})
Summary: Direct Rendering Manager runtime library
Name: libepoxy
Version: 1.2
Release: 0.4.%{gitdate}git%{shortcommit}%{?dist}
Release: 1%{?dist}
License: MIT
URL: http://github.com/anholt/libepoxy
# github url - generated archive
Source0: https://github.com/anholt/libepoxy/archive/%{commit}/%{name}-%{commit}.tar.gz
#ource0: https://github.com/anholt/libepoxy/archive/%{commit}/%{name}-%{commit}.tar.gz
Source0: https://github.com/anholt/libepoxy/archive/%{commit}/v%{version}.tar.gz
BuildRequires: pkgconfig automake autoconf libtool
BuildRequires: mesa-libGL-devel mesa-libEGL-devel
BuildRequires: automake autoconf libtool
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libEGL-devel
BuildRequires: mesa-libGLES-devel
BuildRequires: xorg-x11-util-macros
BuildRequires: python3
@ -29,10 +32,10 @@ This package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -qn %{name}-%{commit}
%setup -q
%build
autoreconf -fiv || exit 1
autoreconf -vif || exit 1
%configure --disable-silent-rules
make %{?_smp_mflags}
@ -43,7 +46,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name '*.la' -delete -print
%check
# In theory this is fixed in 1.2 but we still see errors on most platforms
# https://github.com/anholt/libepoxy/issues/24
%ifnarch %{arm} aarch64 %{power64} s390x
make check
%else
make check ||:
%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -60,6 +69,10 @@ make check
%{_libdir}/pkgconfig/epoxy.pc
%changelog
* Mon Oct 13 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.0-1
- Update to 1.2 GA
- Don't fail build on make check failure for some architectures
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-0.4.20140411git6eb075c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

View File

@ -1 +1 @@
3e48df4e7ed5c01f99292735f5ca231d libepoxy-6eb075c70e2f91a9c45a90677bd46e8fb0432655.tar.gz
12d6b7621f086c0c928887c27d90bc30 v1.2.tar.gz