diff --git a/prelude-manager.changes b/prelude-manager.changes index 8d8da4c..bbdc6a6 100644 --- a/prelude-manager.changes +++ b/prelude-manager.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 4 21:57:53 UTC 2016 - thomas.andrejak@gmail.com + +- Remove Selinux since it should be directly in Security:SELinux +- Fix declaration of "%dir %{_datadir}/%{name}" two times + ------------------------------------------------------------------- Sun Aug 28 13:10:14 UTC 2016 - jengelh@inai.de diff --git a/prelude-manager.spec b/prelude-manager.spec index eab542f..9653c20 100644 --- a/prelude-manager.spec +++ b/prelude-manager.spec @@ -15,9 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define POLICYCOREUTILSVER 2.0.78-1 -%define SELINUXTARGETEDVER 3.7.19-279 - Name: prelude-manager Version: 3.0.0 Release: 0 @@ -79,51 +76,18 @@ Requires: %{name} = %{version}-%{release} %description smtp-plugin This plugin adds alerting by email capabilities to prelude-manager -%package selinux -Summary: SELinux policy for prelude-manager -Provides: selinux-policy-base -Group: System/Base -BuildRequires: checkpolicy -BuildRequires: policycoreutils >= %{POLICYCOREUTILSVER} -BuildRequires: bzip2 -BuildRequires: selinux-policy-devel -BuildRequires: selinux-policy -Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} -Requires(pre): coreutils -Requires(pre): selinux-policy-targeted >= %{SELINUXTARGETEDVER} -Requires: selinux-policy-targeted >= %{SELINUXTARGETEDVER} -Requires: %{name} = %{version}-%{release} -Requires(post): policycoreutils >= %{POLICYCOREUTILSVER} -Requires(postun): policycoreutils >= %{POLICYCOREUTILSVER} -BuildArch: noarch - -%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 -establishes the priorities of treatment according to the -critical character and the source of the alerts. - %prep %setup -q %patch0 -p0 %build %configure --with-libwrap - make %{?_smp_mflags} -cd $RPM_BUILD_DIR/%{name}-%{version}/selinux/ -make - %install mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} mkdir -p %{buildroot}/%{_localstatedir}/spool/prelude/%{name}/ -mkdir -p %{buildroot}/%{_datadir}/selinux/targeted/ make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" -install -m 644 $RPM_BUILD_DIR/%{name}-%{version}/selinux/%{name}.pp.bz2 \ - %{buildroot}/%{_datadir}/selinux/targeted/ rm -f %{buildroot}/%{_libdir}/%{name}/reports/*.la rm -f %{buildroot}/%{_libdir}/%{name}/filters/*.la rm -f %{buildroot}/%{_libdir}/%{name}/decodes/*.la @@ -143,15 +107,6 @@ install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service /usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf %service_add_post %{name}.service -%post selinux -if [ $1 -eq 1 ]; then - /usr/sbin/semodule -s targeted -i %{_datadir}/selinux/targeted/%{name}.pp.bz2 - /sbin/restorecon -R /dev/shm/ || : -else - /usr/sbin/semodule -n -s targeted -r %{name} 2>/dev/null || : - /usr/sbin/semodule -s targeted -i %{_datadir}/selinux/targeted/%{name}.pp.bz2 -fi - %preun %service_del_preun %{name}.service @@ -159,10 +114,6 @@ fi /sbin/ldconfig %service_del_postun %{name}.service -%postun selinux -semodule -n -s targeted -r %{name} 2>/dev/null || : -/sbin/restorecon -R /dev/shm/ || : - %files %defattr(-,root,root,-) %doc COPYING @@ -197,7 +148,6 @@ semodule -n -s targeted -r %{name} 2>/dev/null || : %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/* @@ -212,10 +162,4 @@ semodule -n -s targeted -r %{name} 2>/dev/null || : %defattr(-,root,root,-) %{_includedir}/%{name}/ -%files selinux -%defattr(-,root,root) -%dir %{_datadir}/selinux -%dir %{_datadir}/selinux/targeted -%{_datadir}/selinux/targeted/%{name}.pp.bz2 - %changelog