premature commit fix

After sqlite3 support has been removed from the server the build process
had too be changed a bit.

diff --git a/always_compile_ipc.patch b/always_compile_ipc.patch
new file mode 100644 (file)
index 0000000..469fc3b
--- /dev/null
+++ b/always_compile_ipc.patch
@@ -0,0 +1,12 @@
+diff -dur zabbix-3.4.4.orig/configure.ac zabbix-3.4.4/configure.ac
+--- zabbix-3.4.4.orig/configure.ac     2017-11-09 11:37:33.000000000 +0100
++++ zabbix-3.4.4/configure.ac  2017-12-14 14:14:18.000000000 +0100
+@@ -1354,7 +1354,7 @@
+ fi
+ 
+ dnl Check if Zabbix internal IPC services are used
+-have_ipcservice="no"
++have_ipcservice="yes"
+ if test "x$have_ipmi" = "xyes"; then
+       have_ipcservice="yes"
+ fi

diff --git a/link_order.patch b/link_order.patch
deleted file mode 100644 (file)
index 31a165b..0000000
--- a/link_order.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -durN zabbix-3.4.4.orig/src/zabbix_server/Makefile.am zabbix-3.4.4/src/zabbix_server/Makefile.am
---- zabbix-3.4.4.orig/src/zabbix_server/Makefile.am    2017-11-09 11:37:30.000000000 +0100
-+++ zabbix-3.4.4/src/zabbix_server/Makefile.am 2017-12-14 13:26:08.000000000 +0100
-@@ -51,7 +51,6 @@
-       selfmon/libzbxselfmon.a \
-       vmware/libzbxvmware.a \
-       taskmanager/libzbxtaskmanager.a \
--      ipmi/libipmi.a \
-       scripts/libzbxscripts.a \
-       preprocessor/libpreprocessor.a \
-       $(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
-@@ -75,6 +74,7 @@
-       $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
-       $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
-       $(top_srcdir)/src/libs/zbxipcservice/libzbxipcservice.a \
-+      ipmi/libipmi.a \
-       $(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
-       $(top_srcdir)/src/libs/zbxicmpping/libzbxicmpping.a \
-       $(top_srcdir)/src/libs/zbxdbupgrade/libzbxdbupgrade.a \

diff --git a/zabbix.spec b/zabbix.spec
index 01d3a493aa48811ca5e0ae46201700607bccb375..c123963ac495cc6ae34a975b98a037b20c0ec436 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -7,7 +7,7 @@
 %bcond_without mysql   # enable MySQL support
 %bcond_without java    # disable java support
 
-%define databases %{?with_pgsql:postgresql} %{?with_mysql:mysql} %{?with_sqlite3:sqlite3}
+%define databases %{?with_sqlite3:sqlite3} %{?with_pgsql:postgresql} %{?with_mysql:mysql}
 %define any_database %{with pgsql}%{with mysql}%{with sqlite3}
 
 %define                php_min_version 5.4.0
@@ -28,7 +28,7 @@ Source5:      %{name}_java.service
 Source6:       %{name}.tmpfiles
 Patch0:                config.patch
 Patch1:                sqlite3_dbname.patch
-Patch2:                sqlite3_dbname.patch
+Patch2:                always_compile_ipc.patch
 URL:           http://zabbix.sourceforge.net/
 BuildRequires: OpenIPMI-devel
 BuildRequires: curl-devel
@@ -317,9 +317,14 @@ cp -a include/config.h include/config.h.old
 cp -a include/stamp-h1 include/stamp-h1.old
 
 for database in %{databases} ; do
+       if [ "$database" = "sqlite3" ] ; then
+               enable_server=""
+       else
+               enable_server="--enable-server"
+       fi
        configure \
                --with-$database \
-               --enable-server \
+               $enable_server \
                --enable-proxy
 
        # restore timestamps
@@ -335,19 +340,22 @@ for database in %{databases} ; do
 
        %{__make}
 
-       %{__make} install \
-               -C src/zabbix_server \
-               DESTDIR=$PWD/install-${database}
+       if [ "$enable_server" ] ; then
+               %{__make} install \
+                       -C src/zabbix_server \
+                       DESTDIR=$PWD/install-${database}
+
+               # prepare dirs for %%doc
+               for dir in upgrades/dbpatches/* ; do
+                       [ -d $dir/${database} ] || continue
+                       mkdir -p install-${database}/upgrade/$(basename $dir)
+                       cp -a $dir/${databases}/* install-${database}/upgrade/$(basename $dir)
+               done
+       fi
+
        %{__make} install \
                -C src/zabbix_proxy \
                DESTDIR=$PWD/install-${database}
-
-       # prepare dirs for %%doc
-       for dir in upgrades/dbpatches/* ; do
-               [ -d $dir/${database} ] || continue
-               mkdir -p install-${database}/upgrade/$(basename $dir)
-               cp -a $dir/${databases}/* install-${database}/upgrade/$(basename $dir)
-       done
 done
 
 %install
@@ -360,8 +368,10 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/webapps/%{_webapp},%{_appdir}} \
        ZJG_DEST=$RPM_BUILD_ROOT%{_datadir}/zabbix_java
 
 for database in %{databases} ; do
-       cp -p install-$database/%{_sbindir}/zabbix_server \
-               $RPM_BUILD_ROOT%{_sbindir}/zabbix_server-$database
+       if [ "$database" != "sqlite3" ] ; then
+               cp -p install-$database/%{_sbindir}/zabbix_server \
+                       $RPM_BUILD_ROOT%{_sbindir}/zabbix_server-$database
+       fi
        cp -p install-$database/%{_sbindir}/zabbix_proxy \
                $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy-$database
 done