From 8617be72aedc2790598f82b11ae71430f042e354 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Jan 27 2019 16:19:30 +0000 Subject: add patch2 (fix for french translation add patch3 to disable non-working check for polib --- diff --git a/.gitignore b/.gitignore index f02f8fc..b7a6bbf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /greenbone-security-assistant-6.0.11.tar.gz /greenbone-security-assistant-7.0.2.tar.gz /v7.0.3.tar.gz +/openvas-gsa-gsad_js-fr.patch +/openvas-gsa-polib.patch diff --git a/openvas-gsa-gsad_js-fr.patch b/openvas-gsa-gsad_js-fr.patch new file mode 100644 index 0000000..bac01dc --- /dev/null +++ b/openvas-gsa-gsad_js-fr.patch @@ -0,0 +1,11 @@ +--- gsa-7.0.3/src/po/gsad_js-fr.po.orig 2018-03-28 15:23:57.000000001 +0200 ++++ gsa-7.0.3/src/po/gsad_js-fr.po 2019-01-27 16:13:51.698570594 +0100 +@@ -427,7 +427,7 @@ + + #: /home/timo/openvas/src/proj1-trunk/gsa/src/html/classic/js/gsa_h_bar_chart.js:275 + msgid "
({{assets}} Host(s) with average severity {{severity}})" +-msgid "
({{assets}} Hôte(s) avec une moyenne de sévérité {{severity}})" ++msgstr "
({{assets}} Hôte(s) avec une moyenne de sévérité {{severity}})" + + #: /home/timo/openvas/src/proj1-trunk/gsa/src/html/classic/js/gsa_line_chart.js:79 + msgid "Loading line chart ..." diff --git a/openvas-gsa-polib.patch b/openvas-gsa-polib.patch new file mode 100644 index 0000000..409a15f --- /dev/null +++ b/openvas-gsa-polib.patch @@ -0,0 +1,21 @@ +--- gsa-7.0.3/src/po/CMakeLists.txt.orig 2018-03-28 15:23:57.000000001 +0200 ++++ gsa-7.0.3/src/po/CMakeLists.txt 2019-01-27 16:39:59.833430822 +0100 +@@ -67,7 +67,6 @@ + endmacro () + + if (GETTEXT_FOUND) +- if (PY_POLIB_FOUND) + MAKE_TRANSLATION (ar) + MAKE_TRANSLATION (de) + MAKE_TRANSLATION (fr) +@@ -156,10 +155,6 @@ + DEPENDS ${CMAKE_SOURCE_DIR}/src/html/classic/*.xsl + COMMENT "Creating translation template (.pot) file from XSLT") + +- else (PY_POLIB_FOUND) +- message (WARNING "Could not build translation files: Python interpreter or polib Python module not found.") +- endif (PY_POLIB_FOUND) +- + else (GETTEXT_FOUND) + message (WARNING "Could not build translation files: gettext not found.") + endif (GETTEXT_FOUND) diff --git a/openvas-gsa.spec b/openvas-gsa.spec index 6d71d41..acbf430 100644 --- a/openvas-gsa.spec +++ b/openvas-gsa.spec @@ -3,7 +3,7 @@ #Name not same as upstream package to match the naming convention of the OpenVAS suite Name: openvas-gsa Version: 7.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Greenbone Security Assistant (GSA) is GUI to the OpenVAS License: GPLv2+ @@ -22,7 +22,8 @@ Source1: %{name}.initd # Put certs to /etc/pki as suggested by http://fedoraproject.org/wiki/PackagingDrafts/Certificates # Not reported upstream as it is RedHat/Fedora specific Patch1: %{name}-pki.patch - +Patch2: %{name}-gsad_js-fr.patch +Patch3: %{name}-polib.patch BuildRequires: gcc BuildRequires: openvas-libraries-devel >= 7.0 @@ -35,7 +36,6 @@ BuildRequires: doxygen BuildRequires: xmltoman BuildRequires: gpgme-devel BuildRequires: gettext -BuildRequires: python3 BuildRequires: python3-polib Requires: logrotate @@ -63,6 +63,9 @@ from the OpenVAS infrastructure into presentable HTML. %prep %setup -q -n gsa-%{version} %patch1 -p1 -b .pki +%patch2 -p1 -b .syntax +%patch3 -p1 -b .polib + #Fix encoding issues iconv -f Windows-1250 -t utf-8 < CHANGES > CHANGES.utf8 touch -r CHANGES CHANGES.utf8 @@ -102,7 +105,7 @@ install -Dp -m 644 %{SOURCE4} %{buildroot}/%{_unitdir}/%{name}.service install -Dp -m 755 %{SOURCE1} %{buildroot}/%{_initddir}/%{name} %endif -#%find_lang gsad_xsl +%find_lang gsad_xsl %if 0%{?rhel} >= 7 || 0%{?fedora} > 15 %post @@ -136,8 +139,7 @@ fi %endif - -%files +%files -f gsad_xsl.lang %{!?_licensedir:%global license %%doc} %license COPYING %doc CHANGES README @@ -163,6 +165,10 @@ fi %changelog +* Sun Jan 27 2019 josef radinger - 7.0.3-4 +- add patch2 (fix for french translation +- add patch3 to disable non-working check for polib + * Fri Jan 18 2019 josef radinger - 7.0.3-3 - fresh build diff --git a/sources b/sources index bee1bca..0d9fce9 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (greenbone-security-assistant-7.0.2.tar.gz) = e3ccc8704845d8271a8628a19f7a79aea6c19f2cd52f4c69ee698b314c3b8de1099831394c8b474fa79fb1bba4dc5c42e88351edeca82e1c1b4f46f625f746ae SHA512 (v7.0.3.tar.gz) = 7e1c1ef939ba08dab3b78baf1aa9c110be2febfbed5d67eefe8110c60f5089a1af44bc26693657226f417c6bd516a4a656eb159dae2a78f878e1a1b6c222b117 +SHA512 (openvas-gsa-gsad_js-fr.patch) = 2c6c9426bba458abd95747a5e5a3c2457d2ae83951e277c3bf6dbadcb94ff8a905f7e94ba3471fd4e66d42154372fd4c589672590d32d3f7ea6ddb14ac8c9eb9 +SHA512 (openvas-gsa-polib.patch) = e44a6d7e31f987fe2eff8c0949a61f6015b8d09feafdb92b83d73db15baaa67215fbdfecbf7a2b766ced4ea06666236fcd1095e0e438d12b75a61b422652dd30