| |
@@ -1,11 +1,13 @@
|
| |
+ %undefine __cmake_in_source_build
|
| |
+ %undefine __cmake3_in_source_build
|
| |
+
|
| |
# We have to call the package libASL instead of ASL, because a package asl
|
| |
# exists. https://fedoraproject.org/wiki/Packaging:Conflicts#Conflicting_Package_Names
|
| |
%global upstream ASL
|
| |
- %global _cmake_build_subdir build-%{?__isa}%{?dist}
|
| |
|
| |
Name: lib%{upstream}
|
| |
Version: 0.1.7
|
| |
- Release: 23%{?dist}
|
| |
+ Release: 24%{?dist}
|
| |
Summary: Advanced Simulation Library hardware accelerated multiphysics simulation platform
|
| |
|
| |
License: AGPLv3 and BSD and MIT
|
| |
@@ -109,24 +111,22 @@
|
| |
%prep
|
| |
%setup -q -n %{upstream}-%{version}
|
| |
%patch0 -p1 -b .vtk8
|
| |
- %{__mkdir_p} %{_cmake_build_subdir}
|
| |
|
| |
%build
|
| |
- pushd %{_cmake_build_subdir}
|
| |
%cmake3 -DWITH_API_DOC:BOOL=ON \
|
| |
-DWITH_MATIO:BOOL=ON \
|
| |
-DWITH_EXAMPLES=ON \
|
| |
- -DWITH_TESTS=ON ..
|
| |
- make %{?_smp_mflags}
|
| |
- popd
|
| |
+ -DWITH_TESTS=ON
|
| |
+ %cmake3_build
|
| |
+ %cmake3_build --target docs
|
| |
|
| |
|
| |
%install
|
| |
- %make_install -C %{_cmake_build_subdir}
|
| |
+ %cmake3_install
|
| |
find %{buildroot} -name '*.la' -delete
|
| |
|
| |
# Move docs and examples to right places
|
| |
- %{__mkdir_p} %{buildroot}%{_docdir}/%{name}-doc
|
| |
+ mkdir -p %{buildroot}%{_docdir}/%{name}-doc
|
| |
mv %{buildroot}%{_docdir}/%{upstream}/html %{buildroot}%{_docdir}/%{name}-doc
|
| |
mv %{buildroot}%{_docdir}/%{upstream}/examples %{buildroot}%{_docdir}/%{name}-examples
|
| |
# Move input data for examples
|
| |
@@ -134,16 +134,13 @@
|
| |
mv %{buildroot}%{_datadir}/%{upstream}/input %{buildroot}%{_docdir}/%{name}-examples
|
| |
|
| |
|
| |
- %if 0%{?fedora}
|
| |
- %ifnarch %{arm} aarch64 ppc64 ppc64le s390 s390x
|
| |
- # Do nothing for now... pocl is broken, therefore we cannot test
|
| |
%check
|
| |
- #pushd %{_cmake_build_subdir}
|
| |
# Test failures
|
| |
# https://github.com/AvtechScientific/ASL/issues/16
|
| |
- #ctest3 -V -E 'testPrivateVar|testReductionFunction'
|
| |
- #ctest3 -V -R 'testPrivateVar|testReductionFunction' || :
|
| |
- %endif
|
| |
+ %ifnarch %{arm} aarch64 %{ix86} ppc64 ppc64le s390 s390x
|
| |
+ %ctest3
|
| |
+ %else
|
| |
+ %ctest3 || :
|
| |
%endif
|
| |
|
| |
|
| |
@@ -206,6 +203,10 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Tue Aug 04 2020 Orion Poplawski <orion@nwra.com> - 0.1.7-24
|
| |
+ - Use updated cmake macros
|
| |
+ - Run tests, still failing everywhere but x86_64
|
| |
+
|
| |
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-23
|
| |
- Second attempt - Rebuilt for
|
| |
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
| |
orion
commented 3 years ago
This requires https://src.fedoraproject.org/rpms/cmake/pull-request/7 first to work. Also should check to see what tests are still failing.