From e3e140570a2d0b15d8ad6334f4d194bd0625e26a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Feb 12 2019 13:27:48 +0000
Subject: Build fixes and cleanup


---

diff --git a/4diac-forte.spec b/4diac-forte.spec
index adb5226..d125209 100644
--- a/4diac-forte.spec
+++ b/4diac-forte.spec
@@ -1,18 +1,20 @@
-
+%global with_lua 0
+%global with_luajit 0
 %global with_sysfs 1
 %global with_opcua 1
 
 Name:     4diac-forte
 Version:  1.9.0
-Release:  3.1%{?dist}
+Release:  4%{?dist}
 Summary:  IEC 61499 runtime environment
 License:  EPL
 URL:      http://eclipse.org/4diac
 Source0:  https://git.eclipse.org/c/4diac/org.eclipse.4diac.forte.git/snapshot/org.eclipse.4diac.forte-%{version}.tar.gz
 
-%{?systemd_requires}
-BuildRequires: cmake, gcc-c++
+BuildRequires: cmake
+BuildRequires: gcc-c++
 BuildRequires: systemd
+%{?systemd_requires}
 
 %if 0%{?with_opcua}
 BuildRequires: open62541-devel >= 0.2
@@ -43,16 +45,25 @@ cd bin/posix
        -DFORTE_COM_ETH=ON \
        -DFORTE_COM_FBDK=ON \
        -DFORTE_COM_LOCAL=ON \
-       %{?with_opcua: -DFORTE_COM_OPC_UA=ON -DFORTE_COM_OPC_UA_INCLUDE_DIR=%{_includedir}/open62541 -DFORTE_COM_OPC_UA_LIB_DIR=%{_libdir}} \
+%if 0%{?with_opcua}
+       -DFORTE_COM_OPC_UA=ON -DFORTE_COM_OPC_UA_INCLUDE_DIR=%{_includedir} -DFORTE_COM_OPC_UA_LIB_DIR=%{_libdir} \
+%endif
        -DFORTE_MODULE_CONVERT=ON \
        -DFORTE_MODULE_IEC61131=ON \
-       %{?with_sysfs: -DFORTE_MODULE_SysFs=ON } \
+%if 0%{?with_sysfs}
+       -DFORTE_MODULE_SysFs=ON \
+%endif
        -DFORTE_MODULE_UTILS=ON \
-       %{?with_lua: -DFORTE_USE_LUATYPES=Lua } \
-       %{?with_luajit: -DFORTE_USE_LUATYPES=LuaJIT } \
+%if 0%{?with_lua}
+       -DFORTE_USE_LUATYPES=Lua \
+%endif
+%if 0%{?with_luajit}
+       -DFORTE_USE_LUATYPES=LuaJIT \
+%endif
        -DFORTE_TESTS=OFF \
        ../..
-make %{?_smp_mflags}
+
+%make_build
 
 %install
 mkdir -p %{buildroot}%{_unitdir}
@@ -80,6 +91,9 @@ cd bin/posix
 %config(noreplace) %{_sysconfdir}/sysconfig/4diac-forte
 
 %changelog
+* Tue Feb 12 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.9.0-4
+- Build fixes and cleanup
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -90,7 +104,6 @@ cd bin/posix
 - Update to the final release 1.9.0
 - Enable Lua integration
 - Enable OPC UA integration
+
 * Mon Feb 05 2018 Jens Reimann <jreimann@redhat.com> - 1.9.0.M3-0.1
 - Initial version of the package
-
-