From c848cec73208cdb79b8c968163eed1702e0ac8da Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Dec 2017 16:41:29 +0100 Subject: update to 9.1.7 (broken, bad version) --- glpi.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/glpi.spec b/glpi.spec index 8bd89d0..0de3675 100644 --- a/glpi.spec +++ b/glpi.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit 2683ce0cfe4cce4786e52eec3cf2a54f54f01225 +%global gh_commit 1c6c9dc936ec29b015164e1477fcae76f0b47ce7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20160923 %global gh_owner glpi-project @@ -40,9 +40,9 @@ %endif Name: %{gh_project} -Version: 9.1.6 +Version: 9.1.7 %global schema 9.1.3 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -285,7 +285,7 @@ mv %{buildroot}/%{_localstatedir}/lib/%{name}/files/_log %{buildroot}%{_localsta install -Dpm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} # remirepo:4 -%if 0%{?rhel} == 5 || 0%{?rhel} == 6 +%if 0%{?rhel} == 6 : Remove "su" option from logrotate configuration file - requires logrotate 3.8+ sed -e '/su /d' -i %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %endif @@ -387,15 +387,8 @@ exit $RET %if %{useselinux} ( # New File context -# remirepo:4 -%if 0%{?rhel} == 5 -semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/%{name}(/.*)?" -semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/%{name}(/.*)?" -%else semanage fcontext -a -s system_u -t httpd_sys_rw_content_t -r s0 "%{_sysconfdir}/%{name}(/.*)?" semanage fcontext -a -s system_u -t httpd_var_lib_t -r s0 "%{_localstatedir}/lib/%{name}(/.*)?" -# remirepo:1 -%endif semanage fcontext -a -s system_u -t httpd_sys_content_t -r s0 "%{_datadir}/%{name}(/.*)?" semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/%{name}(/.*)?" # files created by app @@ -461,6 +454,9 @@ fi %changelog +* Tue Dec 5 2017 Remi Collet - 9.1.7-1 +- update to 9.1.7 (broken, bad version) + * Thu Nov 23 2017 Remi Collet - 9.1.6-3 - add max version for all dependencies - fix dependency issue with php-phpmailer6 -- cgit