diff options
Diffstat (limited to 'glpi.spec')
| -rw-r--r-- | glpi.spec | 19 |
1 files changed, 6 insertions, 13 deletions
@@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit 0cbfde346c5afd6b749a2dd893fd4c0fa3c49c74 +%global gh_commit 78c2f67b14007156ca9561d4ce0cc7d21089af27 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20160923 %global gh_owner glpi-project @@ -52,11 +52,10 @@ %endif Name: %{gh_project} -%global upstream_version 9.3.3 +%global upstream_version 9.3.4 #global upstream_prever RC2 -# use 9.3.0~RC2 < 9.3 (for plugin compatibility check) Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -76,12 +75,6 @@ Source6: %{name}-minify.php # Override PHP configuration for php-fpm Source7: %{name}-user.ini -# Security patches backported from 9.4 -# https://github.com/glpi-project/glpi/pull/5606 merged -Patch1: glpi-security1.patch -# Backports -Patch2: glpi-security2.patch - BuildArch: noarch BuildRequires: gettext BuildRequires: php-cli @@ -315,9 +308,6 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n %{name}-%{gh_commit} -%patch1 -p1 -b .secfix -%patch2 -p1 -b .secfix -find . -name \*.secfix -delete -print grep %{upstream_version} inc/define.php @@ -606,6 +596,9 @@ fi %changelog +* Thu Apr 11 2019 Remi Collet <remi@remirepo.net> - 9.3.4-1 +- update to 9.3.4 + * Wed Mar 27 2019 Remi Collet <remi@remirepo.net> - 9.3.3-2 - add security fix backported from 9.4.1: [security] Bad chevrons rendering on dropdowns |