X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=zabbix.spec;h=e461ec6161e0540871310410ade7288d9c12d07f;hb=27651193f88117b91aad1d08cf54f1067fef3e4f;hp=9d942f53cbcfa078b96d8df3700a6b979cbb6b22;hpb=5f17e289c4f690f81bd7f780a4750b3a9fec7b10;p=packages%2Fzabbix.git

diff --git a/zabbix.spec b/zabbix.spec
index 9d942f5..e461ec6 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -14,14 +14,16 @@
 Summary:	Zabbix - network monitoring software
 Summary(pl.UTF-8):	Zabbix - oprogramowanie do monitorowania sieci
 Name:		zabbix
-Version:	5.0.7
-Release:	0.1
+Version:	6.0.2
+Release:	1
 License:	GPL v2+
 Group:		Networking/Utilities
-Source0:	https://cdn.zabbix.com/zabbix/sources/stable/5.0/%{name}-%{version}.tar.gz
-# Source0-md5:	e0798bb1b53ab7b451556dc34c3b1827
+Source0:	https://cdn.zabbix.com/zabbix/sources/stable/6.0/%{name}-%{version}.tar.gz
+# Source0-md5:	0f4e73d44b01374a65f18bfe521a3ee8
 Source1:	%{name}-apache.conf
 Source2:	%{name}_agentd.init
+Source3:	%{name}_server.init
+Source4:	%{name}_proxy.init
 Patch0:		tld.patch
 Patch1:		sqlite3_dbname.patch
 Patch2:		always_compile_ipc.patch
@@ -46,9 +48,14 @@ BuildRequires:	rpmbuild(macros) >= 1.671
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
 BuildRequires:	unixODBC-devel
 BuildRequires:	zlib-devel
-Requires:	%{name}-agentd = %{version}-%{release}
-Requires:	%{name}-web = %{version}-%{release}
-Requires:	%{name}-server = %{version}-%{release}
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Provides:	group(zabbix)
+Provides:	user(zabbix)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/%{name}
@@ -78,30 +85,11 @@ oferuje świetne raportowanie i funkcje wizualizacji. Wspiera zarówno
 odpytywanie jak i pułapkowanie. Dostęp do wszystkich raportów i
 statystyk Zabbixa jest możliwy poprzez interfejs oparty o WWW.
 
-%package common
-Summary:	Common files for Zabbix monitoring software
-Summary(pl.UTF-8):	Wspólne pliki dla oprogramowania monitorującego Zabbix
-Group:		Networking/Utilities
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
-Provides:	group(zabbix)
-Provides:	user(zabbix)
-
-%description common
-Common files for Zabbix monitoring software.
-
-%description common -l pl.UTF-8
-Wspólne pliki dla oprogramowania monitorującego Zabbix.
-
 %package agentd
 Summary:	Zabbix Agent
 Summary(pl.UTF-8):	Agenta Zabbixa
 Group:		Networking/Utilities
-Requires:	%{name}-common = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	zabbix-agent-inetd
 Obsoletes:	zabbix-agent-standalone
 Requires(post,preun):	/sbin/chkconfig
@@ -151,7 +139,7 @@ Ten pakiet dostarcza napisany w PHP frontend dla Zabbixa.
 Summary:	Zabbix proxy
 Summary(pl.UTF-8):	Proxy do Zabbixa
 Group:		Networking/Utilities
-Requires:	%{name}-common = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	zabbix-proxy(db) = %{version}-%{release}
 
 %description proxy
@@ -206,7 +194,7 @@ Ten pakiet zawiera proxy Zabbix z obsługą SQLite 3.
 Summary:	Zabbix server
 Summary(pl.UTF-8):	Serwer Zabbixa
 Group:		Networking/Utilities
-Requires:	%{name}-common = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-server(db) = %{version}-%{release}
 Obsoletes:	zabbix-suckerd
 Obsoletes:	zabbix-trapper-inetd
@@ -251,7 +239,7 @@ Ten pakiet zawiera serwer Zabbixa z obsługą bazy danych PostgreSQL.
 %package java
 Summary:	Zabbix Java Gateway
 Group:		Networking/Utilities
-Requires:	%{name}-common = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description java
 This package provides the Zabbix Java Gateway.
