[packages/prewikka] - updated to 5.2.0, use python3

qboosh qboosh at pld-linux.org
Thu Sep 19 18:37:01 CEST 2024 

commit 1bd4c28f292512cb2374b5147265c4bf1ae0312e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 19 18:40:01 2024 +0200

    - updated to 5.2.0, use python3

 locale.patch             | 32 ++++++++++++++++----------------
 prewikka-install.patch   | 16 ++++++++--------
 prewikka-localedir.patch |  8 ++++----
 prewikka.spec            | 48 +++++++++++++++++++++++++++---------------------
 4 files changed, 55 insertions(+), 49 deletions(-)
---
diff --git a/prewikka.spec b/prewikka.spec
index 448818b..ddfed0f 100644
--- a/prewikka.spec
+++ b/prewikka.spec
@@ -2,32 +2,33 @@
 Summary:	Prelude IDS web application
 Summary(pl.UTF-8):	Aplikacja WWW dla Prelude IDS
 Name:		prewikka
-Version:	5.1.1
+Version:	5.2.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/1182/%{name}-%{version}.tar.gz
-# Source0-md5:	aa5f3621ec027211f8e4bb4474821562
+Source0:	https://www.prelude-siem.org/attachments/download/1400/%{name}-%{version}.tar.gz
+# Source0-md5:	e1102494dfa50c9df91d5db08ffe51af
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-localedir.patch
 Patch1:		%{name}-install.patch
 Patch2:		locale.patch
 URL:		https://www.prelude-siem.org/
-BuildRequires:	python >= 1:2.6
+# lesscpy script is used to build
 BuildRequires:	python-lesscpy
-BuildRequires:	python-setuptools
+BuildRequires:	python3 >= 1:3.2
+BuildRequires:	python3-setuptools
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
-Requires:	python-Mako
-Requires:	python-PyYAML
-Requires:	python-babel
-Requires:	python-libprelude >= 5.1.0
-Requires:	python-libpreludedb >= 5.1.0
-Requires:	python-modules >= 1:2.6
-Requires:	python-pytz
-Requires:	python-werkzeug
+Requires:	python3-Mako
+Requires:	python3-PyYAML
+Requires:	python3-babel
+Requires:	python3-libprelude >= 5.2.0
+Requires:	python3-libpreludedb >= 5.2.0
+Requires:	python3-modules >= 1:3.2
+Requires:	python3-pytz
+Requires:	python3-werkzeug
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,12 +71,12 @@ na porcie dostępnym dla użytkownika (>= 1024, domyślnie 8000).
 %patch2 -p1
 
 %build
-%py_build
+%py3_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%py_install
+%py3_install
 
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
@@ -85,7 +86,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install conf/prewikka.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 install -d $RPM_BUILD_ROOT%{_datadir}
-%{__mv} $RPM_BUILD_ROOT%{py_sitescriptdir}/prewikka/locale $RPM_BUILD_ROOT%{_datadir}
+%{__mv} $RPM_BUILD_ROOT%{py3_sitescriptdir}/prewikka/locale $RPM_BUILD_ROOT%{_datadir}
 
 %py_postclean
 
@@ -135,14 +136,19 @@ fi
 %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 %{_sysconfdir}/%{name}/conf.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/auth.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/external_app.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/logs.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/riskoverview.conf
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/prewikka.wsgi
-%{py_sitescriptdir}/prewikka
-%{py_sitescriptdir}/prewikka-%{version}-py*.egg-info
+%{_datadir}/%{name}/prewikka.wsgi
+%{py3_sitescriptdir}/prewikka
+%{py3_sitescriptdir}/prewikka-%{version}-py*.egg-info
 %attr(770,root,http) %dir /var/lib/prewikka
 
 %files httpd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/prewikka-httpd
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/prewikka
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/prewikka
diff --git a/locale.patch b/locale.patch
index 91b4612..43909a2 100644
--- a/locale.patch
+++ b/locale.patch
@@ -1,35 +1,35 @@
---- prewikka-5.1.1/prewikka/locale/es/LC_MESSAGES/prewikka.po~	2019-10-27 00:24:42.000000000 +0200
-+++ prewikka-5.1.1/prewikka/locale/es/LC_MESSAGES/prewikka.po	2020-06-01 10:39:54.068466316 +0200
-@@ -2134,7 +2134,7 @@
- #: prewikka/views/messagesummary/messagesummary.py:830
+--- prewikka-5.2.0/prewikka/locale/es/LC_MESSAGES/prewikka.po.orig	2024-09-19 18:20:07.107838973 +0200
++++ prewikka-5.2.0/prewikka/locale/es/LC_MESSAGES/prewikka.po	2024-09-19 18:21:27.200738406 +0200
+@@ -2391,7 +2391,7 @@ msgstr ""
+ #: prewikka/views/messagesummary/messagesummary.py:843
  #, fuzzy, python-format
  msgid "Target file %s"
 -msgstr "Destino"
 +msgstr "Destino %s"
  
- #: prewikka/views/messagesummary/messagesummary.py:830
+ #: prewikka/views/messagesummary/messagesummary.py:843
  msgid "category"
