From f4afd303473b49b2a10f0a99bfd101fede9cc9aa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 24 Oct 2017 08:09:44 +0200 Subject: version 1.11.0 for GLPI 9.2 --- .gitignore | 8 ++++++++ glpi-reports.spec | 22 ++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/glpi-reports.spec b/glpi-reports.spec index 04cc5ac..ccaf675 100644 --- a/glpi-reports.spec +++ b/glpi-reports.spec @@ -9,7 +9,7 @@ %global pluginname reports Name: glpi-reports -Version: 1.10 +Version: 1.11.0 Release: 1%{?dist} Summary: GLPI Plugin providing additional reports Summary(fr): Extension GLPI fournissant des rapports supplémentaires @@ -18,14 +18,13 @@ Group: Applications/Internet License: GPLv2+ URL: https://forge.glpi-project.org/projects/reports -Source0: https://forge.glpi-project.org/attachments/download/2173/glpi-reports-1.10.tar.gz +Source0: https://forge.glpi-project.org/attachments/download/2206/glpi-reports-1.11.0.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext -Requires: glpi >= 0.85 -Requires: glpi < 9.2 +Requires: glpi >= 9.2 +Requires: glpi < 9.3 %description @@ -54,6 +53,9 @@ Fonctionnalités principales : # Create link to LICENSE for standard doc folder ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE +# Display compatibility check +grep version_compare %{pluginname}/setup.php + %build # Regenerate the locales @@ -64,8 +66,6 @@ done %install -rm -rf %{buildroot} - mkdir -p %{buildroot}/%{_datadir}/glpi/plugins cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname} @@ -76,12 +76,7 @@ do done | tee %{name}.lang -%clean -rm -rf %{buildroot} - - %files -f %{name}.lang -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %dir %{_datadir}/glpi/plugins/%{pluginname} @@ -95,6 +90,9 @@ rm -rf %{buildroot} %changelog +* Mon Oct 23 2017 Remi Collet - 1.11.0-1 +- version 1.11.0 for GLPI 9.2 + * Fri Jan 20 2017 Remi Collet - 1.10-1 - version 1.10 for GLPI 0.85, 0.90 and 9.1 -- cgit