From: Marcin Krol Date: Mon, 4 Jan 2021 16:33:15 +0000 (+0100) Subject: - drop zabbix-common package, moved to zabbix X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=77c79d1b031260c94bc6a6ce8de70de8719b401d;p=packages%2Fzabbix.git - drop zabbix-common package, moved to zabbix --- diff --git a/zabbix.spec b/zabbix.spec index 9d942f5..57ef7b0 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -46,9 +46,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 +83,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 +137,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 +192,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 +237,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. @@ -381,12 +367,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 @@ -451,10 +437,6 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || : %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog README - -%files common -%defattr(644,root,root,755) -%doc AUTHORS ChangeLog README %attr(755,root,root) %{_bindir}/zabbix_get %attr(755,root,root) %{_bindir}/zabbix_js %attr(755,root,root) %{_bindir}/zabbix_sender