[packages/prewikka] - update to 4.1.5 - updated localedir,install patches

[qboosh]

commit 9e12854bbb13932deb98996ddbe9c94093b66bd5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Aug 30 20:34:03 2018 +0200

    - update to 4.1.5
    - updated localedir,install patches

 prewikka-install.patch   | 14 +++++++-------
 prewikka-localedir.patch | 10 +++++-----
 prewikka.spec            | 21 ++++++++++++---------
 3 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/prewikka.spec b/prewikka.spec
index 29116b5..b500bac 100644
--- a/prewikka.spec
+++ b/prewikka.spec
@@ -2,29 +2,30 @@
 Summary:	Prelude IDS web application
 Summary(pl.UTF-8):	Aplikacja WWW dla Prelude IDS
 Name:		prewikka
-Version:	3.1.0
+Version:	4.1.5
 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/727/%{name}-%{version}.tar.gz
-# Source0-md5:	a7c721c3322558f8e94608cc3a12abb2
+Source0:	https://www.prelude-siem.org/attachments/download/837/%{name}-%{version}.tar.gz
+# Source0-md5:	f58d4c3069692cdd9eb3a82ceb997a2c
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-localedir.patch
 Patch1:		%{name}-install.patch
 URL:		https://www.prelude-siem.org/
 BuildRequires:	python >= 1:2.6
-BuildRequires:	python-cheetah
-BuildRequires:	python-lesscpy
 BuildRequires:	python-setuptools
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
-%pyrequires_eq	python-modules
+Requires:	python-Mako
+Requires:	python-PyYAML
 Requires:	python-babel
-Requires:	python-cheetah
-Requires:	python-libprelude >= 1.0.0
-Requires:	python-libpreludedb >= 1.0.0
+Requires:	python-libprelude >= 4.1.0
+Requires:	python-libpreludedb >= 4.1.0
+Requires:	python-modules >= 1:2.6
+Requires:	python-pytz
+Requires:	python-werkzeug
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -126,8 +127,10 @@ fi
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING.* NEWS README
+%attr(755,root,root) %{_bindir}/prewikka-crontab
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/prewikka.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/menu.yml
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/prewikka.wsgi
 %{py_sitescriptdir}/prewikka
diff --git a/prewikka-install.patch b/prewikka-install.patch
index e0a29b5..397ee5b 100644
--- a/prewikka-install.patch
+++ b/prewikka-install.patch
@@ -1,6 +1,6 @@
---- prewikka-3.1.0/setup.py.orig	2016-09-15 08:49:49.000000000 +0200
-+++ prewikka-3.1.0/setup.py	2016-10-16 09:08:52.787464603 +0200
-@@ -184,7 +184,7 @@
+--- prewikka-4.1.5/setup.py.orig	2017-12-06 01:34:12.000000000 +0100
++++ prewikka-4.1.5/setup.py	2018-08-30 19:47:24.172882783 +0200
+@@ -58,7 +58,7 @@
  class my_install(install):
      def finalize_options(self):
          ### if no prefix is given, configuration should go to /etc or in {prefix}/etc otherwise
@@ -9,12 +9,12 @@
              self.conf_prefix = self.prefix + "/etc/prewikka"
              self.data_prefix = self.prefix + "/var/lib/prewikka"
          else:
-@@ -209,7 +209,7 @@
+@@ -83,7 +83,7 @@
          self.mkpath((self.root or "") + self.data_prefix)
  
      def init_siteconfig(self):
 -        config = open("prewikka/siteconfig.py", "w")
 +        config = open(os.path.join(self.build_lib, "prewikka/siteconfig.py"), "w")
-         print >> config, "conf_dir = '%s'" % os.path.abspath((self.conf_prefix))
-         print >> config, "data_dir = '%s'" % os.path.abspath(self.data_prefix)
-         print >> config, "libprelude_required_version = '%s'" % LIBPRELUDE_REQUIRED_VERSION
+         config.write("tmp_dir = '%s'\n" % (os.path.join(tempfile.gettempdir(), "prewikka")))
+         config.write("conf_dir = '%s'\n" % (os.path.abspath(self.conf_prefix)))
+         config.write("data_dir = '%s'\n" % (os.path.abspath(self.data_prefix)))
diff --git a/prewikka-localedir.patch b/prewikka-localedir.patch
index e8a00d7..67ae2fc 100644
--- a/prewikka-localedir.patch
+++ b/prewikka-localedir.patch
@@ -1,11 +1,11 @@
---- prewikka-3.1.0/prewikka/localization.py.orig	2016-09-15 08:49:49.000000000 +0200
-+++ prewikka-3.1.0/prewikka/localization.py	2016-10-16 08:28:51.410825370 +0200
-@@ -43,7 +43,7 @@
+--- prewikka-4.1.5/prewikka/localization.py.orig	2018-08-30 19:08:33.012909410 +0200
++++ prewikka-4.1.5/prewikka/localization.py	2018-08-30 19:46:24.479550140 +0200
+@@ -57,7 +57,7 @@
          self._catalogs_lock = Lock()
  
          self._domains_lock = Lock()
--        self._domains = utils.OrderedDict([("prewikka", pkg_resources.resource_filename(__name__, "locale"))])
-+        self._domains = utils.OrderedDict([("prewikka", "/usr/share/locale")])
+-        self._domains = collections.OrderedDict([("prewikka", pkg_resources.resource_filename(__name__, "locale"))])
++        self._domains = collections.OrderedDict([("prewikka", "/usr/share/locale")])
  
      def addDomain(self, domain, locale_dir):
          with self._domains_lock:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/prewikka.git/commitdiff/9e12854bbb13932deb98996ddbe9c94093b66bd5