remove old 0.80 spec

2 files changed, 6 insertions, 212 deletions

diff --git a/glpi-fusioninventory-dev.spec b/glpi-fusioninventory-dev.spec
index 0394d7e..9496295 100644
--- a/glpi-fusioninventory-dev.spec
+++ b/glpi-fusioninventory-dev.spec
@@ -5,7 +5,7 @@ Name:           glpi-fusioninventory
 # New version schema : 2.4.0 = 0.80+1.0 < 0.80+1.1 < 0.83+1.0
 Epoch:          1
 Version:        %{glpi_version}.%{plug_version}
-Release:        0.2.RC3%{?dist}
+Release:        1%{?dist}
 Summary:        FusionInventory Server embedded as a GLPI plugin
 Summary(fr):    Serveur FusionInventory en extension pour GLPI
 
@@ -13,7 +13,7 @@ Group:          Applications/Internet
 License:        AGPLv3+
 URL:            http://forge.fusioninventory.org/projects/fusioninventory-for-glpi
 
-Source0:        http://forge.fusioninventory.org/attachments/download/685/fusioninventory-for-glpi-metapackage_0.83_1.0-RC3.tar.gz
+Source0:        http://forge.fusioninventory.org/attachments/download/699/fusioninventory-for-glpi-metapackage_0.83+1.0.tar.gz
 Source1:        %{name}-httpd.conf
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -153,6 +153,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 03 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.83.3.1.0-1
+- update to 0.83+1.0 (finale)
+  http://forge.fusioninventory.org/versions/67
+
 * Fri Jul 27 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.83.3.1.0-0.2.RC3
 - update to 0.83+1.0-RC3
 
@@ -161,7 +165,6 @@ rm -rf %{buildroot}
 
 * Fri Jun 08 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.83.0.1.0-0.4.beta4
 - update to 0.83+1.0-beta4
-  http://forge.fusioninventory.org/versions/67
 
 * Thu May 03 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.83.0.1.0-0.4.beta3
 - spec cleanups
