Hello community, here is the log from the commit of package zabbix for openSUSE:Factory checked in at 2019-03-24 15:00:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zabbix (Old) and /work/SRC/openSUSE:Factory/.zabbix.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zabbix" Sun Mar 24 15:00:42 2019 rev:3 rq:687729 version:3.0.25 Changes: -------- --- /work/SRC/openSUSE:Factory/zabbix/zabbix.changes 2019-02-01 11:46:14.320503603 +0100 +++ /work/SRC/openSUSE:Factory/.zabbix.new.25356/zabbix.changes 2019-03-24 15:00:46.771173301 +0100 @@ -1,0 +2,6 @@ +Fri Mar 22 12:59:58 UTC 2019 - Boris Manojlovic <bo...@steki.net> + +- added patch zabbix-3.0.25-new-m4-pgsql.patch to mitigate postgresql-devel separation into + devel and server-devel packages in openSUSE:Factory + +------------------------------------------------------------------- New: ---- zabbix-3.0.25-new-m4-pgsql.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zabbix.spec ++++++ --- /var/tmp/diff_new_pack.zQmsKa/_old 2019-03-24 15:00:48.127173128 +0100 +++ /var/tmp/diff_new_pack.zQmsKa/_new 2019-03-24 15:00:48.139173126 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -106,6 +106,9 @@ Source19: https://github.com/zabbix/zabbix-bash-completion/archive/%{bcversion}/zabbix-bash-completion-%{bcversion}.tar.gz # PATCH-FIX-UPSTREAM zabbix-3.0.20-jsLoader-fix.patch bnc#1105278 Patch0: zabbix-3.0.20-jsLoader-fix.patch +# PATCH-FIX-UPSTREAM zabbix-3.0.25-new-m4-pgsql.patch fix for opensuse issue caused/solved by bnc#1120035 +Patch1: zabbix-3.0.25-new-m4-pgsql.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?_with_openipmi:1} @@ -313,6 +316,10 @@ %prep %setup -q -n zabbix-%{version}%{?rclevel} -a 19 %patch0 +# as SLE 11 is "too old" we do not patch it with postgresql separation logic... +%if 0%{?suse_version} > 1110 +%patch1 +%endif cp %{S:6} . # fix source & config files to respect adapted names for file in src/zabbix_java/settings.sh src/zabbix_java/lib/logback.xml %{SOURCE17} conf/*.conf misc/init.d/suse/*/zabbix_* src/zabbix_server/server.c \ @@ -381,7 +388,7 @@ %build # autoreconf not needed anymore -#autoreconf -i +autoreconf -i ZABBIX_BASIC_CONFIG="%{expand:%{basic_configuration}} %{?_with_openipmi} %{?_with_java} %{?_with_ipv6} %{?_with_ssh2} %{?_with_ldap} %{?_with_odbc}" ZABBIX_BASIC_CONFIG="$ZABBIX_BASIC_CONFIG %{?_with_libcurl} %{?_with_openipmi} %{?_with_net_snmp} %{?_with_libxml2} %{?_with_openssl}" @@ -396,7 +403,7 @@ CFLAGS="%optflags" export CFLAGS -%configure $ZABBIX_BASIC_CONFIG --with-mysql +%configure $ZABBIX_BASIC_CONFIG --with-mysql --without-postgresql make %{?_smp_mflags} JAVAC="$JAVAC" cp src/zabbix_server/zabbix_server zabbix-server-mysql cp src/zabbix_proxy/zabbix_proxy zabbix-proxy-mysql @@ -410,7 +417,7 @@ # build SQLite binaries make clean -%configure $ZABBIX_BASIC_CONFIG --with-sqlite3 +%configure $ZABBIX_BASIC_CONFIG --with-sqlite3 --without-postgresql make %{?_smp_mflags} JAVAC="$JAVAC" cp src/zabbix_server/zabbix_server zabbix-server-sqlite cp src/zabbix_proxy/zabbix_proxy zabbix-proxy-sqlite ++++++ zabbix-3.0.25-new-m4-pgsql.patch ++++++ ++++ 614 lines (skipped)
