From 54eb29f60fa0f36a1403a93994ad58ac083b1bb0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 Mar 2014 07:46:02 +0200 Subject: glpi-data-injection: 2.3.1 --- glpi-data-injection-dev.spec | 208 ------------------------------------------- glpi-data-injection.spec | 23 +++-- 2 files changed, 18 insertions(+), 213 deletions(-) delete mode 100644 glpi-data-injection-dev.spec diff --git a/glpi-data-injection-dev.spec b/glpi-data-injection-dev.spec deleted file mode 100644 index ddaefe3..0000000 --- a/glpi-data-injection-dev.spec +++ /dev/null @@ -1,208 +0,0 @@ -# spec file for glpi-data-injection -# -# Copyright (c) 2007-2014 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/3.0/ -# -# Please, preserve the changelog entries -# -%global pluginname datainjection -#global svnrelease 703 - -Name: glpi-data-injection -Version: 2.3.0 -%if 0%{?svnrelease} -Release: 0.1.svn%{svnrelease}%{?dist} -%else -Release: 1%{?dist} -%endif -Summary: Plugin for importing data into GLPI -Summary(fr): Extension pour importer des données dans GLPI - -Group: Applications/Internet -License: GPLv2+ - -URL: https://forge.indepnet.net/projects/datainjection -%if 0%{?svnrelease} -# svn export -r 703 https://forge.indepnet.net/svn/datainjection/trunk datainjection -# tar czf glpi-datainjection-2.2.0-703.tar.gz datainjection -Source0: glpi-datainjection-2.2.0-%{svnrelease}.tar.gz -%else -# This change for each new version -Source0: https://forge.indepnet.net/attachments/download/1610/glpi-datainjection-2.3.0.tar.gz -%endif - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch - -Requires: glpi >= 0.84 -Requires: glpi < 0.85 -#Requires: glpi-pdf - -# This plugin have been renamed -Provides: glpi-%{pluginname} = %{version}-%{release} - - -%description -Plugin for importing data into GLPI - -It'll can serve, for example, to : -- import machines at the delivery (electronic delivery order in CSV) -- import additional data -- import equipment not managed by OCS -- transmit from an other tool of asset management - -%description -l fr -Extension pour importer des données dans GLPI - -Elle pourra servir, par exemple, à : -- importer des machines à la livraison (bon de livraison électronique en CSV) -- importer des données complémentaires -- importer des matériels non gérés par OCS -- migrer depuis un autre outil de gestion de parc - - -%prep -%setup -q -c - -mv %{pluginname}/docs docs - -# dos2unix to avoid rpmlint warnings -for fic in docs/*; do - mv $fic $fic.ref - sed -e 's/\r//' $fic.ref >$fic - touch -r $fic.ref $fic - rm $fic.ref -done - -# don't need this -rm -f testwebservice.php - - -%build -# empty build - - -%install -rm -rf %{buildroot} - -mkdir -p %{buildroot}%{_localstatedir}/lib/glpi/files/_plugins/%{pluginname} - -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/* -%dir %{_datadir}/glpi/plugins/%{pluginname} -%{_datadir}/glpi/plugins/%{pluginname}/*.php -%dir %{_datadir}/glpi/plugins/%{pluginname}/locales -%{_datadir}/glpi/plugins/%{pluginname}/ajax -%{_datadir}/glpi/plugins/%{pluginname}/css -%{_datadir}/glpi/plugins/%{pluginname}/front -%{_datadir}/glpi/plugins/%{pluginname}/inc -%{_datadir}/glpi/plugins/%{pluginname}/javascript -%{_datadir}/glpi/plugins/%{pluginname}/pics -# Need here, required from the Interface -%{_datadir}/glpi/plugins/%{pluginname}/LICENSE -# Data -%attr(750,apache,root) %{_localstatedir}/lib/glpi/files/_plugins/%{pluginname} - - -%changelog -* Tue Nov 12 2013 Remi Collet - 2.3.0-1 -- version 2.3.0 for GLPI 0.84 - https://forge.indepnet.net/projects/datainjection/versions/934 - -* Wed Jun 13 2012 Remi Collet - 2.2.1-1 -- version 2.2.1 - https://forge.indepnet.net/projects/datainjection/versions/748 - -* Thu Apr 19 2012 Remi Collet - 2.2.0-1 -- version 2.2.0 finale - https://forge.indepnet.net/projects/datainjection/versions/645 - -* Fri Apr 06 2012 Remi Collet - 2.2.0-0.1.svn703 -- new snapshot - -* Sun Feb 26 2012 Remi Collet - 2.2.0-0.1.svn674 -- update to 2.2.0 for glpi 0.83 RC (svn snapshot) - -* Tue Jan 10 2012 Remi Collet - 2.1.4-1 -- update to 2.1.4 - https://forge.indepnet.net/projects/datainjection/versions/671 - -* Sun Dec 11 2011 Remi Collet - 2.1.3-1 -- update to 2.1.3 - https://forge.indepnet.net/projects/datainjection/versions/663 - -* Sat Nov 26 2011 Remi Collet - 2.1.2-1 -- update to 2.1.2 - https://forge.indepnet.net/projects/datainjection/versions/661 - -* Sat Nov 12 2011 Remi Collet - 2.1.1-1 -- update to 2.1.1 - -* Sun Oct 16 2011 Remi Collet - 2.1.0-1 -- update to 2.1.0 finale version - -* Tue Sep 20 2011 Remi Collet - 2.1.0-0.2.svn596 -- new snapshot - -* Sun Jul 24 2011 Remi Collet - 2.1.0-0.1.svn593 -- update to 2.1.0 for glpi 0.80 (svn snapshot) - -* Sat Jun 11 2011 Remi Collet - 2.0.2-1 -- update to 2.0.2 - https://forge.indepnet.net/projects/datainjection/versions/544 - -* Tue Mar 8 2011 Remi Collet - 2.0.1-1.beta -- update to 2.0.1-beta - -* Wed Jan 19 2011 Remi Collet - 2.0.0-0.1.beta -- update to 2.0.0-beta - -* Fri Dec 10 2010 Remi Collet - 1.7.2-1 -- update to 1.7.2 -- fix URL + Source (link to new forge) - -* Wed Sep 09 2009 Remi Collet - 1.7.0-1 -- update to 1.7.0 - -* Tue Aug 18 2009 Remi Collet - 1.6.0-1 -- update to 1.6.0 finale for glpi 0.72 - -* Fri Jul 24 2009 Fedora Release Engineering - 1.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Apr 21 2009 Remi Collet - 1.5.1-1 -- update to 1.5.1 - -* Fri Mar 13 2009 Remi Collet - 1.4.0-1 -- update to 1.4.0 -- spec cleanup - -* Sat Jul 12 2008 Remi Collet - 1.2-1 -- update to 1.2 for glpi 0.71 - -* Sun Jan 13 2008 Remi Collet - 1.1-1 -- update to 1.1 -- tag lang files - -* Tue Dec 25 2007 Remi Collet - 1.0-1 -- update to 1.0 finale -- add patch 5653 (lang fix) - -* Sat Aug 25 2007 Remi Collet - 1.0-0.20070825 -- Initial RPM - diff --git a/glpi-data-injection.spec b/glpi-data-injection.spec index ccefa5a..d7ac19e 100644 --- a/glpi-data-injection.spec +++ b/glpi-data-injection.spec @@ -10,7 +10,7 @@ #global svnrelease 703 Name: glpi-data-injection -Version: 2.2.1 +Version: 2.3.1 %if 0%{?svnrelease} Release: 0.1.svn%{svnrelease}%{?dist} %else @@ -29,14 +29,14 @@ URL: https://forge.indepnet.net/projects/datainjection Source0: glpi-datainjection-2.2.0-%{svnrelease}.tar.gz %else # This change for each new version -Source0: https://forge.indepnet.net/attachments/download/1189/glpi-datainjection-2.2.1.tar.gz +Source0: https://forge.indepnet.net/attachments/download/1719/glpi-datainjection-2.3.1.tar.gz %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.83 -Requires: glpi < 0.84 +Requires: glpi >= 0.84 +Requires: glpi < 0.85 Requires: glpi-pdf # This plugin have been renamed @@ -76,7 +76,8 @@ for fic in docs/*; do done # don't need this -rm -f testwebservice.php +rm -f %{pluginname}/testwebservice.php +rm -rf %{pluginname}/tools %build @@ -86,6 +87,8 @@ rm -f testwebservice.php %install rm -rf %{buildroot} +mkdir -p %{buildroot}%{_localstatedir}/lib/glpi/files/_plugins/%{pluginname} + mkdir -p %{buildroot}/%{_datadir}/glpi/plugins cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname} @@ -113,9 +116,19 @@ rm -rf %{buildroot} %{_datadir}/glpi/plugins/%{pluginname}/pics # Need here, required from the Interface %{_datadir}/glpi/plugins/%{pluginname}/LICENSE +# Data +%attr(750,apache,root) %{_localstatedir}/lib/glpi/files/_plugins/%{pluginname} %changelog +* Mon Mar 31 2014 Remi Collet - 2.3.1-1 +- version 2.3.1 for GLPI 0.84 + https://forge.indepnet.net/projects/datainjection/versions/1004 + +* Tue Nov 12 2013 Remi Collet - 2.3.0-1 +- version 2.3.0 for GLPI 0.84 + https://forge.indepnet.net/projects/datainjection/versions/934 + * Wed Jun 13 2012 Remi Collet - 2.2.1-1 - version 2.2.1 https://forge.indepnet.net/projects/datainjection/versions/748 -- cgit