---- prewikka-5.1.1/prewikka/locale/pl/LC_MESSAGES/prewikka.po~	2019-10-27 00:24:42.000000000 +0200
-+++ prewikka-5.1.1/prewikka/locale/pl/LC_MESSAGES/prewikka.po	2020-06-01 10:41:12.101925267 +0200
-@@ -1899,7 +1899,7 @@
- #: prewikka/views/messagesummary/messagesummary.py:365
+--- prewikka-5.2.0/prewikka/locale/pl/LC_MESSAGES/prewikka.po.orig	2024-09-19 18:20:07.111172289 +0200
++++ prewikka-5.2.0/prewikka/locale/pl/LC_MESSAGES/prewikka.po	2024-09-19 18:21:49.987281628 +0200
+@@ -2160,7 +2160,7 @@ msgstr "Dane"
+ #: prewikka/views/messagesummary/messagesummary.py:372
  #, fuzzy, python-format
  msgid "(agent local time: %s)"
 -msgstr "sondy"
 +msgstr "(czas lokalny agenta %s)"
  
- #: prewikka/views/messagesummary/messagesummary.py:372
- #: prewikka/views/messagesummary/messagesummary.py:835
---- prewikka-5.1.1/prewikka/locale/pt_BR/LC_MESSAGES/prewikka.po~	2019-10-27 00:24:42.000000000 +0200
-+++ prewikka-5.1.1/prewikka/locale/pt_BR/LC_MESSAGES/prewikka.po	2020-06-01 10:41:41.815410744 +0200
-@@ -2140,7 +2140,7 @@
- #: prewikka/views/messagesummary/messagesummary.py:830
+ #: prewikka/views/messagesummary/messagesummary.py:379
+ #: prewikka/views/messagesummary/messagesummary.py:848
+--- prewikka-5.2.0/prewikka/locale/pt_BR/LC_MESSAGES/prewikka.po.orig	2024-09-19 18:20:07.114505604 +0200
++++ prewikka-5.2.0/prewikka/locale/pt_BR/LC_MESSAGES/prewikka.po	2024-09-19 18:22:10.120505890 +0200
+@@ -2395,7 +2395,7 @@ msgstr "C Dispositivo secundário"
+ #: prewikka/views/messagesummary/messagesummary.py:843
  #, fuzzy, python-format
  msgid "Target file %s"
 -msgstr "Alvo"
 +msgstr "Alvo %s"
  
- #: prewikka/views/messagesummary/messagesummary.py:830
+ #: prewikka/views/messagesummary/messagesummary.py:843
  msgid "category"
 --- prewikka-5.1.1/prewikka/locale/ru/LC_MESSAGES/prewikka.po~	2019-10-27 00:24:42.000000000 +0200
 +++ prewikka-5.1.1/prewikka/locale/ru/LC_MESSAGES/prewikka.po	2020-06-01 10:42:39.012350869 +0200
diff --git a/prewikka-install.patch b/prewikka-install.patch
index db0e5ba..e450a63 100644
--- a/prewikka-install.patch
+++ b/prewikka-install.patch
@@ -1,7 +1,7 @@
---- prewikka-5.1.1/setup.py.orig	2020-06-01 10:35:38.298198370 +0200
-+++ prewikka-5.1.1/setup.py	2020-06-01 10:38:08.975032903 +0200
-@@ -39,7 +39,7 @@
- LIBPRELUDEDB_REQUIRED_VERSION = "5.1.0"
+--- prewikka-5.2.0/setup.py.orig	2020-09-09 16:44:23.000000000 +0200
++++ prewikka-5.2.0/setup.py	2024-09-19 18:19:38.534660434 +0200
+@@ -39,7 +39,7 @@ LIBPRELUDE_REQUIRED_VERSION = "5.2.0"
+ LIBPRELUDEDB_REQUIRED_VERSION = "5.2.0"
  
  
 -def init_siteconfig(conf_prefix, data_prefix):
@@ -9,7 +9,7 @@
      """
      Initialize configuration file (prewikka/siteconfig.py).
  
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ def init_siteconfig(conf_prefix, data_pr
          ('libpreludedb_required_version', LIBPRELUDEDB_REQUIRED_VERSION),
      )
  
@@ -18,7 +18,7 @@
          for option, value in configuration:
              config_file.write("%s = '%s'\n" % (option, value))
  
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ class MyDistribution(Distribution):
  class my_install(install):
      def finalize_options(self):
          # if no prefix is given, configuration should go to /etc or in {prefix}/etc otherwise
@@ -27,7 +27,7 @@
              self.conf_prefix = self.prefix + "/etc/prewikka"
              self.data_prefix = self.prefix + "/var/lib/prewikka"
          else:
-@@ -110,7 +110,7 @@
+@@ -112,7 +112,7 @@ class my_install(install):
          self.install_conf()
          self.install_wsgi()
          self.create_datadir()
@@ -36,7 +36,7 @@
          install.run(self)
  
          os.chmod((self.root or "") + self.conf_prefix, 0o755)
-@@ -180,7 +180,7 @@
+@@ -182,7 +182,7 @@ class PrewikkaTest(TestCommand):
          self.test_suite = True
  
      def run_tests(self):
diff --git a/prewikka-localedir.patch b/prewikka-localedir.patch
index 67ae2fc..c9cd320 100644
--- a/prewikka-localedir.patch
+++ b/prewikka-localedir.patch
@@ -1,11 +1,11 @@
---- 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 @@
+--- prewikka-5.2.0/prewikka/localization.py.orig	2024-09-19 10:35:19.108921231 +0200
++++ prewikka-5.2.0/prewikka/localization.py	2024-09-19 18:18:41.388303356 +0200
+@@ -56,7 +56,7 @@ class TranslationProxy(object):
          self._catalogs_lock = Lock()
  
          self._domains_lock = Lock()
 -        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):
+     def add_domain(self, domain, locale_dir):
          with self._domains_lock:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/prewikka.git/commitdiff/1bd4c28f292512cb2374b5147265c4bf1ae0312e

More information about the pld-cvs-commit mailing list