From 2eaff9d03fe967e85b8458e705f31031771319f8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 3 Oct 2015 16:17:37 +0200 Subject: glpi-reports: 1.9.0 --- glpi-reports-dev.spec | 149 -------------------------------------------------- glpi-reports.spec | 30 +++++----- 2 files changed, 17 insertions(+), 162 deletions(-) delete mode 100644 glpi-reports-dev.spec diff --git a/glpi-reports-dev.spec b/glpi-reports-dev.spec deleted file mode 100644 index 6700966..0000000 --- a/glpi-reports-dev.spec +++ /dev/null @@ -1,149 +0,0 @@ -# remirepo spec file for glpi-reports -# -# Copyright (c) 2010-2015 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%global pluginname reports - -Name: glpi-reports -Version: 1.8.0 -Release: 1%{?dist} -Summary: GLPI Plugin providing additional reports -Summary(fr): Extension GLPI fournissant des rapports supplémentaires - -Group: Applications/Internet -License: GPLv2+ -URL: https://forge.indepnet.net/projects/reports - -Source0: https://forge.indepnet.net/attachments/download/2037/glpi-reports-1.8.0.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: gettext - -Requires: glpi >= 0.85 -Requires: glpi < 0.86 - - -%description -This plugin enables additional reports. - -Main features : -* It also plugin allow you to add new reports in a simply way - (one PHP script for the report and one for the translation). -* It handle the right for each new report -* It provides some new reports (as sample) - - -%description -l fr -Ce plugin fournit des rapports supplémentaires. - -Fonctionnalités principales : -* Il permet d’ajouter très facilement de nouveaux rapports (via l’ajout d’un - fichier PHP pour le rapport et un fichier de langue associé). -* Il prend en charge la gestion de droits de tout nouveau rapport ajouté. -* Il fournit quelques rapports (pour exemple) - - -%prep -%setup -q -c - -mv %{pluginname}/docs docs - -# Create link to LICENSE for standard doc folder -ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE - -# dos2unix to avoid rpmlint warnings -for doc in docs/* ; do - sed -i -e 's/\r//' $doc -done - - -%build -# Regenerate the locales -for po in %{pluginname}/locales/*.po -do - msgfmt $po -o $(dirname $po)/$(basename $po .po).mo -done - - -%install -rm -rf %{buildroot} - -mkdir -p %{buildroot}/%{_datadir}/glpi/plugins -cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname} - -for i in %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/locales/* -do - lang=$(basename $i) - echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}" -done | tee %{name}.lang - - -%clean -rm -rf %{buildroot} - - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc docs/* LICENSE -%dir %{_datadir}/glpi/plugins/%{pluginname} -%dir %{_datadir}/glpi/plugins/%{pluginname}/locales -%{_datadir}/glpi/plugins/%{pluginname}/*.php -%{_datadir}/glpi/plugins/%{pluginname}/front -%{_datadir}/glpi/plugins/%{pluginname}/inc -%{_datadir}/glpi/plugins/%{pluginname}/report -# Keep here as required from interface -%{_datadir}/glpi/plugins/%{pluginname}/LICENSE - - -%changelog -* Mon Jun 1 2015 Remi Collet - 1.8.0-1 -- version 1.8.0 for GLPI 0.85 - https://forge.indepnet.net/versions/1108 - -* Mon Dec 1 2014 Remi Collet - 1.7.3-1 -- version 1.7.3 - https://forge.indepnet.net/versions/1093 - -* Wed Feb 12 2014 Remi Collet - 1.7.2-1 -- version 1.7.2 - https://forge.indepnet.net/projects/reports/versions/702 - -* Tue Nov 12 2013 Remi Collet - 1.7.1-1 -- version 1.7.1 - https://forge.indepnet.net/projects/reports/versions/978 - -* Mon Sep 30 2013 Remi Collet - 1.7.0-1 -- version 1.7.0 for GLPI 0.84 - -* Thu Jul 12 2012 Remi Collet - 1.6.1-1 -- version 1.6.1 for GLPI 0.83.3 - https://forge.indepnet.net/projects/reports/versions/701 - -* Fri Apr 06 2012 Remi Collet - 1.6.0-1 -- version 1.6.0 - https://forge.indepnet.net/projects/reports/versions/636 - -* Sun Feb 26 2012 Remi Collet - 1.6.0-0.1.svn215 -- version 1.6.0 for glpi 0.83RC (svn snapshot) - -* Thu Jun 30 2011 Remi Collet - 1.5.0-1 -- version 1.5.0 released - -* Tue Jun 28 2011 Remi Collet - 1.5.0-0.1.svn158 -- version 1.5.0 for glpi 0.80 (svn snapshot) - -* Tue Oct 12 2010 Remi Collet - 1.4.0-1 -- version 1.4.0 and GLPI 0.78 released - -* Sat Sep 18 2010 Remi Collet - 1.4.0-0.1.svn100 -- new snapshot - -* Sat Sep 04 2010 Remi Collet - 1.4.0-0.1.svn95 -- version 1.4.0 for glpi 0.78 RC (svn snapshot) -- initial RPM - diff --git a/glpi-reports.spec b/glpi-reports.spec index a7467c2..a9630ea 100644 --- a/glpi-reports.spec +++ b/glpi-reports.spec @@ -1,4 +1,4 @@ -# spec file for glpi-reports +# remirepo spec file for glpi-reports # # Copyright (c) 2010-2015 Remi Collet # License: CC-BY-SA @@ -9,23 +9,23 @@ %global pluginname reports Name: glpi-reports -Version: 1.7.3 +Version: 1.9.0 Release: 1%{?dist} Summary: GLPI Plugin providing additional reports Summary(fr): Extension GLPI fournissant des rapports supplémentaires Group: Applications/Internet License: GPLv2+ -URL: https://forge.indepnet.net/projects/reports +URL: https://forge.glpi-project.org/projects/reports -Source0: https://forge.indepnet.net/attachments/download/1920/glpi_reports-1.7.3.tar.gz +Source0: https://forge.glpi-project.org/attachments/download/2101/glpi-reports-1.9.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext -Requires: glpi >= 0.84 -Requires: glpi < 0.85 +Requires: glpi >= 0.85 +Requires: glpi < 0.91 %description @@ -51,16 +51,11 @@ Fonctionnalités principales : %prep %setup -q -c -mv %{pluginname}/docs docs +rm -r %{pluginname}/tools # Create link to LICENSE for standard doc folder ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE -# dos2unix to avoid rpmlint warnings -for doc in docs/* ; do - sed -i -e 's/\r//' $doc -done - %build # Regenerate the locales @@ -89,7 +84,8 @@ rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) -%doc docs/* LICENSE +%{!?_licensedir:%global license %%doc} +%license LICENSE %dir %{_datadir}/glpi/plugins/%{pluginname} %dir %{_datadir}/glpi/plugins/%{pluginname}/locales %{_datadir}/glpi/plugins/%{pluginname}/*.php @@ -101,6 +97,14 @@ rm -rf %{buildroot} %changelog +* Sat Oct 3 2015 Remi Collet - 1.9.0-1 +- version 1.9.0 for GLPI 0.85 and 0.90 + https://forge.glpi-project.org/versions/1152 + +* Mon Jun 1 2015 Remi Collet - 1.8.0-1 +- version 1.8.0 for GLPI 0.85 + https://forge.indepnet.net/versions/1108 + * Mon Dec 1 2014 Remi Collet - 1.7.3-1 - version 1.7.3 https://forge.indepnet.net/versions/1093 -- cgit