diff --git a/glpi-fusioninventory.spec b/glpi-fusioninventory.spec
deleted file mode 100644
index 237d7d7..0000000
--- a/glpi-fusioninventory.spec
+++ /dev/null
@@ -1,209 +0,0 @@
-%global  glpi_version  0.80.0
-%global  plug_version  1.4
-
-Name:           glpi-fusioninventory
-# New version schema : 2.4.0 = 0.80+1.0 < 0.80+1.1 < 0.83+1.0
-Epoch:          1
-Version:        %{glpi_version}.%{plug_version}
-Release:        1%{?dist}
-Summary:        FusionInventory Server embedded as a GLPI plugin
-Summary(fr):    Serveur FusionInventory en extension pour GLPI
-
-Group:          Applications/Internet
-License:        AGPLv3+
-URL:            http://forge.fusioninventory.org/projects/fusioninventory-for-glpi
-
-Source0:        http://forge.fusioninventory.org/attachments/download/644/fusioninventory-for-glpi-metapackage_0.80+1.4.tar.gz
-Source1:        %{name}-httpd.conf
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-
-Requires:       glpi >= %{glpi_version}
-Requires:       glpi <  0.81
-Requires:       glpi-reports
-Requires:       glpi-webservices
-
-
-%description
-FusionInventory Server embedded as a plugin into GLPI.
-
-
-%description -l fr
-Serveur FusionInventory embarqué dans une extension GLPI.
-
-
-%prep
-%setup -q -c
-
-# dos2unix to avoid rpmlint warnings
-for doc in */docs/* ; do
-    sed -i -e 's/\r//' $doc
-done
-
-mkdir docs
-
-for plug in fus*
-do
-  if [ -d $plug/docs ]
-  then
-    # move doc, not to be installed
-    mv $plug/docs docs/$plug
-  else
-    mkdir -p docs/$plug
-  fi
-  # LICENSE are installed, just create link in standard docdir.
-  ln -s %{_datadir}/glpi/plugins/$plug/LICENSE docs/$plug/LICENSE
-done
-
-# .htaccess replaced by a httpd config file
-rm -f fusioninventory/install/mysql/.htaccess
-rm -f fusioninventory/tools/.htaccess
-rm -f fusinvsnmp/install/mysql/.htaccess
-rm -f fusinvsnmp/scripts/.htaccess
-
-
-%build
-# empty build
-
-
-%install
-rm -rf %{buildroot} 
-
-mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
-for plug in fus*
-do
-  cp -ar $plug %{buildroot}/%{_datadir}/glpi/plugins/$plug
-done
-
-install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
-
-# Lang
-for i in %{buildroot}%{_datadir}/glpi/plugins/fus*/locales/*
-do
-  lang=$(basename $i)
-  plug=$(basename $(dirname $(dirname $i)))
-  echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/$plug/locales/${lang}"
-done | tee %{name}.lang
-
-
-%clean
-rm -rf %{buildroot} 
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-# fusioninventory
-%doc docs/*
-%dir %{_datadir}/glpi/plugins/fusioninventory
-%dir %{_datadir}/glpi/plugins/fusioninventory/locales
-# LICENSE file required by installation process
-%{_datadir}/glpi/plugins/fusioninventory/LICENSE
-%{_datadir}/glpi/plugins/fusioninventory/*.php
-%{_datadir}/glpi/plugins/fusioninventory/*.js
-%{_datadir}/glpi/plugins/fusioninventory/ajax
-%{_datadir}/glpi/plugins/fusioninventory/front
-%{_datadir}/glpi/plugins/fusioninventory/inc
-%{_datadir}/glpi/plugins/fusioninventory/install
-%{_datadir}/glpi/plugins/fusioninventory/pics
-%{_datadir}/glpi/plugins/fusioninventory/tools
-# fusinvinventory
-%dir %{_datadir}/glpi/plugins/fusinvinventory
-%dir %{_datadir}/glpi/plugins/fusinvinventory/locales
-%{_datadir}/glpi/plugins/fusinvinventory/LICENSE
-%{_datadir}/glpi/plugins/fusinvinventory/*.php
-%{_datadir}/glpi/plugins/fusinvinventory/ajax
-%{_datadir}/glpi/plugins/fusinvinventory/b
-%{_datadir}/glpi/plugins/fusinvinventory/front
-%{_datadir}/glpi/plugins/fusinvinventory/inc
-%{_datadir}/glpi/plugins/fusinvinventory/install
-%{_datadir}/glpi/plugins/fusinvinventory/pics
-# fusinvsnmp
-%dir %{_datadir}/glpi/plugins/fusinvsnmp
-%dir %{_datadir}/glpi/plugins/fusinvsnmp/locales
-%{_datadir}/glpi/plugins/fusinvsnmp/LICENSE
-%{_datadir}/glpi/plugins/fusinvsnmp/*.php
-%{_datadir}/glpi/plugins/fusinvsnmp/*.js
-%{_datadir}/glpi/plugins/fusinvsnmp/ajax
-%{_datadir}/glpi/plugins/fusinvsnmp/front
-%{_datadir}/glpi/plugins/fusinvsnmp/inc
-%{_datadir}/glpi/plugins/fusinvsnmp/install
-%{_datadir}/glpi/plugins/fusinvsnmp/models
-%{_datadir}/glpi/plugins/fusinvsnmp/pics
-%{_datadir}/glpi/plugins/fusinvsnmp/report
-%{_datadir}/glpi/plugins/fusinvsnmp/tool
-%{_datadir}/glpi/plugins/fusinvsnmp/scripts
-# fusinvdeploy
-%dir %{_datadir}/glpi/plugins/fusinvdeploy
-%dir %{_datadir}/glpi/plugins/fusinvdeploy/locales
-%{_datadir}/glpi/plugins/fusinvdeploy/LICENSE
-%{_datadir}/glpi/plugins/fusinvdeploy/*.php
-%{_datadir}/glpi/plugins/fusinvdeploy/ajax
-%{_datadir}/glpi/plugins/fusinvdeploy/b
-%{_datadir}/glpi/plugins/fusinvdeploy/css
-%{_datadir}/glpi/plugins/fusinvdeploy/front
-%{_datadir}/glpi/plugins/fusinvdeploy/inc
-%{_datadir}/glpi/plugins/fusinvdeploy/install
-%{_datadir}/glpi/plugins/fusinvdeploy/js
-%{_datadir}/glpi/plugins/fusinvdeploy/lib
-%{_datadir}/glpi/plugins/fusinvdeploy/pics
-%{_datadir}/glpi/plugins/fusinvdeploy/scripts
-
-
-%changelog
-* Fri Jun 06 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.80.0.1.4-1
-- update to 0.80+1.4
-  http://forge.fusioninventory.org/versions/129
-
-* Thu May 03 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.80.0.1.3-3
-- spec cleanups
-
-* Thu May 03 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.80.0.1.3-2
-- add missing fusinvdeploy
-
-* Thu May 03 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.80.0.1.3-1
-- update to 0.80+1.3
-  http://forge.fusioninventory.org/versions/122
-
-* Sat Apr 14 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.80.0.1.2-1
-- update to 0.80+1.2
-  http://forge.fusioninventory.org/versions/110
-
-* Tue Jan 10 2012 Remi Collet <RPMS@FamilleCollet.com> - 1:0.80.0.1.1-1
-- update to 0.80+1.1 (new version scheme)
-  http://forge.fusioninventory.org/projects/fusioninventory-for-glpi/versions/105
-- switch from GPLv2+ to AGPLv3+
-
-* Sun Sep 18 2011 Remi Collet <RPMS@FamilleCollet.com> - 2.4.0-1
-- update to 2.4.0 finale
-
-* Mon Aug 29 2011 Remi Collet <RPMS@FamilleCollet.com> - 2.4.0-0.4.RC3
-- update to 2.4.0RC3
-
-* Tue Aug 09 2011 Remi Collet <RPMS@FamilleCollet.com> - 2.4.0-0.3.RC2
-- update to 2.4.0RC2
-
-* Tue Jul 26 2011 Remi Collet <RPMS@FamilleCollet.com> - 2.4.0-0.2.RC1
-- update to 2.4.0RC1
-
-* Tue Jun 28 2011 Remi Collet <RPMS@FamilleCollet.com> - 2.4.0-0.1.beta2
-- update to 2.4.0 Beta2 for GLPI 0.80
-
-* Sun Jun 26 2011 Remi Collet <RPMS@FamilleCollet.com> - 2.3.5-1
-- update to 2.3.5
-  http://fusioninventory.org/wordpress/2011/06/26/fusioninventory-for-glpi-2-3-5-is-available/
-
-* Sat Jun 11 2011 Remi Collet <RPMS@FamilleCollet.com> - 2.3.4-1
-- update to 2.3.4 for GLPI 0.78
-
-* Wed Aug 25 2010 Remi Collet <RPMS@FamilleCollet.com> - 2.2.2-1
-- update to 2.2.2
-  Changes : http://forge.fusioninventory.org/news/11
-
-* Fri May 21 2010 Remi Collet <RPMS@FamilleCollet.com> - 2.2.1-1
-- update to 2.2.1
-
-* Tue May 18 2010 Remi Collet <RPMS@FamilleCollet.com> - 2.2.0-1
-- Initial RPM
-