- release 4 (by relup.sh)

[packages/zabbix.git] / zabbix.spec

diff --git a/zabbix.spec b/zabbix.spec
index 44c7cd96738b6aa7492b716330bd9c27f762457e..3b93e1d6d02f15dd69a855c38a4ca27afda3e188 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -14,12 +14,12 @@
 Summary:       Zabbix - network monitoring software
 Summary(pl.UTF-8):     Zabbix - oprogramowanie do monitorowania sieci
 Name:          zabbix
-Version:       3.4.5
-Release:       2
+Version:       4.2.0
+Release:       4
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/zabbix/%{name}-%{version}.tar.gz
-# Source0-md5: 954dd640973e476a619d0665553a3207
+# Source0-md5: 20f261708f95787f3dbea3eab89f804d
 Source1:       %{name}-apache.conf
 Source2:       %{name}_server.service
 Source3:       %{name}_agentd.service
@@ -50,6 +50,7 @@ BuildRequires:        pcre-devel
 BuildRequires: rpmbuild(macros) >= 1.671
 %{?with_sqlite3:BuildRequires: sqlite3-devel}
 BuildRequires: unixODBC-devel
+BuildRequires: zlib-devel
 Requires:      %{name}-agentd = %{version}-%{release}
 Requires:      %{name}-frontend-php = %{version}-%{release}
 Requires:      %{name}-server = %{version}-%{release}
@@ -323,10 +324,6 @@ configure \
 
 %{__make}
 
-# keep timestamps to prevent unneccessary rebuilds
-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=""
@@ -338,30 +335,12 @@ for database in %{databases} ; do
                $enable_server \
                --enable-proxy
 
-       # restore timestamps
-       touch --reference=include/config.h.old include/config.h
-       touch --reference=include/stamp-h1.old include/stamp-h1
-
-       # clean what needs rebuilding
-       for dir in src/libs/zbxdb* src/libs/zbxserver ; do
-               %{__make} -C $dir clean
-       done
-
-       touch include/zbxdb.h
-
        %{__make}
 
        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 \
@@ -372,7 +351,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/rc.d/init.d,/etc/webapps/%{_webapp},%{_appdir}} \
-       $RPM_BUILD_ROOT{/run/zabbix,/var/log/zabbix,%{systemdunitdir},%{systemdtmpfilesdir}}
+       $RPM_BUILD_ROOT{/var/run/zabbix,/var/log/zabbix,%{systemdunitdir},%{systemdtmpfilesdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -558,7 +537,7 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 %attr(751,root,http) %dir %{_sysconfdir}/frontend
 %dir %{_appdir}
 %dir %{_appdir}/frontends
-%dir %attr(770,root,zabbix) /run/zabbix
+%dir %attr(770,root,zabbix) /var/run/zabbix
 %dir %attr(775,root,zabbix) /var/log/zabbix
 %{systemdtmpfilesdir}/zabbix.conf
 
@@ -624,7 +603,6 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 %if %{any_database}
 %files server
 %defattr(644,root,root,755)
-%doc upgrades/dbpatches
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_server.conf
 %dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_server.conf.d
 %ghost %attr(755,root,root) %{_sbindir}/zabbix_server
@@ -635,14 +613,14 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 %if %{with mysql}
 %files server-mysql
 %defattr(644,root,root,755)
-%doc database/mysql/*.sql install-mysql/upgrade
+%doc database/mysql/*.sql
 %attr(755,root,root) %{_sbindir}/zabbix_server-mysql
 %endif
 
 %if %{with pgsql}
 %files server-postgresql
 %defattr(644,root,root,755)
-%doc database/postgresql/*.sql install-postgresql/upgrade
+%doc database/postgresql/*.sql
 %attr(755,root,root) %{_sbindir}/zabbix_server-postgresql
 %endif