[arch-commits] Commit in zabbix/trunk (PKGBUILD remove-tests.patch)

[Bartłomiej Piotrowski]

    Date: Wednesday, November 28, 2018 @ 10:06:41
  Author: bpiotrowski
Revision: 340540

4.0.2-1

Modified:
  zabbix/trunk/PKGBUILD
Deleted:
  zabbix/trunk/remove-tests.patch

--------------------+
 PKGBUILD           |   13 ++++---------
 remove-tests.patch |   29 -----------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-28 09:49:25 UTC (rev 340539)
+++ PKGBUILD	2018-11-28 10:06:41 UTC (rev 340540)
@@ -3,7 +3,7 @@
 
 pkgbase=zabbix
 pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
-pkgver=4.0.1
+pkgver=4.0.2
 pkgrel=1
 arch=(x86_64)
 url='https://www.zabbix.com/'
@@ -10,13 +10,11 @@
 license=(GPL)
 makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmariadbclient libldap libevent)
 source=(https://downloads.sourceforge.net/sourceforge/zabbix/zabbix-${pkgver}.tar.gz
-		remove-tests.patch
         zabbix-agent.{service,sysusers,tmpfiles}
-	zabbix-server{-mysql,-pgsql}.service zabbix-server.{sysusers,tmpfiles}
-	zabbix-proxy{-sqlite,-mysql,-pgsql}.service zabbix-proxy.{sysusers,tmpfiles})
+        zabbix-server{-mysql,-pgsql}.service zabbix-server.{sysusers,tmpfiles}
+        zabbix-proxy{-sqlite,-mysql,-pgsql}.service zabbix-proxy.{sysusers,tmpfiles})
 
-sha512sums=('431cb75c62c64e0907cccad6633fe07a66fbaaf8595ca33add6de98a3f79832dd87c23ddaffada796a67055cbdef6d2e5d9c6427498518080205d5ddcd5fbdca'
-            '259872d1cf2bea21a00ead981aa595ca9df64bd3698ec0cf257d812862b9ccab58b9e06f53ed2dacc7eb10260aa878edf593ba3e2425347b7d221dddf2134b64'
+sha512sums=('40b8dd0a4ca9fd7214c7afab57517437097eaf49c943f8827fa637bffb7cc45e77568f002e18cf3fa61a50d5d24fe26520109ad1c6f0424b51325453c9fd0c76'
             '8c1fa2676bc0ef91bc39ec5f97b4d3ba5c365d063420455a3785121a54e120bc5afeacde42a48f4509c115f940dcc3b6c2f43044a7fbfb421182fc93b22a2444'
             '3ab3ac1acc7e35c8896157aef601ebc30815237ac5252cbd0c1ecb26eeaf9eccf5c49938ae8c85bb79a6f95f607f082f6b80ed660829599ec03aa626cca6d3dc'
             'ca6b4779de23829dfdd80ee21e924fbe4e2754f4e693bed4b1a2aa846cd87d150e399b1169d7fe58d30c50ed837c1b8254e580de420267d0a1834d6dc409c43d'
@@ -37,9 +35,6 @@
     -e 's/# LogType=file/LogType=system/' \
     conf/zabbix_{agentd,proxy,server}.conf
 
-  # remove tests from configure.ac because that part makes automake fail
-  patch -p1 -i "$srcdir/remove-tests.patch"
-
   autoreconf -fi
 }
 

Deleted: remove-tests.patch
===================================================================
--- remove-tests.patch	2018-11-28 09:49:25 UTC (rev 340539)
+++ remove-tests.patch	2018-11-28 10:06:41 UTC (rev 340540)
@@ -1,29 +0,0 @@
-diff -Nur zabbix-4.0.0-orig/configure.ac zabbix-4.0.0/configure.ac
---- zabbix-4.0.0-orig/configure.ac	2018-10-01 10:36:02.000000000 +0200
-+++ zabbix-4.0.0/configure.ac	2018-10-02 11:44:59.818887035 +0200
-@@ -1714,25 +1714,6 @@
- dnl *                                                               *
- dnl *****************************************************************
- 
--if test -d tests; then
--	AC_CONFIG_FILES(
--	tests/Makefile
--	tests/libs/Makefile
--	tests/libs/zbxcommon/Makefile
--	tests/libs/zbxconf/Makefile
--	tests/libs/zbxdbcache/Makefile
--	tests/libs/zbxdbhigh/Makefile
--	tests/libs/zbxhistory/Makefile
--	tests/libs/zbxjson/Makefile
--	tests/libs/zbxsysinfo/Makefile
--	tests/libs/zbxsysinfo/linux/Makefile
--	tests/libs/zbxsysinfo/common/Makefile
--	tests/libs/zbxcommshigh/Makefile
--	tests/libs/zbxalgo/Makefile
--	)
--	AC_DEFINE([HAVE_TESTS], [1], ["Define to 1 if tests directory is present"])
--fi
--
- AC_OUTPUT([
- 	Makefile
- 	database/Makefile