commit a117af490624df3ecc74c788d99b5e02b1de639b Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sun Oct 9 21:30:59 2016 +0200
- updated to 3.1.0 - added vardir patch (fix /var/lib/prelude-correlator layout) prelude-correlator-vardir.patch | 11 +++++++++++ prelude-correlator.spec | 20 ++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) --- diff --git a/prelude-correlator.spec b/prelude-correlator.spec index 1048aa5..0f9334a 100644 --- a/prelude-correlator.spec +++ b/prelude-correlator.spec @@ -2,17 +2,19 @@ Summary: Real time correlator of events received by Prelude Manager Summary(pl.UTF-8): Narzędzie kojarzące w czasie rzeczywistym zdarzenia odebrane przez Prelude Managera Name: prelude-correlator -Version: 1.2.6 +Version: 3.1.0 Release: 1 License: GPL v2+ Group: Applications/Networking #Source0Download: https://www.prelude-siem.org/projects/prelude/files -Source0: https://www.prelude-siem.org/attachments/download/409/%{name}-%{version}.tar.gz -# Source0-md5: ecb926178aafd3a7616f27a66b1c941d +Source0: https://www.prelude-siem.org/attachments/download/723/%{name}-%{version}.tar.gz +# Source0-md5: 9fe16a969afdb3ffbd682827547bcf66 Source1: %{name}.init +Patch0: %{name}-vardir.patch URL: https://www.prelude-siem.org/ BuildRequires: python-devel BuildRequires: python-setuptools >= 0.6-2.c11 +BuildRequires: rpmbuild(macros) >= 1.714 Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -40,13 +42,15 @@ określają potencjalną informację o celu poprzez zbiór reguł korelacji. %prep %setup -q +%patch0 -p1 + +%build +%py_build %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install \ - -O1 \ - --root=$RPM_BUILD_ROOT +%py_install install -d $RPM_BUILD_ROOT/etc/rc.d/init.d install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} @@ -69,6 +73,10 @@ fi %doc AUTHORS NEWS README %attr(700,root,root) %dir %{_sysconfdir}/%{name} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf +%dir %{_sysconfdir}/%{name}/conf.d +%dir %{_sysconfdir}/%{name}/rules +%dir %{_sysconfdir}/%{name}/rules/python +%{_sysconfdir}/%{name}/rules/python/*.py %attr(754,root,root) /etc/rc.d/init.d/%{name} %attr(755,root,root) %{_bindir}/%{name} %dir %{_var}/lib/%{name} diff --git a/prelude-correlator-vardir.patch b/prelude-correlator-vardir.patch new file mode 100644 index 0000000..83426ee --- /dev/null +++ b/prelude-correlator-vardir.patch @@ -0,0 +1,11 @@ +--- prelude-correlator-3.1.0/setup.py.orig 2016-09-15 08:49:24.000000000 +0200 ++++ prelude-correlator-3.1.0/setup.py 2016-10-09 21:20:48.087202251 +0200 +@@ -149,7 +149,7 @@ + ("etc/prelude-correlator", ["prelude-correlator.conf"]), + ("etc/prelude-correlator/conf.d", ['data/conf.d/README']), + ("etc/prelude-correlator/rules/python", [os.path.join('rules',x) for x in os.listdir('rules') if x.endswith('.py')]), +- ("var/lib/prelude-correlator/prelude-correlator", [os.path.join('rules',x) for x in os.listdir('rules') if x.endswith('.dat')]) ++ ("var/lib/prelude-correlator", [os.path.join('rules',x) for x in os.listdir('rules') if x.endswith('.dat')]) + ], + + install_requires=["prelude >= 3.1.0"], ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/prelude-correlator.git/commitdiff/a117af490624df3ecc74c788d99b5e02b1de639b _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit