diff --git a/.gitignore b/.gitignore index 1b1ed87..bd7063b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /org.eclipse.4diac.forte-1.9.0.M3.tar.gz /org.eclipse.4diac.forte-1.9.0.tar.gz /org.eclipse.4diac.forte-1.11.0.tar.gz +/org.eclipse.4diac.forte-1.12.0.tar.gz diff --git a/4diac-forte.spec b/4diac-forte.spec index 5d8e701..f6c6b9e 100644 --- a/4diac-forte.spec +++ b/4diac-forte.spec @@ -1,11 +1,14 @@ +# Force out of source build +%undefine __cmake_in_source_build + %global with_lua 1 %global with_luajit 0 %global with_sysfs 1 %global with_opcua 1 Name: 4diac-forte -Version: 1.11.0 -Release: 2%{?dist} +Version: 1.12.0 +Release: 1%{?dist} Summary: IEC 61499 runtime environment License: EPL URL: http://eclipse.org/4diac @@ -40,8 +43,6 @@ execution of all function block types provided by the IEC 61499 standard. %setup -q -n org.eclipse.4diac.forte-%{version} %build -mkdir -p bin/posix -cd bin/posix %cmake -DFORTE_ARCHITECTURE=Posix \ -DFORTE_COM_ETH=ON \ -DFORTE_COM_FBDK=ON \ @@ -61,10 +62,9 @@ cd bin/posix %if 0%{?with_luajit} -DFORTE_USE_LUATYPES=LuaJIT \ %endif - -DFORTE_TESTS=OFF \ - ../.. + -DFORTE_TESTS=OFF -%make_build +%cmake_build %install mkdir -p %{buildroot}%{_unitdir} @@ -73,8 +73,7 @@ install -p systemd/4diac-forte.service %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sysconfdir}/sysconfig install -p systemd/4diac-forte-sysconfig %{buildroot}%{_sysconfdir}/sysconfig/4diac-forte -cd bin/posix -%make_install +%cmake_install %post %systemd_post 4diac-forte.service @@ -92,6 +91,9 @@ cd bin/posix %config(noreplace) %{_sysconfdir}/sysconfig/4diac-forte %changelog +* Sun Jul 05 2020 Neal Gompa - 1.12.0-1 +- Update to release 1.12.0 to fix with CMake 3.17+ + * Tue Jan 28 2020 Fedora Release Engineering - 1.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 6c811ae..94fa408 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.4diac.forte-1.11.0.tar.gz) = 09df034febddd16306a2c85a91367fff3b507992a8ee3400adb6d490258b392fb503214b8e19bd82f112c105e0e97cc0f04b080f385c0da68d70041d1daed69d +SHA512 (org.eclipse.4diac.forte-1.12.0.tar.gz) = 4bbd358f09f31dafe3aa0e4c80ae88334ffdd56827ca0267a544b679ac31fac6788784e67a64c571e0ccfd4d210a3a4bea353d2f03fa746538df9ea44ec56fda