@@ -346,6 +334,8 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 
 install	%{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/zabbix_agentd
+install	%{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/zabbix_server
+install	%{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/zabbix_proxy
 
 mv $RPM_BUILD_ROOT%{_appdir}/ui/conf $RPM_BUILD_ROOT%{_sysconfdir}/web
 ln -s %{_sysconfdir}/web $RPM_BUILD_ROOT%{_appdir}/ui/conf
@@ -381,12 +371,12 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun web -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%pre common
+%pre
 %groupadd -g 111 zabbix
 %useradd -d / -u 111 -g zabbix -c "Zabbix User" -s /bin/false zabbix
 %addusertogroup -q zabbix proc
 
-%postun common
+%postun
 if [ "$1" = "0" ]; then
 	%userremove zabbix
 	%groupremove zabbix
@@ -398,6 +388,7 @@ if [ "$1" = 1 ]; then
 	You should create database for Zabbix.
 
 	Running these should be fine in most cases:
+
 	mysqladmin create zabbix
 	zcat %{_docdir}/%{name}-server-mysql-%{version}/schema.sql.gz | mysql zabbix
 	zcat %{_docdir}/%{name}-server-mysql-%{version}/images.sql.gz | mysql zabbix
@@ -413,16 +404,24 @@ if [ "$1" = 1 ]; then
 
 	Running these should be fine in most cases:
 
-	createuser zabbix
-	createdb -O zabbix zabbix
-	zcat %{_docdir}/%{name}-server-postgresql-%{version}/schema.sql.gz | psql -u zabbix zabbix
-	zcat %{_docdir}/%{name}-server-postgresql-%{version}/images.sql.gz | psql -u zabbix zabbix
-	zcat %{_docdir}/%{name}-server-postgresql-%{version}/data.sql.gz | psql -u zabbix zabbix
+	createuser -U postgres zabbix
+	createdb -U postgres -O zabbix zabbix
+	zcat %{_docdir}/%{name}-server-postgresql-%{version}/schema.sql.gz | psql -U zabbix zabbix
+	zcat %{_docdir}/%{name}-server-postgresql-%{version}/images.sql.gz | psql -U zabbix zabbix
+	zcat %{_docdir}/%{name}-server-postgresql-%{version}/data.sql.gz | psql -U zabbix zabbix
 EOF
 fi
 ln -sf %{_sbindir}/zabbix_server-postgresql %{_sbindir}/zabbix_server || :
 
+%post server
+/sbin/chkconfig --add zabbix_server
+%service zabbix_server restart
+
 %postun server
+if [ "$1" = "0" ]; then
+	%service -q zabbix_server stop
+	/sbin/chkconfig --del zabbix_server
+fi
 if [ "$1" = "0" ]; then
 	if [ -L %{_sbindir}/zabbix_server ] ; then
 		rm -f %{_sbindir}/zabbix_server || :
@@ -448,11 +447,22 @@ ln -sf %{_sbindir}/zabbix_proxy-postgresql %{_sbindir}/zabbix_proxy || :
 %post proxy-sqlite3
 ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 
-%files
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%post proxy
+/sbin/chkconfig --add zabbix_server
+%service zabbix_server restart
+
+%postun proxy
+if [ "$1" = "0" ]; then
+	%service -q zabbix_proxy stop
+	/sbin/chkconfig --del zabbix_proxy
+fi
+if [ "$1" = "0" ]; then
+	if [ -L %{_sbindir}/zabbix_proxy ] ; then
+		rm -f %{_sbindir}/zabbix_proxy || :
+	fi
+fi
 
-%files common
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/zabbix_get
@@ -491,6 +501,7 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 %defattr(644,root,root,755)
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_proxy.conf
 %dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_proxy.conf.d
+%attr(754,root,root) /etc/rc.d/init.d/zabbix_proxy
 %ghost %attr(755,root,root) %{_sbindir}/zabbix_proxy
 %{_mandir}/man8/zabbix_proxy*
 %endif
@@ -519,6 +530,7 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 %defattr(644,root,root,755)
 %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
+%attr(754,root,root) /etc/rc.d/init.d/zabbix_server
 %ghost %attr(755,root,root) %{_sbindir}/zabbix_server
 %{_mandir}/man8/zabbix_server*
 %endif