From 276f8c37953a4fedebd2e4695cdf98f5af0c89bfa7f8f6ae28c0673ccabf2b6d Mon Sep 17 00:00:00 2001 From: Thomas ANDREJAK Date: Mon, 29 Aug 2016 18:38:37 +0000 Subject: [PATCH] Accepting request 423522 from home:jengelh:branches:server:monitoring - Re-set RPM groups to match SUSE categories - Ensure all directories are owned - Remove undesirable manual requires on shared libraries simplify '-n %{name}-' to '' OBS-URL: https://build.opensuse.org/request/show/423522 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/prelude-manager?expand=0&rev=3 --- prelude-manager.changes | 18 ++++++----- prelude-manager.spec | 67 +++++++++++++++++++++++------------------ 2 files changed, 48 insertions(+), 37 deletions(-) diff --git a/prelude-manager.changes b/prelude-manager.changes index bb551a0..8d8da4c 100644 --- a/prelude-manager.changes +++ b/prelude-manager.changes @@ -1,13 +1,17 @@ +------------------------------------------------------------------- +Sun Aug 28 13:10:14 UTC 2016 - jengelh@inai.de + +- Re-set RPM groups to match SUSE categories +- Ensure all directories are owned +- Remove undesirable manual requires on shared libraries + ------------------------------------------------------------------- Tue May 3 21:54:49 UTC 2016 - thomas.andrejak@gmail.com -Initial import - -Generate the plugins : +- Initial import +- Generate the plugins: * DB (database) * SMTP * XML - -Add systemd files because it is a daemon. - -Also package SELinux files. +- Add systemd files because it is a daemon. +- Also package SELinux files. diff --git a/prelude-manager.spec b/prelude-manager.spec index 6a15308..eab542f 100644 --- a/prelude-manager.spec +++ b/prelude-manager.spec @@ -34,58 +34,55 @@ BuildRequires: pkg-config BuildRequires: libprelude-devel BuildRequires: libpreludedb-devel BuildRequires: libxml2-devel -BuildRequires: libwrap0 BuildRequires: systemd BuildRequires: tcpd-devel -Requires: libprelude23 %{?systemd_requires} %description -Prelude-Manager is a high availability server that +Prelude Manager is a high availability server that accepts secured connections from distributed sensors and saves received events to a media specified by the user (database, log file, mail etc.). The server schedules and establishes the priorities of treatment according to the critical character and the source of the alerts. -%package -n %{name}-devel -Summary: Libraries, include files for Prelude-Manager -Group: Development/Libraries +%package devel +Summary: Libraries, include files for Prelude Manager +Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} Requires: libpreludedb-devel -%description -n %{name}-devel +%description devel Header files and libraries for prelude-manager development. -%package -n %{name}-db-plugin +%package db-plugin Summary: Database report plugin for Prelude Manager -Group: System Environment/Libraries +Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Requires: libpreludedb7 -%description -n %{name}-db-plugin +%description db-plugin This plugin allows prelude-manager to write to database. -%package -n %{name}-xml-plugin +%package xml-plugin Summary: XML report plugin for Prelude Manager -Group: System Environment/Libraries +Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description -n %{name}-xml-plugin +%description xml-plugin This plugin adds XML logging capabilities to prelude-manager. -%package -n %{name}-smtp-plugin +%package smtp-plugin Summary: SMTP alert plugin for Prelude Manager -Group: System Environment/Libraries +Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description -n %{name}-smtp-plugin +%description smtp-plugin This plugin adds alerting by email capabilities to prelude-manager -%package -n %{name}-selinux +%package selinux Summary: SELinux policy for prelude-manager Provides: selinux-policy-base -Group: System Environment/Base +Group: System/Base BuildRequires: checkpolicy BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER} BuildRequires: bzip2 @@ -100,8 +97,8 @@ Requires(post): policycoreutils >= %{POLICYCOREUTILSVER} Requires(postun): policycoreutils >= %{POLICYCOREUTILSVER} BuildArch: noarch -%description -n %{name}-selinux -Prelude-Manager is a high availability server that +%description selinux +Prelude Manager is a high availability server that accepts secured connections from distributed sensors and saves received events to a media specified by the user (database, log file, mail etc.). The server schedules and @@ -146,7 +143,7 @@ install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service /usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf %service_add_post %{name}.service -%post -n %{name}-selinux +%post selinux if [ $1 -eq 1 ]; then /usr/sbin/semodule -s targeted -i %{_datadir}/selinux/targeted/%{name}.pp.bz2 /sbin/restorecon -R /dev/shm/ || : @@ -162,7 +159,7 @@ fi /sbin/ldconfig %service_del_postun %{name}.service -%postun -n %{name}-selinux +%postun selinux semodule -n -s targeted -r %{name} 2>/dev/null || : /sbin/restorecon -R /dev/shm/ || : @@ -180,6 +177,7 @@ semodule -n -s targeted -r %{name} 2>/dev/null || : %{_libdir}/%{name}/reports/textmod.so %dir %{_libdir}/%{name}/decodes/ %{_libdir}/%{name}/decodes/*.so +%dir %{_localstatedir}/spool/prelude %attr(0750,-,-) %dir %{_localstatedir}/spool/prelude/%{name}/ %attr(0750,-,-) %dir %{_datadir}/%{name}/ %attr(0644,-,-) %{_mandir}/man1/%{name}.1.gz @@ -188,27 +186,36 @@ semodule -n -s targeted -r %{name} 2>/dev/null || : %{_tmpfilesdir}/%{name}.conf %{_unitdir}/%{name}.service -%files -n %{name}-db-plugin +%files db-plugin %defattr(-,root,root,-) +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/reports %{_libdir}/%{name}/reports/db.so -%files -n %{name}-xml-plugin +%files xml-plugin %defattr(-,root,root,-) +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/reports %{_libdir}/%{name}/reports/xmlmod.so +%dir %{_datadir}/%{name} %attr(0750,root,root) %dir %{_datadir}/%{name}/xmlmod/ %{_datadir}/%{name}/xmlmod/* -%files -n %{name}-smtp-plugin +%files smtp-plugin %defattr(-,root,root,-) %doc %attr(0644,root,root) plugins/reports/smtp/template.example +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/reports %{_libdir}/%{name}/reports/smtp.so -%files -n %{name}-devel +%files devel %defattr(-,root,root,-) -%dir %{_includedir}/%{name}/ -%{_includedir}/%{name}/* +%{_includedir}/%{name}/ -%files -n %{name}-selinux +%files selinux +%defattr(-,root,root) +%dir %{_datadir}/selinux +%dir %{_datadir}/selinux/targeted %{_datadir}/selinux/targeted/%{name}.pp.bz2 %changelog