From d98816c99cb9634622cfcc88934cc09191b24fd2 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Thu, 21 Jul 2011 17:30:07 +0200
Subject: [PATCH 001/106] initial import

---
 .gitignore                 |   1 +
 fusioninventory-agent.cron |  37 ++++
 fusioninventory-agent.init | 111 +++++++++++
 fusioninventory-agent.spec | 379 +++++++++++++++++++++++++++++++++++++
 sources                    |   1 +
 5 files changed, 529 insertions(+)
 create mode 100644 fusioninventory-agent.cron
 create mode 100755 fusioninventory-agent.init
 create mode 100644 fusioninventory-agent.spec

diff --git a/.gitignore b/.gitignore
index e69de29..2f433ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/FusionInventory-Agent-2.1.9.tar.gz
diff --git a/fusioninventory-agent.cron b/fusioninventory-agent.cron
new file mode 100644
index 0000000..e09c0db
--- /dev/null
+++ b/fusioninventory-agent.cron
@@ -0,0 +1,37 @@
+#!/bin/bash
+NAME=fusioninventory-agent
+LOG=/var/log/$NAME/$NAME.log
+
+exec >>$LOG 2>&1
+
+[ -f   /etc/sysconfig/$NAME ] || exit 0
+source /etc/sysconfig/$NAME
+export PATH
+
+i=0
+while [ $i -lt ${#OCSMODE[*]} ]
+do
+	if [ ${OCSMODE[$i]:-none} == cron ]; then
+		OPTS=
+		if [ ! -z "${OCSPAUSE[$i]}" ]; then
+			OPTS="--wait ${OCSPAUSE[$i]}"
+		fi
+
+		if [ ! -z "${OCSTAG[$i]}" ]; then
+		        OPTS="$OPTS --tag=${OCSTAG[$i]}"
+		fi
+
+		if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then
+	        	# Local inventory
+	        	OPTS="$OPTS --local=/var/lib/$NAME"
+		elif [ ! -z "${OCSSERVER[$i]}" ]; then
+	        	# Remote inventory
+		        OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}"
+		fi
+		echo "[$(date '+%c')] Running $NAME $OPTS"
+		/usr/bin/$NAME $FUSINVOPT --logfile=$LOG $OPTS
+	fi
+	((i++))
+done
+echo "[$(date '+%c')] End of cron job ($PATH)"
+
diff --git a/fusioninventory-agent.init b/fusioninventory-agent.init
new file mode 100755
index 0000000..4a488f2
--- /dev/null
+++ b/fusioninventory-agent.init
@@ -0,0 +1,111 @@
+#!/bin/bash
+#
+# chkconfig: - 88 12
+# description:	FusionInventory Agent
+# processname: fusioninventory-agent
+# config: /etc/sysconfig/fusioninventory-agent.pid
+# pidfile: /var/run/fusioninventory-agent.pid
+### BEGIN INIT INFO
+# Provides: fusioninventory-agent
+# Required-Start: $local_fs $remote_fs $network $named $syslog $time
+# Required-Stop: $local_fs $remote_fs $network $named $syslog $time
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: FusionInventory agent
+# Description: FusionInventory agent
+### END INIT INFO
+
+# source function library
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+desc="FusionInventory Agent"
+prog=fusioninventory-agent
+lockfile=/var/lock/subsys/$prog
+pidfile=/var/run/$prog.pid
+logfile=/var/log/$prog/$prog.log
+
+# pull in sysconfig settings
+[ -r /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Read configuration
+	i=0
+	OPTS=
+	SERVERS=
+	while [ $i -lt ${#OCSMODE[*]} ]
+	do
+		if [ ${OCSMODE[$i]:-none} == daemon ]; then
+			if [ ! -z "${OCSTAG[$i]}" ]; then
+				OPTS="$OPTS --tag=${OCSTAG[$i]}"
+			fi
+			if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then
+				# Local inventory
+				OPTS="$OPTS --local=/var/lib/$prog"
+			elif [ ! -z "${OCSSERVER[$i]}" ]; then
+				# Remote inventory
+				if [ -z "$SERVERS" ]; then
+					SERVERS=${OCSSERVER[$i]}
+				else
+					SERVERS="$SERVERS,${OCSSERVER[$i]}"
+				fi
+			fi
+		fi
+		((i++))
+	done
+	if [ -n "$SERVERS" ]; then
+		OPTS="$OPTS --server=$SERVERS"
+	fi
+	if [ -n "$OPTS" ]; then
+		echo -n $"Starting $prog: "
+		daemon $prog --logfile-maxsize=999 --logfile=$logfile $FUSINVOPT --daemon $OPTS 2>/dev/null
+		RETVAL=$?
+		echo
+                [ $RETVAL -eq 0 ] && touch $lockfile
+	else
+		RETVAL=0
+	fi
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	echo -n $"Stopping $prog: "
+	killproc $prog
+	RETVAL=$?
+	echo
+	if [ $RETVAL -eq 0 ] ; then
+	    rm -f $lockfile $pidfile
+	fi
+}
+
+case "$1" in
+  start)
+	do_start
+	;;
+  stop)
+	do_stop
+	;;
+  status)
+	status $prog
+	;;
+  restart|reload|force-reload)
+	do_stop
+	do_start
+	;;
+  condrestart)
+	[ -f $lockfile ] && do_stop && do_start || :
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
+	exit 1
+	;;
+esac
+exit $RETVAL
+
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
new file mode 100644
index 0000000..17d2552
--- /dev/null
+++ b/fusioninventory-agent.spec
@@ -0,0 +1,379 @@
+#global gitver 9bd1238
+#global prever _beta1
+
+Name:        fusioninventory-agent
+Summary:     FusionInventory agent
+Summary(fr): Agent FusionInventory
+Group:       Applications/System
+License:     GPLv2+
+URL:         http://fusioninventory.org/
+
+Version:     2.1.9
+
+%if 0%{?gitver:1}
+Release:   0.1.git%{gitver}%{?dist}
+# From http://github.com/fusinv/fusioninventory-agent/tarball/master
+Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
+%else
+Release:   1%{?dist}
+Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
+%endif
+
+Source1:   %{name}.cron
+Source2:   %{name}.init
+
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: perl(Module::Install)
+# For tests 
+BuildRequires: perl(Time::HiRes) perl(XML::Simple) perl(UNIVERSAL::require) perl(Test::More)
+%if 0%{?fedora}>= 12 || 0%{?rhel} >= 5
+BuildRequires: perl(XML::TreePP)
+%endif
+%if 0%{?fedora}>= 10 || 0%{?rhel} >= 5
+BuildRequires: perl(JSON)
+%endif
+%if 0%{?fedora} >= 11
+BuildRequires: perl(Test::Compile)
+%endif
+
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  perl(LWP) perl(Net::IP) perl(HTTP::Status) perl(Net::SSLeay) perl(Crypt::SSLeay)
+Requires:  perl(Proc::Daemon) perl(Proc::PID::File)
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+Requires:  perl(Archive::Extract)
+Requires:  perl(Net::CUPS)
+%endif
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig, /sbin/service
+Requires(postun): /sbin/service
+
+
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+# This work only on recent fedora
+%{?filter_setup:
+%filter_from_requires /perl(Win32/d
+%?perl_default_filter
+}
+%else 
+%{?perl_default_filter}
+%endif
+
+
+%description
+FusionInventory Agent is an application designed to help a network
+or system administrator to keep track of the hardware and software
+configurations of computers that are installed on the network.
+
+This agent can send information about the computer to a OCS Inventory NG
+or GLPI server with the FusionInventory for GLPI plugin.
+
+You can add additional packages for optional tasks:
+
+* perl-FusionInventory-Agent-Task-OcsDeploy
+    OCS Inventory Software deployment support
+* perl-FusionInventory-Agent-Task-NetDiscovery
+    Network Discovery support
+* perl-FusionInventory-Agent-Task-SNMPQuery
+    SNMP Query support
+* perl-FusionInventory-Agent-Task-ESX
+    vCenter/ESX/ESXi remote inventory
+
+Edit the /etc/sysconfig/%{name} file for service configuration.
+
+%description -l fr
+L'agent FusionInventory est une application destinée à aider l'administrateur
+système ou réseau à surveiller la configuration des machines du réseau
+et les logiciels qui y sont installés.
+
+Cet agent peut envoyer les informations de l'ordinateur à un serveur
+OCS Inventory NG ou à un serveur GLPI disposant de l'extension FusionInventory.
+
+Vous pouvez ajouter les paquets additionnels pour les tâches optionnelles :
+
+* perl-FusionInventory-Agent-Task-OcsDeploy
+    Gestion du déploiement logiciel OCS Inventory
+* perl-FusionInventory-Agent-Task-NetDiscovery
+    Gestion de la découverte réseau
+* perl-FusionInventory-Agent-Task-SNMPQuery
+    Gestion de l'interrogation SNMP
+* perl-FusionInventory-Agent-Task-ESX
+    Inventaire à distance des vCenter/ESX/ESXi
+
+Modifier le fichier /etc/sysconfig/%{name} pour configurer
+le service.
+
+
+%package yum-plugin
+Summary:       Ask FusionInventory agent to send an inventory when yum exits
+Summary(fr):   Demande à l'agent FusionInventory l'envoi d'un inventaire
+Group:         System Environment/Base
+BuildRequires: python-devel
+Requires:      yum >= 2.4
+Requires:      %{name}
+
+%description yum-plugin
+fusioninventory-agent-yum-plugin asks the running service agent to send an
+inventory when yum exits.
+
+This requires the service to be running with the --rpc-trust-localhost option.
+
+%description -l fr yum-plugin
+fusioninventory-agent-yum-plugin demande au service de l'agent d'envoyer un
+inventaire à la fin de l'exécution de yum.
+
+Le service doit être actif et lancé avec l'option --rpc-trust-localhost.
+
+%prep
+%if 0%{?gitver:1}
+%setup -q -n fusinv-fusioninventory-agent-%{gitver}
+%else
+%setup -q -n FusionInventory-Agent-%{version}%{?prever}
+%endif
+
+# This work only on older version, and is ignored on recent
+cat <<EOF | tee %{name}-req
+#!/bin/sh
+%{__perl_requires} $* | \
+sed -e '/perl(Win32/d'
+EOF
+
+%if 0%{?gitver:1}
+%global __perl_requires %{_builddir}/fusinv-fusioninventory-agent-%{gitver}/%{name}-req
+%else
+%global __perl_requires %{_builddir}/FusionInventory-Agent-%{version}%{?prever}/%{name}-req
+%endif
+chmod +x %{__perl_requires}
+
+cat <<EOF | tee logrotate
+%{_localstatedir}/log/%{name}/*.log {
+    weekly
+    rotate 7
+    compress
+    notifempty
+    missingok
+}
+EOF
+
+cat <<EOF | tee %{name}.conf
+#
+# Fusion Inventory Agent Configuration File
+# used by hourly cron job and service launcher to override the %{name}.cfg setup.
+#
+# DONT FORGET to enable the service !
+#
+# Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+# Global options (debug for verbose log, rpc-trust-localhost for yum-plugin)
+FUSINVOPT='--debug --rpc-trust-localhost'
+# Mode, change to "cron" or "daemon" to activate
+# - none (default on install) no activity
+# - cron (inventory only) use the cron.hourly
+# - daemon (recommanded) use the service
+#   DON'T FORGET to enable the service
+OCSMODE[0]=none
+# OCS Inventory or FusionInventory server URI
+# OCSSERVER[0]=your.ocsserver.name
+# OCSSERVER[0]=http://your.ocsserver.name/ocsinventory
+# OCSSERVER[0]=http://your.glpiserveur.name/glpi/plugins/fusioninventory/
+# corresponds with --local=%{_localstatedir}/lib/%{name}
+# OCSSERVER[0]=local
+# Wait before inventory (for cron mode)
+OCSPAUSE[0]=120
+# Administrative TAG (optional, must be filed before first inventory)
+OCSTAG[0]=
+EOF
+
+cat <<EOF | tee agent.cfg
+# This file provides global and command line settings
+# For CRON or DAEMON configuration, see %{_sysconfdir}/sysconfig/%{name}
+share-dir=%{perl_vendorlib}/auto/share/dist/FusionInventory-Agent
+basevardir=%{_localstatedir}/lib/%{name}
+logger=Stderr
+server=""
+EOF
+
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+%{_fixperms} %{buildroot}/*
+
+
+mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
+
+install -m 644 -D  logrotate    %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -m 644 -D  %{name}.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -m 644 -D  agent.cfg    %{buildroot}%{_sysconfdir}/fusioninventory/agent.cfg
+install -m 755 -Dp %{SOURCE1}   %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
+install -m 755 -Dp %{SOURCE2}   %{buildroot}%{_initrddir}/%{name}
+
+# Yum plugin installation
+install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py
+install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum/pluginconf.d/%{name}.conf
+
+
+%check
+make test
+
+
+%clean
+rm -rf %{buildroot} %{buildroot}%{_datarootdir}
+
+
+%post
+/sbin/chkconfig --add %{name}
+
+
+%preun
+if [ $1 -eq 0 ] ; then
+    /sbin/service %{name} stop &>/dev/null
+    /sbin/chkconfig --del %{name}
+fi
+exit 0
+
+
+%postun
+if [ $1 -ge 1 ]; then
+    /sbin/service %{name} condrestart &>/dev/null
+fi
+exit 0
+
+
+%files
+%defattr(-, root, root, -)
+%doc AUTHORS Changes LICENSE THANKS
+%if ! 0%{?gitver:1}
+%doc README*
+%endif
+%dir %{_sysconfdir}/fusioninventory
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg
+%{_sysconfdir}/cron.hourly/%{name}
+%{_initrddir}/%{name}
+%{perl_vendorlib}/FusionInventory
+%{perl_vendorlib}/auto
+%{_bindir}/fusioninventory-agent
+%{_bindir}/fusioninventory-injector
+%exclude %{_bindir}/%{name}-config
+%{_mandir}/man1/fusioninventory-agent*
+%{_mandir}/man1/fusioninventory-injector*
+%{_mandir}/man3/Fusion*
+%dir %{_localstatedir}/log/%{name}
+%dir %{_localstatedir}/lib/%{name}
+
+%files yum-plugin
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf
+%{_prefix}/lib/yum-plugins/%{name}.*
+
+
+%changelog
+* Sun Jun 26 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-1
+- missing dist tag
+
+* Wed Jun 15 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-1
+- update to 2.1.9
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.9/Changes
+
+* Sat Jun 11 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-0.1.git9bd1238
+- update to 2.1.9 from git
+- improved init script for systemd
+- improved comment for use with glpi-fusioninventory
+
+* Thu Mar 31 2011 Remi Collet <Fedora@famillecollet.com> 2.1.8-2
+- revert change for issue 656 which breaks compatibility
+
+* Wed Mar 30 2011 Remi Collet <Fedora@famillecollet.com> 2.1.8-1
+- update to 2.1.8
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.8/Changes
+
+* Thu Dec 30 2010 Remi Collet <Fedora@famillecollet.com> 2.1.7-2
+- add the yum-plugin sub-package
+
+* Mon Dec 13 2010 Remi Collet <Fedora@famillecollet.com> 2.1.7-1
+- update to 2.1.7
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.7/Changes
+
+* Sun Nov 28 2010 Remi Collet <Fedora@famillecollet.com> 2.1.7-0.1.beta1
+- update to 2.1.7 beta1
+
+* Sat Nov 13 2010 Remi Collet <Fedora@famillecollet.com> 2.1.6-1.1
+- fix perl filter on EL-6
+
+* Wed Oct 06 2010 Remi Collet <Fedora@famillecollet.com> 2.1.6-1
+- update to 2.1.6
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.6/Changes
+- fix init script for multi-server in daemon mode
+- workaround for http://forge.fusioninventory.org/issues/414
+
+* Wed Sep 15 2010 Remi Collet <Fedora@famillecollet.com> 2.1.5-1
+- update to 2.1.5
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.5/Changes
+
+* Fri Sep 10 2010 Remi Collet <Fedora@famillecollet.com> 2.1.3-2
+- add %%check
+
+* Sat Sep 04 2010 Remi Collet <Fedora@famillecollet.com> 2.1.3-1
+- update to 2.1.3
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.3/Changes
+
+* Wed Aug 25 2010 Remi Collet <Fedora@famillecollet.com> 2.1.2-1
+- update to 2.1.2
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.2/Changes
+
+* Wed Aug 18 2010 Remi Collet <Fedora@famillecollet.com> 2.1.1-1
+- update to 2.1.1
+
+* Wed Aug 18 2010 Remi Collet <Fedora@famillecollet.com> 2.1-2.gita7532c0
+- update to git snaphost which fix EL issues
+- fix init script
+- adapt perl filter for recent/old fedora or EL
+
+* Mon Aug 16 2010 Remi Collet <Fedora@famillecollet.com> 2.1-1
+- update to 2.1
+- switch download URL back to CPAN
+- add %%{perl_vendorlib}/auto
+- filter perl(Win32*) from Requires
+- add patch (from git) to reopen the file logger if needed
+
+* Sat May 29 2010 Remi Collet <Fedora@famillecollet.com> 2.0.6-1
+- update to 2.0.6
+- swicth download URL to forge
+
+* Wed May 12 2010 Remi Collet <Fedora@famillecollet.com> 2.0.5-1
+- update to 2.0.5
+
+* Tue May 11 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-4.gitf7c5492
+- git snapshot fix perl 5.8.8 (EL5) issue
+
+* Sat May 08 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-4.gitddfdeaf
+- git snapshot fix daemon issue
+- add FUSINVOPT for global options (p.e.--debug)
+
+* Sat May 08 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-3
+- add support for daemon mode
+
+* Fri May 07 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-2
+- info about perl-FusionInventory-Agent-Task-OcsDeploy
+- spec cleanup
+- french translation
+- set Net::CUPS and Archive::Extract optionnal on RHEL4
+
+* Fri May 07 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-1
+- update to 2.0.4 which fixes important bugs when cron is used
+
+* Sat May 01 2010 Remi Collet <Fedora@famillecollet.com> 2.0.3-1
+- initial spec
+
diff --git a/sources b/sources
index e69de29..7675b82 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+4e7f5dd004e6ca4edfcab0fc3dcbe422  FusionInventory-Agent-2.1.9.tar.gz

From 59123b15e0c4413091eb2823b21270e767a7dfab Mon Sep 17 00:00:00 2001
From: Petr Sabata <contyk@redhat.com>
Date: Fri, 22 Jul 2011 09:29:01 +0200
Subject: [PATCH 002/106] Perl mass rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 17d2552..f619eb9 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -11,7 +11,7 @@ URL:         http://fusioninventory.org/
 Version:     2.1.9
 
 %if 0%{?gitver:1}
-Release:   0.1.git%{gitver}%{?dist}
+Release:   0.2.git%{gitver}%{?dist}
 # From http://github.com/fusinv/fusioninventory-agent/tarball/master
 Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
 %else
@@ -280,6 +280,9 @@ exit 0
 
 
 %changelog
+* Fri Jul 22 2011 Petr Sabata <contyk@redhat.com> - 2.1.9-1
+- Perl mass rebuild
+
 * Sun Jun 26 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-1
 - missing dist tag
 

From 4591d8f4c63929a80bfb56671cf85d22135e0102 Mon Sep 17 00:00:00 2001
From: Petr Sabata <contyk@redhat.com>
Date: Mon, 25 Jul 2011 11:24:20 +0200
Subject: [PATCH 003/106] Perl mass rebuild

---
 fusioninventory-agent.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index f619eb9..6daa873 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -11,11 +11,11 @@ URL:         http://fusioninventory.org/
 Version:     2.1.9
 
 %if 0%{?gitver:1}
-Release:   0.2.git%{gitver}%{?dist}
+Release:   0.1.git%{gitver}%{?dist}
 # From http://github.com/fusinv/fusioninventory-agent/tarball/master
 Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
 %else
-Release:   1%{?dist}
+Release:   2%{?dist}
 Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 %endif
 
@@ -280,7 +280,7 @@ exit 0
 
 
 %changelog
-* Fri Jul 22 2011 Petr Sabata <contyk@redhat.com> - 2.1.9-1
+* Fri Jul 25 2011 Petr Sabata <contyk@redhat.com> - 2.1.9-2
 - Perl mass rebuild
 
 * Sun Jun 26 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-1

From b61748dab991fad59975cb6cd527b9d8318e3c66 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Sat, 6 Aug 2011 09:07:26 +0200
Subject: [PATCH 004/106] adapt filter

---
 fusioninventory-agent.spec | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 6daa873..517a63e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -15,7 +15,7 @@ Release:   0.1.git%{gitver}%{?dist}
 # From http://github.com/fusinv/fusioninventory-agent/tarball/master
 Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
 %else
-Release:   2%{?dist}
+Release:   3%{?dist}
 Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 %endif
 
@@ -50,15 +50,11 @@ Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
 
 
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-# This work only on recent fedora
-%{?filter_setup:
-%filter_from_requires /perl(Win32/d
-%?perl_default_filter
-}
-%else 
+# RPM 4.8
+%{?filter_from_requires: %filter_from_requires /perl(Win32/d}
 %{?perl_default_filter}
-%endif
+# RPM 4.9
+%global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(Win32
 
 
 %description
@@ -280,6 +276,9 @@ exit 0
 
 
 %changelog
+* Sat Aug 06 2011 Remi Collet <remi@fedoraproject.org> - 2.1.9-3
+- adapt filter
+
 * Fri Jul 25 2011 Petr Sabata <contyk@redhat.com> - 2.1.9-2
 - Perl mass rebuild
 

From 17d4b16d54fab0487a37518ff9a66af57c52c25a Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Mon, 28 Nov 2011 23:26:00 +0100
Subject: [PATCH 005/106] update to 2.1.12

---
 .gitignore                      |   2 +
 fusioninventory-agent-git.patch | 112 ++++++++++++++++++++++++++++++++
 fusioninventory-agent.spec      |  27 ++++++--
 sources                         |   2 +-
 4 files changed, 137 insertions(+), 6 deletions(-)
 create mode 100644 fusioninventory-agent-git.patch

diff --git a/.gitignore b/.gitignore
index 2f433ad..bfb8c90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+*spec~
 /FusionInventory-Agent-2.1.9.tar.gz
+/FusionInventory-Agent-2.1.12.tar.gz
diff --git a/fusioninventory-agent-git.patch b/fusioninventory-agent-git.patch
new file mode 100644
index 0000000..9b131dc
--- /dev/null
+++ b/fusioninventory-agent-git.patch
@@ -0,0 +1,112 @@
+commit a291e4d5d73c13fc8076211b004e7349cd4bbf7d
+Author: Gonéri Le Bouder <goneri@rulezlan.org>
+Date:   Mon Nov 28 21:37:48 2011 +0100
+
+    try to use ssl_opts on LWP<6 too
+    
+    previously this block was only for LWP6. For some modern
+    LWP5/Crypt::SSLeay also need it, I use an eval here to avoid
+    failure on ancient LWP::UserAgent with no ssl_opts()
+    
+    closes: #1161
+    
+    Reported-by: Remi Collet <fedora@famillecollet.com>
+
+diff --git a/lib/FusionInventory/Agent/Network.pm b/lib/FusionInventory/Agent/Network.pm
+index b349de5..6bc6fbf 100644
+--- a/lib/FusionInventory/Agent/Network.pm
++++ b/lib/FusionInventory/Agent/Network.pm
+@@ -107,8 +107,11 @@ sub createUA {
+ 
+     my $ua = LWP::UserAgent->new(keep_alive => 1, requests_redirectable => ['POST', 'GET', 'HEAD']);
+ 
+-
+-    if ($LWP::VERSION >= 6) {
++    # previously this block was only for LWP6.
++    # For some modern LWP5/Crypt::SSLeay also need it, I use
++    # an eval here to avoid failure on ancient LWP::UserAgent with
++    # no ssl_opts()
++    eval {
+         # LWP6 default behavior is to check the SSL hostname
+         if ($config->{'no-ssl-check'}) {
+             $ua->ssl_opts(verify_hostname => 0);
+@@ -119,7 +122,7 @@ sub createUA {
+         if ($config->{'ca-cert-dir'}) {
+             $ua->ssl_opts(SSL_ca_path => $config->{'ca-cert-dir'});
+         }
+-    }
++    };
+ 
+     if ($noProxy) {
+ 
+commit 5001036e8eabac54a5058306c44793df325109a2
+Author: Gonéri Le Bouder <goneri@rulezlan.org>
+Date:   Mon Nov 28 21:39:21 2011 +0100
+
+    improve the regex used to parse the SSL-Cert
+    
+     - Drop the port from the hostname
+     - Use a wildcare only if there is a domain
+
+diff --git a/lib/FusionInventory/Agent/Network.pm b/lib/FusionInventory/Agent/Network.pm
+index 6bc6fbf..96d7513 100644
+--- a/lib/FusionInventory/Agent/Network.pm
++++ b/lib/FusionInventory/Agent/Network.pm
+@@ -362,9 +362,10 @@ sub setSslRemoteHost {
+     # Check server name against provided SSL certificate
+         if ( $self->{URI} =~ /^https:\/\/([^\/]+).*$/i ) {
+             my $re = $1;
++            $re =~ s/:\d+//;
+ # Accept SSL cert will hostname with wild-card
+ # http://forge.fusioninventory.org/issues/542
+-            $re =~ s/^([^\.]+)/($1|\\*)/;
++            $re =~ s/^([^\.]+)\.(.+)/($1|\\*)/;
+ # protect some characters, $re will be evaluated as a regex
+             $re =~ s/([\-\.])/\\$1/g;
+             $ua->default_header('If-SSL-Cert-Subject' => '/CN='.$re.'($|\/)');
+commit 8035bde109d9684dac5fd9369ce6a7a641c54f99
+Author: Gonéri Le Bouder <goneri@rulezlan.org>
+Date:   Mon Nov 28 21:48:52 2011 +0100
+
+    SSL: skip some test on LWP<6
+    
+    Those cases are just unsupported.
+    
+    closes: #1161
+    
+    Reported-by: Remi Collet <fedora@famillecollet.com>
+
+diff --git a/t/ssl.t b/t/ssl.t
+index ff8c25e..d8b384f 100644
+--- a/t/ssl.t
++++ b/t/ssl.t
+@@ -107,10 +107,14 @@ $server->set_dispatch({
+ });
+ $server->background();
+ 
++
++SKIP: {
++skip "Too all LWP for alternate hostname", 1 unless $LWP::VERSION >= 6;
+ ok(
+     $secure_client->send({message => $message}),
+     'trusted certificate, alternate hostname: connection success'
+ );
++}
+ 
+ $server->stop();
+ 
+@@ -161,10 +165,14 @@ ok(
+     'untrusted certificate, correct hostname: connection failure'
+ );
+ 
++SKIP: {
++skip "Check disabled on LWP<6", 1 unless $LWP::VERSION >= 6;
++# Unless you wan to fix this
+ ok(
+     $unsafe_client->send({message => $message}),
+     'untrusted certificate, correct hostname, no check: connection success'
+ );
++}
+ 
+ $server->stop();
+ 
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 517a63e..3cc0702 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -8,26 +8,34 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.1.9
+Version:     2.1.12
 
 %if 0%{?gitver:1}
 Release:   0.1.git%{gitver}%{?dist}
 # From http://github.com/fusinv/fusioninventory-agent/tarball/master
 Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
 %else
-Release:   3%{?dist}
+Release:   1%{?dist}
 Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 %endif
 
 Source1:   %{name}.cron
 Source2:   %{name}.init
 
+Patch0:    %{name}-git.patch
+
+
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: perl(Module::Install)
 # For tests 
 BuildRequires: perl(Time::HiRes) perl(XML::Simple) perl(UNIVERSAL::require) perl(Test::More)
+BuildRequires: perl(Class::Accessor::Fast) perl(Class::Data::Inheritable) perl(Test::Exception)
+%if 0%{?fedora} >= 14
+BuildRequires: perl(LWP::Protocol::https) perl(IO::Socket::SSL)
+BuildRequires: perl(HTTP::Server::Simple::Authen) perl(CGI)
+%endif
 %if 0%{?fedora}>= 12 || 0%{?rhel} >= 5
 BuildRequires: perl(XML::TreePP)
 %endif
@@ -128,6 +136,8 @@ Le service doit être actif et lancé avec l'option --rpc-trust-localhost.
 %setup -q -n FusionInventory-Agent-%{version}%{?prever}
 %endif
 
+%patch0 -p1
+
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
 #!/bin/sh
@@ -220,6 +230,11 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %check
+%if 0%{?rhel} || 0%{?fedora} < 14
+# requires perl(HTTP::Server::Simple::Authen) not yet available
+rm t/ssl.t
+%endif
+
 make test
 
 
@@ -249,9 +264,6 @@ exit 0
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS Changes LICENSE THANKS
-%if ! 0%{?gitver:1}
-%doc README*
-%endif
 %dir %{_sysconfdir}/fusioninventory
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -276,6 +288,11 @@ exit 0
 
 
 %changelog
+* Mon Nov 28 2011 Remi Collet <remi@fedoraproject.org> - 2.1.12-1
+- update to 2.1.12
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.12/Changes
+- upstream patch for http://forge.fusioninventory.org/issues/1161
+
 * Sat Aug 06 2011 Remi Collet <remi@fedoraproject.org> - 2.1.9-3
 - adapt filter
 
diff --git a/sources b/sources
index 7675b82..27bbf1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e7f5dd004e6ca4edfcab0fc3dcbe422  FusionInventory-Agent-2.1.9.tar.gz
+5ef5237d3504c0651fcbdb1a04d1cd26  FusionInventory-Agent-2.1.12.tar.gz

From 02f9fb2fdf06bf1884cde98b5223e5a3c6750457 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 12 Jan 2012 20:51:38 -0600
Subject: [PATCH 006/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 3cc0702..3c982dc 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -11,7 +11,7 @@ URL:         http://fusioninventory.org/
 Version:     2.1.12
 
 %if 0%{?gitver:1}
-Release:   0.1.git%{gitver}%{?dist}
+Release:   0.2.git%{gitver}%{?dist}
 # From http://github.com/fusinv/fusioninventory-agent/tarball/master
 Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
 %else
@@ -288,6 +288,9 @@ exit 0
 
 
 %changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.12-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Mon Nov 28 2011 Remi Collet <remi@fedoraproject.org> - 2.1.12-1
 - update to 2.1.12
   http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.12/Changes

From 3b4ede24ad3854a3a4abc6fe3207ca43107bf2c0 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 15 Jan 2012 12:50:48 -0600
Subject: [PATCH 007/106] bumpscript got confused with the multiple Releases in
 different %if areas

---
 fusioninventory-agent.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 3c982dc..555fa96 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -15,7 +15,7 @@ Release:   0.2.git%{gitver}%{?dist}
 # From http://github.com/fusinv/fusioninventory-agent/tarball/master
 Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
 %else
-Release:   1%{?dist}
+Release:   2%{?dist}
 Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 %endif
 
@@ -288,7 +288,7 @@ exit 0
 
 
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.12-1
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Mon Nov 28 2011 Remi Collet <remi@fedoraproject.org> - 2.1.12-1

From 4f0079f30426b6f36964794084dc96def26d18b2 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Sun, 26 Feb 2012 14:30:08 +0100
Subject: [PATCH 008/106] update to 2.1.14

---
 .gitignore                      |   1 +
 fusioninventory-agent-git.patch | 112 --------------------------------
 fusioninventory-agent.spec      |  15 ++---
 sources                         |   2 +-
 4 files changed, 7 insertions(+), 123 deletions(-)
 delete mode 100644 fusioninventory-agent-git.patch

diff --git a/.gitignore b/.gitignore
index bfb8c90..9e21164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *spec~
 /FusionInventory-Agent-2.1.9.tar.gz
 /FusionInventory-Agent-2.1.12.tar.gz
+/FusionInventory-Agent-2.1.14.tar.gz
diff --git a/fusioninventory-agent-git.patch b/fusioninventory-agent-git.patch
deleted file mode 100644
index 9b131dc..0000000
--- a/fusioninventory-agent-git.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-commit a291e4d5d73c13fc8076211b004e7349cd4bbf7d
-Author: Gonéri Le Bouder <goneri@rulezlan.org>
-Date:   Mon Nov 28 21:37:48 2011 +0100
-
-    try to use ssl_opts on LWP<6 too
-    
-    previously this block was only for LWP6. For some modern
-    LWP5/Crypt::SSLeay also need it, I use an eval here to avoid
-    failure on ancient LWP::UserAgent with no ssl_opts()
-    
-    closes: #1161
-    
-    Reported-by: Remi Collet <fedora@famillecollet.com>
-
-diff --git a/lib/FusionInventory/Agent/Network.pm b/lib/FusionInventory/Agent/Network.pm
-index b349de5..6bc6fbf 100644
---- a/lib/FusionInventory/Agent/Network.pm
-+++ b/lib/FusionInventory/Agent/Network.pm
-@@ -107,8 +107,11 @@ sub createUA {
- 
-     my $ua = LWP::UserAgent->new(keep_alive => 1, requests_redirectable => ['POST', 'GET', 'HEAD']);
- 
--
--    if ($LWP::VERSION >= 6) {
-+    # previously this block was only for LWP6.
-+    # For some modern LWP5/Crypt::SSLeay also need it, I use
-+    # an eval here to avoid failure on ancient LWP::UserAgent with
-+    # no ssl_opts()
-+    eval {
-         # LWP6 default behavior is to check the SSL hostname
-         if ($config->{'no-ssl-check'}) {
-             $ua->ssl_opts(verify_hostname => 0);
-@@ -119,7 +122,7 @@ sub createUA {
-         if ($config->{'ca-cert-dir'}) {
-             $ua->ssl_opts(SSL_ca_path => $config->{'ca-cert-dir'});
-         }
--    }
-+    };
- 
-     if ($noProxy) {
- 
-commit 5001036e8eabac54a5058306c44793df325109a2
-Author: Gonéri Le Bouder <goneri@rulezlan.org>
-Date:   Mon Nov 28 21:39:21 2011 +0100
-
-    improve the regex used to parse the SSL-Cert
-    
-     - Drop the port from the hostname
-     - Use a wildcare only if there is a domain
-
-diff --git a/lib/FusionInventory/Agent/Network.pm b/lib/FusionInventory/Agent/Network.pm
-index 6bc6fbf..96d7513 100644
---- a/lib/FusionInventory/Agent/Network.pm
-+++ b/lib/FusionInventory/Agent/Network.pm
-@@ -362,9 +362,10 @@ sub setSslRemoteHost {
-     # Check server name against provided SSL certificate
-         if ( $self->{URI} =~ /^https:\/\/([^\/]+).*$/i ) {
-             my $re = $1;
-+            $re =~ s/:\d+//;
- # Accept SSL cert will hostname with wild-card
- # http://forge.fusioninventory.org/issues/542
--            $re =~ s/^([^\.]+)/($1|\\*)/;
-+            $re =~ s/^([^\.]+)\.(.+)/($1|\\*)/;
- # protect some characters, $re will be evaluated as a regex
-             $re =~ s/([\-\.])/\\$1/g;
-             $ua->default_header('If-SSL-Cert-Subject' => '/CN='.$re.'($|\/)');
-commit 8035bde109d9684dac5fd9369ce6a7a641c54f99
-Author: Gonéri Le Bouder <goneri@rulezlan.org>
-Date:   Mon Nov 28 21:48:52 2011 +0100
-
-    SSL: skip some test on LWP<6
-    
-    Those cases are just unsupported.
-    
-    closes: #1161
-    
-    Reported-by: Remi Collet <fedora@famillecollet.com>
-
-diff --git a/t/ssl.t b/t/ssl.t
-index ff8c25e..d8b384f 100644
---- a/t/ssl.t
-+++ b/t/ssl.t
-@@ -107,10 +107,14 @@ $server->set_dispatch({
- });
- $server->background();
- 
-+
-+SKIP: {
-+skip "Too all LWP for alternate hostname", 1 unless $LWP::VERSION >= 6;
- ok(
-     $secure_client->send({message => $message}),
-     'trusted certificate, alternate hostname: connection success'
- );
-+}
- 
- $server->stop();
- 
-@@ -161,10 +165,14 @@ ok(
-     'untrusted certificate, correct hostname: connection failure'
- );
- 
-+SKIP: {
-+skip "Check disabled on LWP<6", 1 unless $LWP::VERSION >= 6;
-+# Unless you wan to fix this
- ok(
-     $unsafe_client->send({message => $message}),
-     'untrusted certificate, correct hostname, no check: connection success'
- );
-+}
- 
- $server->stop();
- 
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 555fa96..3b5deec 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -8,7 +8,7 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.1.12
+Version:     2.1.14
 
 %if 0%{?gitver:1}
 Release:   0.2.git%{gitver}%{?dist}
@@ -22,8 +22,6 @@ Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Ag
 Source1:   %{name}.cron
 Source2:   %{name}.init
 
-Patch0:    %{name}-git.patch
-
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,8 +134,6 @@ Le service doit être actif et lancé avec l'option --rpc-trust-localhost.
 %setup -q -n FusionInventory-Agent-%{version}%{?prever}
 %endif
 
-%patch0 -p1
-
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
 #!/bin/sh
@@ -230,11 +226,6 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %check
-%if 0%{?rhel} || 0%{?fedora} < 14
-# requires perl(HTTP::Server::Simple::Authen) not yet available
-rm t/ssl.t
-%endif
-
 make test
 
 
@@ -288,6 +279,10 @@ exit 0
 
 
 %changelog
+* Sun Feb 26 2012 Remi Collet <remi@fedoraproject.org> - 2.1.14-1
+- update to 2.1.14
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.14/Changes
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 27bbf1d..f0c3c0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ef5237d3504c0651fcbdb1a04d1cd26  FusionInventory-Agent-2.1.12.tar.gz
+4f8b8f59e028f21e6d04aa469ce4c676  FusionInventory-Agent-2.1.14.tar.gz

From 2314fa190bf6214a31253cec7e665b884bb06972 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Thu, 10 May 2012 19:23:17 +0200
Subject: [PATCH 009/106] update to 2.2.0

---
 .gitignore                       |   1 +
 fusioninventory-agent-arch.patch |  12 +++
 fusioninventory-agent.service    |  11 +++
 fusioninventory-agent.spec       | 152 +++++++++++++++++++------------
 sources                          |   2 +-
 5 files changed, 120 insertions(+), 58 deletions(-)
 create mode 100644 fusioninventory-agent-arch.patch
 create mode 100644 fusioninventory-agent.service

diff --git a/.gitignore b/.gitignore
index 9e21164..90b9c7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /FusionInventory-Agent-2.1.9.tar.gz
 /FusionInventory-Agent-2.1.12.tar.gz
 /FusionInventory-Agent-2.1.14.tar.gz
+/FusionInventory-Agent-2.2.0.tar.gz
diff --git a/fusioninventory-agent-arch.patch b/fusioninventory-agent-arch.patch
new file mode 100644
index 0000000..a882db6
--- /dev/null
+++ b/fusioninventory-agent-arch.patch
@@ -0,0 +1,12 @@
+diff -up FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm.orig FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm
+--- FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm.orig	2012-04-16 09:33:21.000000000 +0200
++++ FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm	2012-04-16 09:33:32.000000000 +0200
+@@ -17,7 +17,7 @@ sub doInventory {
+ 
+     my $command =
+         'rpm -qa --queryformat \'' .
+-        '%{NAME}\t' .
++        '%{NAME}.%{ARCH}\t' .
+         '%{VERSION}-%{RELEASE}\t' .
+         '%{INSTALLTIME:date}\t' .
+         '%{SIZE}\t' .
diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service
new file mode 100644
index 0000000..76b60c7
--- /dev/null
+++ b/fusioninventory-agent.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=FusionInventory agent
+After=syslog.target network.target
+
+[Service]
+EnvironmentFile=/etc/sysconfig/fusioninventory-agent
+ExecStart=/usr/bin/fusioninventory-agent $FUSINVOPT --logfile=/var/log/fusioninventory-agent/service.log --daemon-no-fork
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 3b5deec..f39f07d 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -1,5 +1,8 @@
-#global gitver 9bd1238
-#global prever _beta1
+%if 0%{?fedora} >= 18
+%global  with_systemd  1
+%else
+%global  with_systemd  0
+%endif
 
 Name:        fusioninventory-agent
 Summary:     FusionInventory agent
@@ -8,19 +11,18 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.1.14
-
-%if 0%{?gitver:1}
-Release:   0.2.git%{gitver}%{?dist}
-# From http://github.com/fusinv/fusioninventory-agent/tarball/master
-Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
-%else
-Release:   2%{?dist}
-Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
-%endif
+Version:     2.2.0
+Release:     1%{?dist}
+Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
 Source2:   %{name}.init
+Source3:   %{name}.service
+
+# See http://forge.fusioninventory.org/issues/1581
+# Upstream desagree on this patch, but it will avoid behavior change
+# until managed properly, as part of the XML file
+Patch0:    %{name}-arch.patch
 
 
 BuildArch: noarch
@@ -28,8 +30,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: perl(Module::Install)
 # For tests 
-BuildRequires: perl(Time::HiRes) perl(XML::Simple) perl(UNIVERSAL::require) perl(Test::More)
+BuildRequires: perl(Time::HiRes) perl(UNIVERSAL::require) perl(Test::More)
 BuildRequires: perl(Class::Accessor::Fast) perl(Class::Data::Inheritable) perl(Test::Exception)
+BuildRequires: perl(File::Which) perl(IPC::Run) perl(Test::MockModule) perl(Text::Template)
+BuildRequires: perl(IO::Capture::Stderr) perl(Net::IP) perl(YAML)
 %if 0%{?fedora} >= 14
 BuildRequires: perl(LWP::Protocol::https) perl(IO::Socket::SSL)
 BuildRequires: perl(HTTP::Server::Simple::Authen) perl(CGI)
@@ -41,19 +45,30 @@ BuildRequires: perl(XML::TreePP)
 BuildRequires: perl(JSON)
 %endif
 %if 0%{?fedora} >= 11
-BuildRequires: perl(Test::Compile)
+BuildRequires: perl(Test::Compile) perl(HTTP::Proxy)
+%endif
+%if %{with_systemd}
+BuildRequires: systemd-units
 %endif
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:  perl(LWP) perl(Net::IP) perl(HTTP::Status) perl(Net::SSLeay) perl(Crypt::SSLeay)
+Requires:  perl(LWP) perl(Net::IP) perl(HTTP::Status) perl(Net::SSLeay)
 Requires:  perl(Proc::Daemon) perl(Proc::PID::File)
 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-Requires:  perl(Archive::Extract)
 Requires:  perl(Net::CUPS)
 %endif
+%if %{with_systemd}
+# We require this to be present for /etc/tmpfiles.d
+Requires: systemd-units
+# Make sure it's there when scriptlets run, too
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
+%endif
 
 
 # RPM 4.8
@@ -73,12 +88,12 @@ or GLPI server with the FusionInventory for GLPI plugin.
 
 You can add additional packages for optional tasks:
 
-* perl-FusionInventory-Agent-Task-OcsDeploy
-    OCS Inventory Software deployment support
 * perl-FusionInventory-Agent-Task-NetDiscovery
     Network Discovery support
-* perl-FusionInventory-Agent-Task-SNMPQuery
-    SNMP Query support
+* perl-FusionInventory-Agent-Task-NetInventory
+    Network Inventory support
+* perl-FusionInventory-Agent-Task-Deploy
+    Software deployment support
 * perl-FusionInventory-Agent-Task-ESX
     vCenter/ESX/ESXi remote inventory
 
@@ -94,12 +109,12 @@ OCS Inventory NG ou à un serveur GLPI disposant de l'extension FusionInventory.
 
 Vous pouvez ajouter les paquets additionnels pour les tâches optionnelles :
 
-* perl-FusionInventory-Agent-Task-OcsDeploy
-    Gestion du déploiement logiciel OCS Inventory
 * perl-FusionInventory-Agent-Task-NetDiscovery
     Gestion de la découverte réseau
-* perl-FusionInventory-Agent-Task-SNMPQuery
-    Gestion de l'interrogation SNMP
+* perl-FusionInventory-Agent-Task-NetInventory
+    Gestion de l'inventaire réseau
+* perl-FusionInventory-Agent-Task-Deploy
+    Gestion de déploiement de logiciels
 * perl-FusionInventory-Agent-Task-ESX
     Inventaire à distance des vCenter/ESX/ESXi
 
@@ -128,11 +143,9 @@ inventaire à la fin de l'exécution de yum.
 Le service doit être actif et lancé avec l'option --rpc-trust-localhost.
 
 %prep
-%if 0%{?gitver:1}
-%setup -q -n fusinv-fusioninventory-agent-%{gitver}
-%else
 %setup -q -n FusionInventory-Agent-%{version}%{?prever}
-%endif
+
+%patch0 -p1 -b .rpmarch
 
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
@@ -141,11 +154,7 @@ cat <<EOF | tee %{name}-req
 sed -e '/perl(Win32/d'
 EOF
 
-%if 0%{?gitver:1}
-%global __perl_requires %{_builddir}/fusinv-fusioninventory-agent-%{gitver}/%{name}-req
-%else
 %global __perl_requires %{_builddir}/FusionInventory-Agent-%{version}%{?prever}/%{name}-req
-%endif
 chmod +x %{__perl_requires}
 
 cat <<EOF | tee logrotate
@@ -168,12 +177,15 @@ cat <<EOF | tee %{name}.conf
 # Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 # Global options (debug for verbose log, rpc-trust-localhost for yum-plugin)
-FUSINVOPT='--debug --rpc-trust-localhost'
+FUSINVOPT="--debug --rpc-trust-localhost"
 # Mode, change to "cron" or "daemon" to activate
 # - none (default on install) no activity
 # - cron (inventory only) use the cron.hourly
+%if %{with_systemd}
+# NB systemd service launcher only use FUSINVOPT and agent.cfg
+%else
 # - daemon (recommanded) use the service
-#   DON'T FORGET to enable the service
+%endif
 OCSMODE[0]=none
 # OCS Inventory or FusionInventory server URI
 # OCSSERVER[0]=your.ocsserver.name
@@ -187,38 +199,35 @@ OCSPAUSE[0]=120
 OCSTAG[0]=
 EOF
 
-cat <<EOF | tee agent.cfg
-# This file provides global and command line settings
-# For CRON or DAEMON configuration, see %{_sysconfdir}/sysconfig/%{name}
-share-dir=%{perl_vendorlib}/auto/share/dist/FusionInventory-Agent
-basevardir=%{_localstatedir}/lib/%{name}
-logger=Stderr
-server=""
-EOF
-
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL \
+     PREFIX=%{_prefix} \
+     SYSCONFDIR=%{_sysconfdir}/fusioninventory \
+     LOCALSTATEDIR=%{_localstatedir}/lib/%{name}
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 
-make pure_install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
 
 %{_fixperms} %{buildroot}/*
 
-
 mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
 
-install -m 644 -D  logrotate    %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-install -m 644 -D  %{name}.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-install -m 644 -D  agent.cfg    %{buildroot}%{_sysconfdir}/fusioninventory/agent.cfg
-install -m 755 -Dp %{SOURCE1}   %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
-install -m 755 -Dp %{SOURCE2}   %{buildroot}%{_initrddir}/%{name}
+install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
+%if %{with_systemd}
+install -m 644 -Dp %{SOURCE3}    %{buildroot}%{_unitdir}/%{name}.service
+%else
+install -m 755 -Dp %{SOURCE2}    %{buildroot}%{_initrddir}/%{name}
+%endif
 
 # Yum plugin installation
 install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py
@@ -234,38 +243,61 @@ rm -rf %{buildroot} %{buildroot}%{_datarootdir}
 
 
 %post
-/sbin/chkconfig --add %{name}
-
+%if %{with_systemd}
+/sbin/chkconfig --del %{name} &>/dev/null || :
+/bin/systemctl daemon-reload &>/dev/null || :
+%else
+if [ $1 = 1 ]; then
+    # Initial installation
+    /sbin/chkconfig --add %{name} || :
+fi
+%endif
+exit 0
 
 %preun
 if [ $1 -eq 0 ] ; then
+%if %{with_systemd}
+    /bin/systemctl --no-reload disable %{name}.service &>/dev/null
+    /bin/systemctl stop %{name}.service &>/dev/null
+%else
     /sbin/service %{name} stop &>/dev/null
     /sbin/chkconfig --del %{name}
+%endif
 fi
 exit 0
 
 
 %postun
+%if %{with_systemd}
+/bin/systemctl daemon-reload &>/dev/null
+if [ $1 -ge 1 ]; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart %{name}.service &>/dev/null
+fi
+%else
 if [ $1 -ge 1 ]; then
     /sbin/service %{name} condrestart &>/dev/null
 fi
+%endif
 exit 0
 
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS Changes LICENSE THANKS
+%doc Changes LICENSE THANKS
 %dir %{_sysconfdir}/fusioninventory
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg
 %{_sysconfdir}/cron.hourly/%{name}
+%if %{with_systemd}
+%{_unitdir}/%{name}.service
+%else
 %{_initrddir}/%{name}
-%{perl_vendorlib}/FusionInventory
-%{perl_vendorlib}/auto
+%endif
+%{_datadir}/fusioninventory
 %{_bindir}/fusioninventory-agent
 %{_bindir}/fusioninventory-injector
-%exclude %{_bindir}/%{name}-config
 %{_mandir}/man1/fusioninventory-agent*
 %{_mandir}/man1/fusioninventory-injector*
 %{_mandir}/man3/Fusion*
@@ -279,6 +311,12 @@ exit 0
 
 
 %changelog
+* Thu May 10 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
+- update to 2.2.0
+  http://search.cpan.org/src/FUSINV/FusionInventory-Agent-2.2.0/Changes
+- revert change in 2.2.0: don't loose arch information
+  see http://forge.fusioninventory.org/issues/1581
+
 * Sun Feb 26 2012 Remi Collet <remi@fedoraproject.org> - 2.1.14-1
 - update to 2.1.14
   http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.14/Changes
diff --git a/sources b/sources
index f0c3c0f..4cf67d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f8b8f59e028f21e6d04aa469ce4c676  FusionInventory-Agent-2.1.14.tar.gz
+2fe514a3717653d98339cbd67ca94adf  FusionInventory-Agent-2.2.0.tar.gz

From e2a9ec14ed2f5a984a5fa08dbcffd8175fbc1053 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Fri, 11 May 2012 16:31:24 +0200
Subject: [PATCH 010/106] filter private provides/requires

---
 fusioninventory-agent.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index f39f07d..d8ce25f 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -12,7 +12,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.2.0
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
@@ -72,10 +72,14 @@ Requires(postun): /sbin/service
 
 
 # RPM 4.8
+%{?filter_from_provides: %filter_from_provides /perl(FusionInventory::/d}
 %{?filter_from_requires: %filter_from_requires /perl(Win32/d}
+%{?filter_from_requires: %filter_from_requires /perl(FusionInventory::/d}
 %{?perl_default_filter}
 # RPM 4.9
-%global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(Win32
+%global __provides_exclude %{?__provides_exclude:__provides_exclude|}^perl\\(FusionInventory::
+%global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(FusionInventory::
+%global __requires_exclude %__requires_exclude|^perl\\(Win32
 
 
 %description
@@ -311,6 +315,9 @@ exit 0
 
 
 %changelog
+* Fri May 11 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-2
+- filter private provides/requires
+
 * Thu May 10 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
 - update to 2.2.0
   http://search.cpan.org/src/FUSINV/FusionInventory-Agent-2.2.0/Changes

From 795533f407bca5fa20e6fc90027ff0f9af78a8a1 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Wed, 30 May 2012 18:11:42 +0200
Subject: [PATCH 011/106] update to 2.2.1

---
 .gitignore                 |  1 +
 fusioninventory-agent.spec | 20 ++++++--------------
 sources                    |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90b9c7a..6697533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /FusionInventory-Agent-2.1.12.tar.gz
 /FusionInventory-Agent-2.1.14.tar.gz
 /FusionInventory-Agent-2.2.0.tar.gz
+/FusionInventory-Agent-2.2.1.tar.gz
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index d8ce25f..fa4a24f 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -11,20 +11,14 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.2.0
-Release:     2%{?dist}
+Version:     2.2.1
+Release:     1%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
 Source2:   %{name}.init
 Source3:   %{name}.service
 
-# See http://forge.fusioninventory.org/issues/1581
-# Upstream desagree on this patch, but it will avoid behavior change
-# until managed properly, as part of the XML file
-Patch0:    %{name}-arch.patch
-
-
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,9 +35,7 @@ BuildRequires: perl(HTTP::Server::Simple::Authen) perl(CGI)
 %if 0%{?fedora}>= 12 || 0%{?rhel} >= 5
 BuildRequires: perl(XML::TreePP)
 %endif
-%if 0%{?fedora}>= 10 || 0%{?rhel} >= 5
 BuildRequires: perl(JSON)
-%endif
 %if 0%{?fedora} >= 11
 BuildRequires: perl(Test::Compile) perl(HTTP::Proxy)
 %endif
@@ -54,9 +46,7 @@ BuildRequires: systemd-units
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(LWP) perl(Net::IP) perl(HTTP::Status) perl(Net::SSLeay)
 Requires:  perl(Proc::Daemon) perl(Proc::PID::File)
-%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
 Requires:  perl(Net::CUPS)
-%endif
 %if %{with_systemd}
 # We require this to be present for /etc/tmpfiles.d
 Requires: systemd-units
@@ -149,8 +139,6 @@ Le service doit être actif et lancé avec l'option --rpc-trust-localhost.
 %prep
 %setup -q -n FusionInventory-Agent-%{version}%{?prever}
 
-%patch0 -p1 -b .rpmarch
-
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
 #!/bin/sh
@@ -315,6 +303,10 @@ exit 0
 
 
 %changelog
+* Wed May 30 2012 Remi Collet <remi@fedoraproject.org> - 2.2.1-1
+- update to 2.2.1
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.1/Changes
+
 * Fri May 11 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-2
 - filter private provides/requires
 
diff --git a/sources b/sources
index 4cf67d6..3b9465e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fe514a3717653d98339cbd67ca94adf  FusionInventory-Agent-2.2.0.tar.gz
+3140719eb6cac9c8338f191e4d231a5e  FusionInventory-Agent-2.2.1.tar.gz

From 72b078814a935fa21810dfef40481da6eee114a4 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Wed, 30 May 2012 18:25:36 +0200
Subject: [PATCH 012/106] update to 2.2.2

---
 .gitignore                 | 1 +
 fusioninventory-agent.spec | 7 ++++---
 sources                    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6697533..e915df8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /FusionInventory-Agent-2.1.14.tar.gz
 /FusionInventory-Agent-2.2.0.tar.gz
 /FusionInventory-Agent-2.2.1.tar.gz
+/FusionInventory-Agent-2.2.2.tar.gz
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index fa4a24f..33970c6 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -11,7 +11,7 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.2.1
+Version:     2.2.2
 Release:     1%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
@@ -303,8 +303,9 @@ exit 0
 
 
 %changelog
-* Wed May 30 2012 Remi Collet <remi@fedoraproject.org> - 2.2.1-1
-- update to 2.2.1
+* Wed May 30 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-1
+- update to 2.2.2
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.2/Changes
   http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.1/Changes
 
 * Fri May 11 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-2
diff --git a/sources b/sources
index 3b9465e..f196685 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3140719eb6cac9c8338f191e4d231a5e  FusionInventory-Agent-2.2.1.tar.gz
+eb6527b79c94ba607a3f19e71226643c  FusionInventory-Agent-2.2.2.tar.gz

From 402d49d5e3e6f84838a0b4e41fe9d78aa6476c36 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Wed, 30 May 2012 18:32:09 +0200
Subject: [PATCH 013/106] minor fix

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 33970c6..970e2a4 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -22,7 +22,7 @@ Source3:   %{name}.service
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl(Module::Install)
+BuildRequires: perl(inc::Module::Install)
 # For tests 
 BuildRequires: perl(Time::HiRes) perl(UNIVERSAL::require) perl(Test::More)
 BuildRequires: perl(Class::Accessor::Fast) perl(Class::Data::Inheritable) perl(Test::Exception)
@@ -229,6 +229,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %check
 make test
 
+# Use system ones
+rm -rf inc/*
+
 
 %clean
 rm -rf %{buildroot} %{buildroot}%{_datarootdir}

From 7b7f4482d4710ea00ba35834c7155f1d01ef25b9 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Thu, 31 May 2012 17:58:56 +0200
Subject: [PATCH 014/106] make "arch" to allow conditionnal requires of
 dmidecode

---
 fusioninventory-agent.spec | 42 ++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 970e2a4..b2db438 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -12,14 +12,13 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.2.2
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
 Source2:   %{name}.init
 Source3:   %{name}.service
 
-BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: perl(inc::Module::Install)
@@ -43,10 +42,11 @@ BuildRequires: perl(Test::Compile) perl(HTTP::Proxy)
 BuildRequires: systemd-units
 %endif
 
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:  perl(LWP) perl(Net::IP) perl(HTTP::Status) perl(Net::SSLeay)
-Requires:  perl(Proc::Daemon) perl(Proc::PID::File)
-Requires:  perl(Net::CUPS)
+Requires:  perl-FusionInventory-Agent = %{version}-%{release}
+%ifarch %{ix86} x86_64
+Requires:  dmidecode
+%endif
+
 %if %{with_systemd}
 # We require this to be present for /etc/tmpfiles.d
 Requires: systemd-units
@@ -115,6 +115,22 @@ Vous pouvez ajouter les paquets additionnels pour les tâches optionnelles :
 Modifier le fichier /etc/sysconfig/%{name} pour configurer
 le service.
 
+%package -n perl-FusionInventory-Agent
+Summary:        Librairies for Fusioninventory agent
+Summary(fr):    Bibliothèques de l'agent Fusioninventory
+BuildArch:      noarch
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(LWP)
+Requires:       perl(Net::CUPS)
+Requires:       perl(Net::SSLeay)
+Requires:       perl(Proc::Daemon)
+Requires:       perl(Proc::PID::File)
+
+%description -n perl-FusionInventory-Agent
+Librairies for Fusioninventory agent.
+
+%description -l fr -n perl-FusionInventory-Agent
+Bibliothèques de l'agent Fusioninventory.
 
 %package yum-plugin
 Summary:       Ask FusionInventory agent to send an inventory when yum exits
@@ -279,7 +295,6 @@ exit 0
 
 %files
 %defattr(-, root, root, -)
-%doc Changes LICENSE THANKS
 %dir %{_sysconfdir}/fusioninventory
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -290,15 +305,19 @@ exit 0
 %else
 %{_initrddir}/%{name}
 %endif
-%{_datadir}/fusioninventory
 %{_bindir}/fusioninventory-agent
 %{_bindir}/fusioninventory-injector
 %{_mandir}/man1/fusioninventory-agent*
 %{_mandir}/man1/fusioninventory-injector*
-%{_mandir}/man3/Fusion*
 %dir %{_localstatedir}/log/%{name}
 %dir %{_localstatedir}/lib/%{name}
 
+%files -n perl-FusionInventory-Agent
+%defattr(-, root, root, -)
+%doc Changes LICENSE THANKS
+%{_datadir}/fusioninventory
+%{_mandir}/man3/Fusion*
+
 %files yum-plugin
 %defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf
@@ -306,6 +325,11 @@ exit 0
 
 
 %changelog
+* Thu May 31 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-2
+- make package "arch"
+- requires dmidecode when available (x86)
+- add sub-package perl-FusionInventory-Agent (noarch)
+
 * Wed May 30 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-1
 - update to 2.2.2
   http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.2/Changes

From 553a3dd6745d929ae17303da2fe69c1fb3a234a8 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Tue, 5 Jun 2012 18:37:56 +0200
Subject: [PATCH 015/106] remove debuginfo, fix #828960

---
 fusioninventory-agent.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index b2db438..8ab4bc6 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -1,3 +1,4 @@
+%global  debug_package %nil
 %if 0%{?fedora} >= 18
 %global  with_systemd  1
 %else
@@ -12,7 +13,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.2.2
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
@@ -136,6 +137,7 @@ Bibliothèques de l'agent Fusioninventory.
 Summary:       Ask FusionInventory agent to send an inventory when yum exits
 Summary(fr):   Demande à l'agent FusionInventory l'envoi d'un inventaire
 Group:         System Environment/Base
+BuildArch:     noarch
 BuildRequires: python-devel
 Requires:      yum >= 2.4
 Requires:      %{name}
@@ -325,6 +327,10 @@ exit 0
 
 
 %changelog
+* Tue Jun 05 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-3
+- no need for debuginfo (not really arch, fix #828960)
+- yum plugin is also noarch
+
 * Thu May 31 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-2
 - make package "arch"
 - requires dmidecode when available (x86)

From 3ab428fb65739f589dd176d353e32cec5a8bd3a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 25 Jun 2012 20:24:54 +0200
Subject: [PATCH 016/106] Perl 5.16 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 8ab4bc6..72d40db 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -13,7 +13,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.2.2
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
@@ -327,6 +327,9 @@ exit 0
 
 
 %changelog
+* Mon Jun 25 2012 Petr Pisar <ppisar@redhat.com> - 2.2.2-4
+- Perl 5.16 rebuild
+
 * Tue Jun 05 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-3
 - no need for debuginfo (not really arch, fix #828960)
 - yum plugin is also noarch

From 18f022793f0bebe0a1c067af993f5407abea59b7 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 18 Jul 2012 22:37:07 -0500
Subject: [PATCH 017/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 72d40db..3cbeb53 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -13,7 +13,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.2.2
-Release:     4%{?dist}
+Release:     5%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
@@ -327,6 +327,9 @@ exit 0
 
 
 %changelog
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Mon Jun 25 2012 Petr Pisar <ppisar@redhat.com> - 2.2.2-4
 - Perl 5.16 rebuild
 

From 5e36a20aa53832a612ada3a9eba2ed783b4701ac Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Wed, 8 Aug 2012 09:28:52 +0200
Subject: [PATCH 018/106] update to 2.2.4

---
 .gitignore                 | 1 +
 fusioninventory-agent.spec | 9 +++++++--
 sources                    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e915df8..fcbeafa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /FusionInventory-Agent-2.2.0.tar.gz
 /FusionInventory-Agent-2.2.1.tar.gz
 /FusionInventory-Agent-2.2.2.tar.gz
+/FusionInventory-Agent-2.2.4.tar.gz
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 3cbeb53..eac2c76 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -12,8 +12,8 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.2.2
-Release:     5%{?dist}
+Version:     2.2.4
+Release:     1%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
@@ -327,6 +327,11 @@ exit 0
 
 
 %changelog
+* Wed Aug  8 2012 Remi Collet <remi@fedoraproject.org> - 2.2.4-1
+- version 2.2.4 fixes various bugs as described in
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.4/Changes
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.3/Changes
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index f196685..596e7d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb6527b79c94ba607a3f19e71226643c  FusionInventory-Agent-2.2.2.tar.gz
+c3ce4ad7f2215d2aa4546b186c7c8926  FusionInventory-Agent-2.2.4.tar.gz

From f3ed2b6e6fe709c5119393138c9c9b3530350684 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Wed, 8 Aug 2012 17:20:10 +0200
Subject: [PATCH 019/106] bump release

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index eac2c76..981211d 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -13,7 +13,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.2.4
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
@@ -327,6 +327,9 @@ exit 0
 
 
 %changelog
+* Wed Aug  8 2012 Remi Collet <remi@fedoraproject.org> - 2.2.4-2
+- dump release
+
 * Wed Aug  8 2012 Remi Collet <remi@fedoraproject.org> - 2.2.4-1
 - version 2.2.4 fixes various bugs as described in
   http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.4/Changes

From 0f4ac461a7e0966e2605d2931bdfc891c64ed319 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Fri, 7 Sep 2012 09:38:43 +0200
Subject: [PATCH 020/106] lack of maintainer

---
 .gitignore                       |   8 -
 dead.package                     |   1 +
 fusioninventory-agent-arch.patch |  12 -
 fusioninventory-agent.cron       |  37 ---
 fusioninventory-agent.init       | 111 -------
 fusioninventory-agent.service    |  11 -
 fusioninventory-agent.spec       | 481 -------------------------------
 sources                          |   1 -
 8 files changed, 1 insertion(+), 661 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 dead.package
 delete mode 100644 fusioninventory-agent-arch.patch
 delete mode 100644 fusioninventory-agent.cron
 delete mode 100755 fusioninventory-agent.init
 delete mode 100644 fusioninventory-agent.service
 delete mode 100644 fusioninventory-agent.spec
 delete mode 100644 sources

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index fcbeafa..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*spec~
-/FusionInventory-Agent-2.1.9.tar.gz
-/FusionInventory-Agent-2.1.12.tar.gz
-/FusionInventory-Agent-2.1.14.tar.gz
-/FusionInventory-Agent-2.2.0.tar.gz
-/FusionInventory-Agent-2.2.1.tar.gz
-/FusionInventory-Agent-2.2.2.tar.gz
-/FusionInventory-Agent-2.2.4.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..7039d4c
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+lack of maintainer
diff --git a/fusioninventory-agent-arch.patch b/fusioninventory-agent-arch.patch
deleted file mode 100644
index a882db6..0000000
--- a/fusioninventory-agent-arch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm.orig FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm
---- FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm.orig	2012-04-16 09:33:21.000000000 +0200
-+++ FusionInventory-Agent-2.2.0/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Softwares/RPM.pm	2012-04-16 09:33:32.000000000 +0200
-@@ -17,7 +17,7 @@ sub doInventory {
- 
-     my $command =
-         'rpm -qa --queryformat \'' .
--        '%{NAME}\t' .
-+        '%{NAME}.%{ARCH}\t' .
-         '%{VERSION}-%{RELEASE}\t' .
-         '%{INSTALLTIME:date}\t' .
-         '%{SIZE}\t' .
diff --git a/fusioninventory-agent.cron b/fusioninventory-agent.cron
deleted file mode 100644
index e09c0db..0000000
--- a/fusioninventory-agent.cron
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-NAME=fusioninventory-agent
-LOG=/var/log/$NAME/$NAME.log
-
-exec >>$LOG 2>&1
-
-[ -f   /etc/sysconfig/$NAME ] || exit 0
-source /etc/sysconfig/$NAME
-export PATH
-
-i=0
-while [ $i -lt ${#OCSMODE[*]} ]
-do
-	if [ ${OCSMODE[$i]:-none} == cron ]; then
-		OPTS=
-		if [ ! -z "${OCSPAUSE[$i]}" ]; then
-			OPTS="--wait ${OCSPAUSE[$i]}"
-		fi
-
-		if [ ! -z "${OCSTAG[$i]}" ]; then
-		        OPTS="$OPTS --tag=${OCSTAG[$i]}"
-		fi
-
-		if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then
-	        	# Local inventory
-	        	OPTS="$OPTS --local=/var/lib/$NAME"
-		elif [ ! -z "${OCSSERVER[$i]}" ]; then
-	        	# Remote inventory
-		        OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}"
-		fi
-		echo "[$(date '+%c')] Running $NAME $OPTS"
-		/usr/bin/$NAME $FUSINVOPT --logfile=$LOG $OPTS
-	fi
-	((i++))
-done
-echo "[$(date '+%c')] End of cron job ($PATH)"
-
diff --git a/fusioninventory-agent.init b/fusioninventory-agent.init
deleted file mode 100755
index 4a488f2..0000000
--- a/fusioninventory-agent.init
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-#
-# chkconfig: - 88 12
-# description:	FusionInventory Agent
-# processname: fusioninventory-agent
-# config: /etc/sysconfig/fusioninventory-agent.pid
-# pidfile: /var/run/fusioninventory-agent.pid
-### BEGIN INIT INFO
-# Provides: fusioninventory-agent
-# Required-Start: $local_fs $remote_fs $network $named $syslog $time
-# Required-Stop: $local_fs $remote_fs $network $named $syslog $time
-# Default-Start:
-# Default-Stop: 0 1 6
-# Short-Description: FusionInventory agent
-# Description: FusionInventory agent
-### END INIT INFO
-
-# source function library
-. /etc/rc.d/init.d/functions
-
-RETVAL=0
-desc="FusionInventory Agent"
-prog=fusioninventory-agent
-lockfile=/var/lock/subsys/$prog
-pidfile=/var/run/$prog.pid
-logfile=/var/log/$prog/$prog.log
-
-# pull in sysconfig settings
-[ -r /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Read configuration
-	i=0
-	OPTS=
-	SERVERS=
-	while [ $i -lt ${#OCSMODE[*]} ]
-	do
-		if [ ${OCSMODE[$i]:-none} == daemon ]; then
-			if [ ! -z "${OCSTAG[$i]}" ]; then
-				OPTS="$OPTS --tag=${OCSTAG[$i]}"
-			fi
-			if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then
-				# Local inventory
-				OPTS="$OPTS --local=/var/lib/$prog"
-			elif [ ! -z "${OCSSERVER[$i]}" ]; then
-				# Remote inventory
-				if [ -z "$SERVERS" ]; then
-					SERVERS=${OCSSERVER[$i]}
-				else
-					SERVERS="$SERVERS,${OCSSERVER[$i]}"
-				fi
-			fi
-		fi
-		((i++))
-	done
-	if [ -n "$SERVERS" ]; then
-		OPTS="$OPTS --server=$SERVERS"
-	fi
-	if [ -n "$OPTS" ]; then
-		echo -n $"Starting $prog: "
-		daemon $prog --logfile-maxsize=999 --logfile=$logfile $FUSINVOPT --daemon $OPTS 2>/dev/null
-		RETVAL=$?
-		echo
-                [ $RETVAL -eq 0 ] && touch $lockfile
-	else
-		RETVAL=0
-	fi
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	echo -n $"Stopping $prog: "
-	killproc $prog
-	RETVAL=$?
-	echo
-	if [ $RETVAL -eq 0 ] ; then
-	    rm -f $lockfile $pidfile
-	fi
-}
-
-case "$1" in
-  start)
-	do_start
-	;;
-  stop)
-	do_stop
-	;;
-  status)
-	status $prog
-	;;
-  restart|reload|force-reload)
-	do_stop
-	do_start
-	;;
-  condrestart)
-	[ -f $lockfile ] && do_stop && do_start || :
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
-	exit 1
-	;;
-esac
-exit $RETVAL
-
diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service
deleted file mode 100644
index 76b60c7..0000000
--- a/fusioninventory-agent.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=FusionInventory agent
-After=syslog.target network.target
-
-[Service]
-EnvironmentFile=/etc/sysconfig/fusioninventory-agent
-ExecStart=/usr/bin/fusioninventory-agent $FUSINVOPT --logfile=/var/log/fusioninventory-agent/service.log --daemon-no-fork
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
deleted file mode 100644
index 981211d..0000000
--- a/fusioninventory-agent.spec
+++ /dev/null
@@ -1,481 +0,0 @@
-%global  debug_package %nil
-%if 0%{?fedora} >= 18
-%global  with_systemd  1
-%else
-%global  with_systemd  0
-%endif
-
-Name:        fusioninventory-agent
-Summary:     FusionInventory agent
-Summary(fr): Agent FusionInventory
-Group:       Applications/System
-License:     GPLv2+
-URL:         http://fusioninventory.org/
-
-Version:     2.2.4
-Release:     2%{?dist}
-Source0:     http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
-
-Source1:   %{name}.cron
-Source2:   %{name}.init
-Source3:   %{name}.service
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: perl(inc::Module::Install)
-# For tests 
-BuildRequires: perl(Time::HiRes) perl(UNIVERSAL::require) perl(Test::More)
-BuildRequires: perl(Class::Accessor::Fast) perl(Class::Data::Inheritable) perl(Test::Exception)
-BuildRequires: perl(File::Which) perl(IPC::Run) perl(Test::MockModule) perl(Text::Template)
-BuildRequires: perl(IO::Capture::Stderr) perl(Net::IP) perl(YAML)
-%if 0%{?fedora} >= 14
-BuildRequires: perl(LWP::Protocol::https) perl(IO::Socket::SSL)
-BuildRequires: perl(HTTP::Server::Simple::Authen) perl(CGI)
-%endif
-%if 0%{?fedora}>= 12 || 0%{?rhel} >= 5
-BuildRequires: perl(XML::TreePP)
-%endif
-BuildRequires: perl(JSON)
-%if 0%{?fedora} >= 11
-BuildRequires: perl(Test::Compile) perl(HTTP::Proxy)
-%endif
-%if %{with_systemd}
-BuildRequires: systemd-units
-%endif
-
-Requires:  perl-FusionInventory-Agent = %{version}-%{release}
-%ifarch %{ix86} x86_64
-Requires:  dmidecode
-%endif
-
-%if %{with_systemd}
-# We require this to be present for /etc/tmpfiles.d
-Requires: systemd-units
-# Make sure it's there when scriptlets run, too
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%else
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig, /sbin/service
-Requires(postun): /sbin/service
-%endif
-
-
-# RPM 4.8
-%{?filter_from_provides: %filter_from_provides /perl(FusionInventory::/d}
-%{?filter_from_requires: %filter_from_requires /perl(Win32/d}
-%{?filter_from_requires: %filter_from_requires /perl(FusionInventory::/d}
-%{?perl_default_filter}
-# RPM 4.9
-%global __provides_exclude %{?__provides_exclude:__provides_exclude|}^perl\\(FusionInventory::
-%global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(FusionInventory::
-%global __requires_exclude %__requires_exclude|^perl\\(Win32
-
-
-%description
-FusionInventory Agent is an application designed to help a network
-or system administrator to keep track of the hardware and software
-configurations of computers that are installed on the network.
-
-This agent can send information about the computer to a OCS Inventory NG
-or GLPI server with the FusionInventory for GLPI plugin.
-
-You can add additional packages for optional tasks:
-
-* perl-FusionInventory-Agent-Task-NetDiscovery
-    Network Discovery support
-* perl-FusionInventory-Agent-Task-NetInventory
-    Network Inventory support
-* perl-FusionInventory-Agent-Task-Deploy
-    Software deployment support
-* perl-FusionInventory-Agent-Task-ESX
-    vCenter/ESX/ESXi remote inventory
-
-Edit the /etc/sysconfig/%{name} file for service configuration.
-
-%description -l fr
-L'agent FusionInventory est une application destinée à aider l'administrateur
-système ou réseau à surveiller la configuration des machines du réseau
-et les logiciels qui y sont installés.
-
-Cet agent peut envoyer les informations de l'ordinateur à un serveur
-OCS Inventory NG ou à un serveur GLPI disposant de l'extension FusionInventory.
-
-Vous pouvez ajouter les paquets additionnels pour les tâches optionnelles :
-
-* perl-FusionInventory-Agent-Task-NetDiscovery
-    Gestion de la découverte réseau
-* perl-FusionInventory-Agent-Task-NetInventory
-    Gestion de l'inventaire réseau
-* perl-FusionInventory-Agent-Task-Deploy
-    Gestion de déploiement de logiciels
-* perl-FusionInventory-Agent-Task-ESX
-    Inventaire à distance des vCenter/ESX/ESXi
-
-Modifier le fichier /etc/sysconfig/%{name} pour configurer
-le service.
-
-%package -n perl-FusionInventory-Agent
-Summary:        Librairies for Fusioninventory agent
-Summary(fr):    Bibliothèques de l'agent Fusioninventory
-BuildArch:      noarch
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(LWP)
-Requires:       perl(Net::CUPS)
-Requires:       perl(Net::SSLeay)
-Requires:       perl(Proc::Daemon)
-Requires:       perl(Proc::PID::File)
-
-%description -n perl-FusionInventory-Agent
-Librairies for Fusioninventory agent.
-
-%description -l fr -n perl-FusionInventory-Agent
-Bibliothèques de l'agent Fusioninventory.
-
-%package yum-plugin
-Summary:       Ask FusionInventory agent to send an inventory when yum exits
-Summary(fr):   Demande à l'agent FusionInventory l'envoi d'un inventaire
-Group:         System Environment/Base
-BuildArch:     noarch
-BuildRequires: python-devel
-Requires:      yum >= 2.4
-Requires:      %{name}
-
-%description yum-plugin
-fusioninventory-agent-yum-plugin asks the running service agent to send an
-inventory when yum exits.
-
-This requires the service to be running with the --rpc-trust-localhost option.
-
-%description -l fr yum-plugin
-fusioninventory-agent-yum-plugin demande au service de l'agent d'envoyer un
-inventaire à la fin de l'exécution de yum.
-
-Le service doit être actif et lancé avec l'option --rpc-trust-localhost.
-
-%prep
-%setup -q -n FusionInventory-Agent-%{version}%{?prever}
-
-# This work only on older version, and is ignored on recent
-cat <<EOF | tee %{name}-req
-#!/bin/sh
-%{__perl_requires} $* | \
-sed -e '/perl(Win32/d'
-EOF
-
-%global __perl_requires %{_builddir}/FusionInventory-Agent-%{version}%{?prever}/%{name}-req
-chmod +x %{__perl_requires}
-
-cat <<EOF | tee logrotate
-%{_localstatedir}/log/%{name}/*.log {
-    weekly
-    rotate 7
-    compress
-    notifempty
-    missingok
-}
-EOF
-
-cat <<EOF | tee %{name}.conf
-#
-# Fusion Inventory Agent Configuration File
-# used by hourly cron job and service launcher to override the %{name}.cfg setup.
-#
-# DONT FORGET to enable the service !
-#
-# Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-# Global options (debug for verbose log, rpc-trust-localhost for yum-plugin)
-FUSINVOPT="--debug --rpc-trust-localhost"
-# Mode, change to "cron" or "daemon" to activate
-# - none (default on install) no activity
-# - cron (inventory only) use the cron.hourly
-%if %{with_systemd}
-# NB systemd service launcher only use FUSINVOPT and agent.cfg
-%else
-# - daemon (recommanded) use the service
-%endif
-OCSMODE[0]=none
-# OCS Inventory or FusionInventory server URI
-# OCSSERVER[0]=your.ocsserver.name
-# OCSSERVER[0]=http://your.ocsserver.name/ocsinventory
-# OCSSERVER[0]=http://your.glpiserveur.name/glpi/plugins/fusioninventory/
-# corresponds with --local=%{_localstatedir}/lib/%{name}
-# OCSSERVER[0]=local
-# Wait before inventory (for cron mode)
-OCSPAUSE[0]=120
-# Administrative TAG (optional, must be filed before first inventory)
-OCSTAG[0]=
-EOF
-
-
-%build
-perl Makefile.PL \
-     PREFIX=%{_prefix} \
-     SYSCONFDIR=%{_sysconfdir}/fusioninventory \
-     LOCALSTATEDIR=%{_localstatedir}/lib/%{name}
-
-make %{?_smp_mflags}
-
-
-%install
-rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-
-%{_fixperms} %{buildroot}/*
-
-mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
-
-install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
-%if %{with_systemd}
-install -m 644 -Dp %{SOURCE3}    %{buildroot}%{_unitdir}/%{name}.service
-%else
-install -m 755 -Dp %{SOURCE2}    %{buildroot}%{_initrddir}/%{name}
-%endif
-
-# Yum plugin installation
-install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py
-install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum/pluginconf.d/%{name}.conf
-
-
-%check
-make test
-
-# Use system ones
-rm -rf inc/*
-
-
-%clean
-rm -rf %{buildroot} %{buildroot}%{_datarootdir}
-
-
-%post
-%if %{with_systemd}
-/sbin/chkconfig --del %{name} &>/dev/null || :
-/bin/systemctl daemon-reload &>/dev/null || :
-%else
-if [ $1 = 1 ]; then
-    # Initial installation
-    /sbin/chkconfig --add %{name} || :
-fi
-%endif
-exit 0
-
-%preun
-if [ $1 -eq 0 ] ; then
-%if %{with_systemd}
-    /bin/systemctl --no-reload disable %{name}.service &>/dev/null
-    /bin/systemctl stop %{name}.service &>/dev/null
-%else
-    /sbin/service %{name} stop &>/dev/null
-    /sbin/chkconfig --del %{name}
-%endif
-fi
-exit 0
-
-
-%postun
-%if %{with_systemd}
-/bin/systemctl daemon-reload &>/dev/null
-if [ $1 -ge 1 ]; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart %{name}.service &>/dev/null
-fi
-%else
-if [ $1 -ge 1 ]; then
-    /sbin/service %{name} condrestart &>/dev/null
-fi
-%endif
-exit 0
-
-
-%files
-%defattr(-, root, root, -)
-%dir %{_sysconfdir}/fusioninventory
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg
-%{_sysconfdir}/cron.hourly/%{name}
-%if %{with_systemd}
-%{_unitdir}/%{name}.service
-%else
-%{_initrddir}/%{name}
-%endif
-%{_bindir}/fusioninventory-agent
-%{_bindir}/fusioninventory-injector
-%{_mandir}/man1/fusioninventory-agent*
-%{_mandir}/man1/fusioninventory-injector*
-%dir %{_localstatedir}/log/%{name}
-%dir %{_localstatedir}/lib/%{name}
-
-%files -n perl-FusionInventory-Agent
-%defattr(-, root, root, -)
-%doc Changes LICENSE THANKS
-%{_datadir}/fusioninventory
-%{_mandir}/man3/Fusion*
-
-%files yum-plugin
-%defattr(-, root, root)
-%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf
-%{_prefix}/lib/yum-plugins/%{name}.*
-
-
-%changelog
-* Wed Aug  8 2012 Remi Collet <remi@fedoraproject.org> - 2.2.4-2
-- dump release
-
-* Wed Aug  8 2012 Remi Collet <remi@fedoraproject.org> - 2.2.4-1
-- version 2.2.4 fixes various bugs as described in
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.4/Changes
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.3/Changes
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jun 25 2012 Petr Pisar <ppisar@redhat.com> - 2.2.2-4
-- Perl 5.16 rebuild
-
-* Tue Jun 05 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-3
-- no need for debuginfo (not really arch, fix #828960)
-- yum plugin is also noarch
-
-* Thu May 31 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-2
-- make package "arch"
-- requires dmidecode when available (x86)
-- add sub-package perl-FusionInventory-Agent (noarch)
-
-* Wed May 30 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-1
-- update to 2.2.2
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.2/Changes
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.1/Changes
-
-* Fri May 11 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-2
-- filter private provides/requires
-
-* Thu May 10 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
-- update to 2.2.0
-  http://search.cpan.org/src/FUSINV/FusionInventory-Agent-2.2.0/Changes
-- revert change in 2.2.0: don't loose arch information
-  see http://forge.fusioninventory.org/issues/1581
-
-* Sun Feb 26 2012 Remi Collet <remi@fedoraproject.org> - 2.1.14-1
-- update to 2.1.14
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.14/Changes
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Nov 28 2011 Remi Collet <remi@fedoraproject.org> - 2.1.12-1
-- update to 2.1.12
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.12/Changes
-- upstream patch for http://forge.fusioninventory.org/issues/1161
-
-* Sat Aug 06 2011 Remi Collet <remi@fedoraproject.org> - 2.1.9-3
-- adapt filter
-
-* Fri Jul 25 2011 Petr Sabata <contyk@redhat.com> - 2.1.9-2
-- Perl mass rebuild
-
-* Sun Jun 26 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-1
-- missing dist tag
-
-* Wed Jun 15 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-1
-- update to 2.1.9
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.9/Changes
-
-* Sat Jun 11 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-0.1.git9bd1238
-- update to 2.1.9 from git
-- improved init script for systemd
-- improved comment for use with glpi-fusioninventory
-
-* Thu Mar 31 2011 Remi Collet <Fedora@famillecollet.com> 2.1.8-2
-- revert change for issue 656 which breaks compatibility
-
-* Wed Mar 30 2011 Remi Collet <Fedora@famillecollet.com> 2.1.8-1
-- update to 2.1.8
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.8/Changes
-
-* Thu Dec 30 2010 Remi Collet <Fedora@famillecollet.com> 2.1.7-2
-- add the yum-plugin sub-package
-
-* Mon Dec 13 2010 Remi Collet <Fedora@famillecollet.com> 2.1.7-1
-- update to 2.1.7
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.7/Changes
-
-* Sun Nov 28 2010 Remi Collet <Fedora@famillecollet.com> 2.1.7-0.1.beta1
-- update to 2.1.7 beta1
-
-* Sat Nov 13 2010 Remi Collet <Fedora@famillecollet.com> 2.1.6-1.1
-- fix perl filter on EL-6
-
-* Wed Oct 06 2010 Remi Collet <Fedora@famillecollet.com> 2.1.6-1
-- update to 2.1.6
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.6/Changes
-- fix init script for multi-server in daemon mode
-- workaround for http://forge.fusioninventory.org/issues/414
-
-* Wed Sep 15 2010 Remi Collet <Fedora@famillecollet.com> 2.1.5-1
-- update to 2.1.5
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.5/Changes
-
-* Fri Sep 10 2010 Remi Collet <Fedora@famillecollet.com> 2.1.3-2
-- add %%check
-
-* Sat Sep 04 2010 Remi Collet <Fedora@famillecollet.com> 2.1.3-1
-- update to 2.1.3
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.3/Changes
-
-* Wed Aug 25 2010 Remi Collet <Fedora@famillecollet.com> 2.1.2-1
-- update to 2.1.2
-  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.2/Changes
-
-* Wed Aug 18 2010 Remi Collet <Fedora@famillecollet.com> 2.1.1-1
-- update to 2.1.1
-
-* Wed Aug 18 2010 Remi Collet <Fedora@famillecollet.com> 2.1-2.gita7532c0
-- update to git snaphost which fix EL issues
-- fix init script
-- adapt perl filter for recent/old fedora or EL
-
-* Mon Aug 16 2010 Remi Collet <Fedora@famillecollet.com> 2.1-1
-- update to 2.1
-- switch download URL back to CPAN
-- add %%{perl_vendorlib}/auto
-- filter perl(Win32*) from Requires
-- add patch (from git) to reopen the file logger if needed
-
-* Sat May 29 2010 Remi Collet <Fedora@famillecollet.com> 2.0.6-1
-- update to 2.0.6
-- swicth download URL to forge
-
-* Wed May 12 2010 Remi Collet <Fedora@famillecollet.com> 2.0.5-1
-- update to 2.0.5
-
-* Tue May 11 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-4.gitf7c5492
-- git snapshot fix perl 5.8.8 (EL5) issue
-
-* Sat May 08 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-4.gitddfdeaf
-- git snapshot fix daemon issue
-- add FUSINVOPT for global options (p.e.--debug)
-
-* Sat May 08 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-3
-- add support for daemon mode
-
-* Fri May 07 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-2
-- info about perl-FusionInventory-Agent-Task-OcsDeploy
-- spec cleanup
-- french translation
-- set Net::CUPS and Archive::Extract optionnal on RHEL4
-
-* Fri May 07 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-1
-- update to 2.0.4 which fixes important bugs when cron is used
-
-* Sat May 01 2010 Remi Collet <Fedora@famillecollet.com> 2.0.3-1
-- initial spec
-
diff --git a/sources b/sources
deleted file mode 100644
index 596e7d6..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-c3ce4ad7f2215d2aa4546b186c7c8926  FusionInventory-Agent-2.2.4.tar.gz

From 8a4a7107ba23be1f56fae6070625d10d77623cfa Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Mon, 9 Feb 2015 19:38:40 +0100
Subject: [PATCH 021/106] initial import (#1090933)

---
 .gitignore                    |   1 +
 dead.package                  |   1 -
 fusioninventory-agent.cron    |  37 +++
 fusioninventory-agent.service |  11 +
 fusioninventory-agent.spec    | 476 ++++++++++++++++++++++++++++++++++
 sources                       |   1 +
 6 files changed, 526 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 delete mode 100644 dead.package
 create mode 100644 fusioninventory-agent.cron
 create mode 100644 fusioninventory-agent.service
 create mode 100644 fusioninventory-agent.spec
 create mode 100644 sources

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d25ea84
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/FusionInventory-Agent-2.3.15.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 7039d4c..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-lack of maintainer
diff --git a/fusioninventory-agent.cron b/fusioninventory-agent.cron
new file mode 100644
index 0000000..e09c0db
--- /dev/null
+++ b/fusioninventory-agent.cron
@@ -0,0 +1,37 @@
+#!/bin/bash
+NAME=fusioninventory-agent
+LOG=/var/log/$NAME/$NAME.log
+
+exec >>$LOG 2>&1
+
+[ -f   /etc/sysconfig/$NAME ] || exit 0
+source /etc/sysconfig/$NAME
+export PATH
+
+i=0
+while [ $i -lt ${#OCSMODE[*]} ]
+do
+	if [ ${OCSMODE[$i]:-none} == cron ]; then
+		OPTS=
+		if [ ! -z "${OCSPAUSE[$i]}" ]; then
+			OPTS="--wait ${OCSPAUSE[$i]}"
+		fi
+
+		if [ ! -z "${OCSTAG[$i]}" ]; then
+		        OPTS="$OPTS --tag=${OCSTAG[$i]}"
+		fi
+
+		if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then
+	        	# Local inventory
+	        	OPTS="$OPTS --local=/var/lib/$NAME"
+		elif [ ! -z "${OCSSERVER[$i]}" ]; then
+	        	# Remote inventory
+		        OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}"
+		fi
+		echo "[$(date '+%c')] Running $NAME $OPTS"
+		/usr/bin/$NAME $FUSINVOPT --logfile=$LOG $OPTS
+	fi
+	((i++))
+done
+echo "[$(date '+%c')] End of cron job ($PATH)"
+
diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service
new file mode 100644
index 0000000..0f4d9bb
--- /dev/null
+++ b/fusioninventory-agent.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=FusionInventory agent
+After=syslog.target network.target
+
+[Service]
+EnvironmentFile=/etc/sysconfig/fusioninventory-agent
+ExecStart=/usr/bin/fusioninventory-agent $FUSINVOPT --logfile=/var/log/fusioninventory-agent/service.log --daemon --no-fork
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
new file mode 100644
index 0000000..f5dfb33
--- /dev/null
+++ b/fusioninventory-agent.spec
@@ -0,0 +1,476 @@
+Name:        fusioninventory-agent
+Summary:     FusionInventory agent
+Group:       Applications/System
+License:     GPLv2+
+URL:         http://fusioninventory.org/
+
+Version:     2.3.15
+Release:     1%{?dist}
+Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
+
+Source1:   %{name}.cron
+#Source2:   %{name}.init
+Source3:   %{name}.service
+
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: perl(inc::Module::Install)
+BuildRequires: systemd
+
+Requires:  perl-FusionInventory-Agent = %{version}-%{release}
+Requires:  logrotate
+Requires:  cronie
+%ifarch %{ix86} x86_64
+Requires:  dmidecode
+%endif
+
+Requires(post):     systemd
+Requires(preun):    systemd
+Requires(postun):   systemd
+
+# excluding internal requires and windows stuff
+%global __provides_exclude %{?__provides_exclude:__provides_exclude|}^perl\\(FusionInventory::
+%global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(FusionInventory::
+%global __requires_exclude %__requires_exclude|^perl\\(Win32
+
+%description
+FusionInventory Agent is an application designed to help a network
+or system administrator to keep track of the hardware and software
+configurations of computers that are installed on the network.
+
+This agent can send information about the computer to a OCS Inventory NG
+or GLPI server with the FusionInventory for GLPI plugin.
+
+You can add additional packages for optional tasks:
+
+* perl-FusionInventory-Agent-Task-Network
+    Network Discovery and Inventory support
+* perl-Fusion-Inventory-Agent-Inventory
+    Local inventory support for FusionInventory
+* perl-FusionInventory-Agent-Task-Deploy
+    Software deployment support
+* perl-FusionInventory-Agent-Task-ESX
+    vCenter/ESX/ESXi remote inventory
+* perl-FusionInventory-WakeOnLan
+    not included due to a licensing issue for perl-Net-Write
+
+Edit the /etc/sysconfig/%{name} file for service configuration.
+
+%package -n perl-FusionInventory-Agent
+Summary:        Libraries for Fusioninventory agent
+BuildArch:      noarch
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(LWP)
+Requires:       perl(Net::CUPS)
+Requires:       perl(Net::SSLeay)
+Requires:       perl(Proc::Daemon)
+Requires:       perl(Proc::PID::File)
+Requires:       perl(Socket::GetAddrInfo)
+
+%description -n perl-FusionInventory-Agent
+Libraries for Fusioninventory agent.
+
+%package task-esx
+Summary:    FusionInventory plugin to inventory vCenter/ESX/ESXi
+BuildArch:  noarch
+Requires:   fusioninventory-agent = %{version}-%{release}
+
+%description task-esx
+fusioninventory-agent-task-ESX ask the running service agent to inventory an 
+VMWare vCenter/ESX/ESXi server through SOAP interface
+
+%package yum-plugin
+Summary:       Ask FusionInventory agent to send an inventory when yum exits
+Group:         System Environment/Base
+BuildArch:     noarch
+Requires:      yum
+Requires:      %{name}
+
+%description yum-plugin
+fusioninventory-agent-yum-plugin asks the running service agent to send an
+inventory when yum exits.
+
+This requires the service to be running with the --rpc-trust-localhost option.
+
+%package task-network
+Summary:    NetDiscovery and NetInventory task for FusionInventory
+Group:      Applications/System
+BuildArch:      noarch
+Requires:       fusioninventory-agent = %{version}-%{release}
+
+%description task-network
+fusioninventory-task-netdiscovery and fusioninventory-task-netinventory
+
+%package task-deploy
+Summary:    Software deployment support for FusionInventory agent
+Group:      Applications/System
+BuildArch:  noarch
+Requires:   fusioninventory-agent = %{version}-%{release}
+Requires:   perl(Archive::Extract)
+
+%description task-deploy
+This package provides software deployment support for FusionInventory-agent
+
+# Excluded due to the absence of perl-Net-Write
+# perl-Net-Write is licenced under Artistic Perl v1 licence, not accepted in Fedora 
+#%package task-wakeonlan
+#Summary:    WakeOnLan task for FusionInventory
+#Group:      Applications/System
+#BuildArch:  noarch
+#Requires:   fusioninventory-agent = %{version}-%{release}
+
+#%description task-wakeonlan
+#fusioninventory-task-wakeonlan
+
+%package task-inventory
+Summary:    Inventory task for FusionInventory
+Group:      Applications/System
+BuildArch:  noarch
+Requires:   fusioninventory-agent = %{version}-%{release}
+Requires:   perl(Net::CUPS)
+Requires:   perl(Parse::EDID)
+
+
+%description task-inventory
+fusioninventory-task-inventory
+%prep
+%setup -q -n FusionInventory-Agent-%{version}%{?prever}
+
+# This work only on older version, and is ignored on recent
+cat <<EOF | tee %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |
+sed -e '/perl(Win32/d'
+EOF
+
+%global __perl_requires %{_builddir}/FusionInventory-Agent-%{version}%{?prever}/%{name}-req
+chmod +x %{__perl_requires}
+
+cat <<EOF | tee logrotate
+%{_localstatedir}/log/%{name}/*.log {
+    weekly
+    rotate 7
+    compress
+    notifempty
+    missingok
+}
+EOF
+
+cat <<EOF | tee %{name}.conf
+#
+# Fusion Inventory Agent Configuration File
+# used by hourly cron job and service launcher to override the %{name}.cfg setup.
+#
+# DONT FORGET to enable the service !
+#
+# Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+# Global options (debug for verbose log, rpc-trust-localhost for yum-plugin)
+FUSINVOPT="--debug "
+
+EOF
+
+
+
+%build
+perl Makefile.PL \
+     PREFIX=%{_prefix} \
+     SYSCONFDIR=%{_sysconfdir}/fusioninventory \
+     LOCALSTATEDIR=%{_localstatedir}/lib/%{name}
+
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+
+%{_fixperms} %{buildroot}/*
+
+mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
+
+install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
+install -m 644 -Dp %{SOURCE3}    %{buildroot}%{_unitdir}/%{name}.service
+
+
+# Yum plugin installation
+install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py
+install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum/pluginconf.d/%{name}.conf
+
+
+
+%post
+%systemd_post fusioninventory-agent.service
+
+
+%preun
+%systemd_preun fusioninventory-agent.service
+
+
+%postun
+%systemd_postun_with_restart fusioninventory-agent.service
+
+
+%files
+%dir %{_sysconfdir}/fusioninventory
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg
+%{_sysconfdir}/cron.hourly/%{name}
+%{_unitdir}/%{name}.service
+%{_bindir}/fusioninventory-agent
+%{_bindir}/fusioninventory-injector
+%{_mandir}/man1/fusioninventory-agent*
+%{_mandir}/man1/fusioninventory-injector*
+%dir %{_localstatedir}/log/%{name}
+%dir %{_localstatedir}/lib/%{name}
+%dir %{_datadir}/fusioninventory
+%dir %{_datadir}/fusioninventory/lib
+%dir %{_datadir}/fusioninventory/lib/FusionInventory
+%dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent
+%dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task
+#excluding sub-packages files
+#%exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/
+
+
+
+%files -n perl-FusionInventory-Agent
+%doc Changes LICENSE THANKS
+%{_datadir}/fusioninventory
+
+%files yum-plugin
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf
+%{_prefix}/lib/yum-plugins/%{name}.*
+
+%files task-esx
+%{_bindir}/fusioninventory-esx
+%{_mandir}/man1/fusioninventory-esx.1*
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/ESX.pm
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/SOAP
+
+%files task-network
+%{_bindir}/fusioninventory-netdiscovery
+%{_bindir}/fusioninventory-netinventory
+%{_mandir}/man1/fusioninventory-netdiscovery.1*
+%{_mandir}/man1/fusioninventory-netinventory.1*
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery.pm
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory.pm
+
+%files task-deploy
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy.pm
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy
+
+# Excluding task-wakeonlan
+#%files task-wakeonlan
+%exclude %{_bindir}/fusioninventory-wakeonlan
+%exclude %{_mandir}/man1/fusioninventory-wakeonlan.1*
+%exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
+
+%files task-inventory
+%{_bindir}/fusioninventory-inventory
+%{_mandir}/man1/fusioninventory-inventory.1*
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.pm
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory
+
+
+%changelog
+* Mon Feb 9 2015 Marianne Lombard <marianne@tuxette.fr> - 2.3.15
+- new version and back in Fedora
+
+* Mon Jan 19 2015 Marianne Lombard <marianne@tuxette.fr> - 2.3.14-2 
+- enhancing spec according to review 
+
+* Wed Dec 24 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.14
+- new version
+
+* Mon Dec 15 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.13
+- new version
+- updating spec according to fedora-review
+
+* Tue Aug 5 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.12
+- new version 
+
+* Tue Aug 5 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.10.1-2
+- adding missing requires 
+- updating config file
+
+* Mon Aug 4 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.10.1
+- new version (bug fixes)
+
+* Fri Aug 1 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.10
+- new version
+
+* Wed Jul 23 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.9.1
+- new version
+
+* Tue May 20 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.8-1
+- enhancing spec according to Michael Schwendt review
+- adding missing requires
+
+* Fri May 16 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.8
+- new version
+
+* Wed May 14 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.7.1
+- new version 
+
+* Sat Feb 1 2014 Marianne Lombard <marianne@tuxette.fr> - 2.3.6
+- new version, reintroduction in fedora and epel
+- cleanup of the spec (removing sysVinit stuff, old BuildRequires, old releases stuff)
+- adding sub-packages for task-* (using Guillaume Rousse OBS spec as model https://build.opensuse.org/package/view_file/home:guillomovitch/fusioninventory-agent/fusioninventory-agent.spec)
+- task-wakeonlan is excluded (dependancy issue)
+
+* Wed Aug  8 2012 Remi Collet <remi@fedoraproject.org> - 2.2.4-2
+- dump release
+
+* Wed Aug  8 2012 Remi Collet <remi@fedoraproject.org> - 2.2.4-1
+- version 2.2.4 fixes various bugs as described in
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.4/Changes
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.3/Changes
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jun 25 2012 Petr Pisar <ppisar@redhat.com> - 2.2.2-4
+- Perl 5.16 rebuild
+
+* Tue Jun 05 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-3
+- no need for debuginfo (not really arch, fix #828960)
+- yum plugin is also noarch
+
+* Thu May 31 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-2
+- make package "arch"
+- requires dmidecode when available (x86)
+- add sub-package perl-FusionInventory-Agent (noarch)
+
+* Wed May 30 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-1
+- update to 2.2.2
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.2/Changes
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.2.1/Changes
+
+* Fri May 11 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-2
+- filter private provides/requires
+
+* Thu May 10 2012 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
+- update to 2.2.0
+  http://search.cpan.org/src/FUSINV/FusionInventory-Agent-2.2.0/Changes
+- revert change in 2.2.0: don't loose arch information
+  see http://forge.fusioninventory.org/issues/1581
+
+* Sun Feb 26 2012 Remi Collet <remi@fedoraproject.org> - 2.1.14-1
+- update to 2.1.14
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.14/Changes
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Nov 28 2011 Remi Collet <remi@fedoraproject.org> - 2.1.12-1
+- update to 2.1.12
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.12/Changes
+- upstream patch for http://forge.fusioninventory.org/issues/1161
+
+* Sat Aug 06 2011 Remi Collet <remi@fedoraproject.org> - 2.1.9-3
+- adapt filter
+
+* Mon Jul 25 2011 Petr Sabata <contyk@redhat.com> - 2.1.9-2
+- Perl mass rebuild
+
+* Sun Jun 26 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-1
+- missing dist tag
+
+* Wed Jun 15 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-1
+- update to 2.1.9
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.9/Changes
+
+* Sat Jun 11 2011 Remi Collet <Fedora@famillecollet.com> 2.1.9-0.1.git9bd1238
+- update to 2.1.9 from git
+- improved init script for systemd
+- improved comment for use with glpi-fusioninventory
+
+* Thu Mar 31 2011 Remi Collet <Fedora@famillecollet.com> 2.1.8-2
+- revert change for issue 656 which breaks compatibility
+
+* Wed Mar 30 2011 Remi Collet <Fedora@famillecollet.com> 2.1.8-1
+- update to 2.1.8
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.8/Changes
+
+* Thu Dec 30 2010 Remi Collet <Fedora@famillecollet.com> 2.1.7-2
+- add the yum-plugin sub-package
+
+* Mon Dec 13 2010 Remi Collet <Fedora@famillecollet.com> 2.1.7-1
+- update to 2.1.7
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.7/Changes
+
+* Sun Nov 28 2010 Remi Collet <Fedora@famillecollet.com> 2.1.7-0.1.beta1
+- update to 2.1.7 beta1
+
+* Sat Nov 13 2010 Remi Collet <Fedora@famillecollet.com> 2.1.6-1.1
+- fix perl filter on EL-6
+
+* Wed Oct 06 2010 Remi Collet <Fedora@famillecollet.com> 2.1.6-1
+- update to 2.1.6
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.6/Changes
+- fix init script for multi-server in daemon mode
+- workaround for http://forge.fusioninventory.org/issues/414
+
+* Wed Sep 15 2010 Remi Collet <Fedora@famillecollet.com> 2.1.5-1
+- update to 2.1.5
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.5/Changes
+
+* Fri Sep 10 2010 Remi Collet <Fedora@famillecollet.com> 2.1.3-2
+- add %%check
+
+* Sat Sep 04 2010 Remi Collet <Fedora@famillecollet.com> 2.1.3-1
+- update to 2.1.3
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.3/Changes
+
+* Wed Aug 25 2010 Remi Collet <Fedora@famillecollet.com> 2.1.2-1
+- update to 2.1.2
+  http://cpansearch.perl.org/src/FUSINV/FusionInventory-Agent-2.1.2/Changes
+
+* Wed Aug 18 2010 Remi Collet <Fedora@famillecollet.com> 2.1.1-1
+- update to 2.1.1
+
+* Wed Aug 18 2010 Remi Collet <Fedora@famillecollet.com> 2.1-2.gita7532c0
+- update to git snaphost which fix EL issues
+- fix init script
+- adapt perl filter for recent/old fedora or EL
+
+* Mon Aug 16 2010 Remi Collet <Fedora@famillecollet.com> 2.1-1
+- update to 2.1
+- switch download URL back to CPAN
+- add %%{perl_vendorlib}/auto
+- filter perl(Win32*) from Requires
+- add patch (from git) to reopen the file logger if needed
+
+* Sat May 29 2010 Remi Collet <Fedora@famillecollet.com> 2.0.6-1
+- update to 2.0.6
+- swicth download URL to forge
+
+* Wed May 12 2010 Remi Collet <Fedora@famillecollet.com> 2.0.5-1
+- update to 2.0.5
+
+* Tue May 11 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-4.gitf7c5492
+- git snapshot fix perl 5.8.8 (EL5) issue
+
+* Sat May 08 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-4.gitddfdeaf
+- git snapshot fix daemon issue
+- add FUSINVOPT for global options (p.e.--debug)
+
+* Sat May 08 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-3
+- add support for daemon mode
+
+* Fri May 07 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-2
+- info about perl-FusionInventory-Agent-Task-OcsDeploy
+- spec cleanup
+- french translation
+- set Net::CUPS and Archive::Extract optionnal on RHEL4
+
+* Fri May 07 2010 Remi Collet <Fedora@famillecollet.com> 2.0.4-1
+- update to 2.0.4 which fixes important bugs when cron is used
+
+* Sat May 01 2010 Remi Collet <Fedora@famillecollet.com> 2.0.3-1
+- initial spec
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..7c4fa17
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+9c34fefcb70076f860677eea056077ed  FusionInventory-Agent-2.3.15.tar.gz

From 0d0bf02f64cb4e2bc5647fade592d29407b7cd27 Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Wed, 11 Feb 2015 18:44:20 +0100
Subject: [PATCH 022/106] updating description and using upstream unit file

---
 fusioninventory-agent.spec | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index f5dfb33..cf4917e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -5,7 +5,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.15
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 
 Source1:   %{name}.cron
@@ -42,13 +42,13 @@ or GLPI server with the FusionInventory for GLPI plugin.
 
 You can add additional packages for optional tasks:
 
-* perl-FusionInventory-Agent-Task-Network
+* fusioninventory-agent-task-network
     Network Discovery and Inventory support
-* perl-Fusion-Inventory-Agent-Inventory
+* fusioninventory-agent-inventory
     Local inventory support for FusionInventory
-* perl-FusionInventory-Agent-Task-Deploy
+* fusioninventory-agent-task-deploy
     Software deployment support
-* perl-FusionInventory-Agent-Task-ESX
+* fusioninventory-agent-task-esx
     vCenter/ESX/ESXi remote inventory
 * perl-FusionInventory-WakeOnLan
     not included due to a licensing issue for perl-Net-Write
@@ -193,7 +193,8 @@ mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
 install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
-install -m 644 -Dp %{SOURCE3}    %{buildroot}%{_unitdir}/%{name}.service
+#install -m 644 -Dp %{SOURCE3}    %{buildroot}%{_unitdir}/%{name}.service
+install -m 644 -D contrib/unix/%{name}.service	%{buildroot}%{_unitdir}/%{name}.service
 
 
 # Yum plugin installation
@@ -277,6 +278,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Feb 11 2015 Marianne Lombard <marianne@tuxette.fr> - 2.3.15-2
+- fix description of subpackage
+- using upstream systemd unit file
+
 * Mon Feb 9 2015 Marianne Lombard <marianne@tuxette.fr> - 2.3.15
 - new version and back in Fedora
 

From b2d4eb0e50bcc3ec63ab89107dbcc31d63aa6a25 Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Wed, 11 Feb 2015 18:56:53 +0100
Subject: [PATCH 023/106] changing tab into spaces

---
 fusioninventory-agent.cron | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/fusioninventory-agent.cron b/fusioninventory-agent.cron
index e09c0db..8b4b99f 100644
--- a/fusioninventory-agent.cron
+++ b/fusioninventory-agent.cron
@@ -11,27 +11,27 @@ export PATH
 i=0
 while [ $i -lt ${#OCSMODE[*]} ]
 do
-	if [ ${OCSMODE[$i]:-none} == cron ]; then
-		OPTS=
-		if [ ! -z "${OCSPAUSE[$i]}" ]; then
-			OPTS="--wait ${OCSPAUSE[$i]}"
-		fi
+    if [ ${OCSMODE[$i]:-none} == cron ]; then
+        OPTS=
+        if [ ! -z "${OCSPAUSE[$i]}" ]; then
+            OPTS="--wait ${OCSPAUSE[$i]}"
+        fi
 
-		if [ ! -z "${OCSTAG[$i]}" ]; then
-		        OPTS="$OPTS --tag=${OCSTAG[$i]}"
-		fi
+        if [ ! -z "${OCSTAG[$i]}" ]; then
+                OPTS="$OPTS --tag=${OCSTAG[$i]}"
+        fi
 
-		if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then
-	        	# Local inventory
-	        	OPTS="$OPTS --local=/var/lib/$NAME"
-		elif [ ! -z "${OCSSERVER[$i]}" ]; then
-	        	# Remote inventory
-		        OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}"
-		fi
-		echo "[$(date '+%c')] Running $NAME $OPTS"
-		/usr/bin/$NAME $FUSINVOPT --logfile=$LOG $OPTS
-	fi
-	((i++))
+        if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then
+                # Local inventory
+                OPTS="$OPTS --local=/var/lib/$NAME"
+        elif [ ! -z "${OCSSERVER[$i]}" ]; then
+                # Remote inventory
+                OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}"
+        fi
+        echo "[$(date '+%c')] Running $NAME $OPTS"
+        /usr/bin/$NAME $FUSINVOPT --logfile=$LOG $OPTS
+    fi
+    ((i++))
 done
 echo "[$(date '+%c')] End of cron job ($PATH)"
 

From e6b3bee1dd302b5a879a1dd671795262a0239a6d Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Wed, 11 Feb 2015 18:58:49 +0100
Subject: [PATCH 024/106] commenting unused source

---
 fusioninventory-agent.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index cf4917e..65d9499 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory
 
 Source1:   %{name}.cron
 #Source2:   %{name}.init
-Source3:   %{name}.service
+#Source3:   %{name}.service
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(inc::Module::Install)

From 15aae5f34513b476d24f58c4e8caa45d5477a1e6 Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Fri, 20 Feb 2015 16:10:07 +0100
Subject: [PATCH 025/106] building as noarch

---
 fusioninventory-agent.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 65d9499..8f68510 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -5,9 +5,9 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.15
-Release:     2%{?dist}
+Release:     3%{?dist}
+BuildArch:   noarch
 Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
-
 Source1:   %{name}.cron
 #Source2:   %{name}.init
 #Source3:   %{name}.service
@@ -278,6 +278,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Fri Feb 20 2015 Marianne Lombard <> - 2.3.15-3
+- building as noarch
+
 * Wed Feb 11 2015 Marianne Lombard <marianne@tuxette.fr> - 2.3.15-2
 - fix description of subpackage
 - using upstream systemd unit file

From 7d1aff0da602922f941eb1c68d33d9f7d4f2912c Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Sun, 22 Feb 2015 16:21:20 +0100
Subject: [PATCH 026/106] forgot mail adress

---
 fusioninventory-agent.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 8f68510..8c44241 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -278,7 +278,7 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
-* Fri Feb 20 2015 Marianne Lombard <> - 2.3.15-3
+* Fri Feb 20 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.15-3
 - building as noarch
 
 * Wed Feb 11 2015 Marianne Lombard <marianne@tuxette.fr> - 2.3.15-2

From c12955a6ed85905e8ec2748d39a509bb21ed36da Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Sun, 1 Mar 2015 09:26:40 +0100
Subject: [PATCH 027/106] re-enabling arch and excluding debug

---
 fusioninventory-agent.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 8c44241..c86cca6 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -1,3 +1,8 @@
+## Disabling debug package 
+## Can't build as noarch due to dmidecode requires
+%global debug_package %{nil}
+
+
 Name:        fusioninventory-agent
 Summary:     FusionInventory agent
 Group:       Applications/System
@@ -5,8 +10,8 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.15
-Release:     3%{?dist}
-BuildArch:   noarch
+Release:     4%{?dist}
+#BuildArch:   noarch
 Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 Source1:   %{name}.cron
 #Source2:   %{name}.init
@@ -124,7 +129,6 @@ This package provides software deployment support for FusionInventory-agent
 %package task-inventory
 Summary:    Inventory task for FusionInventory
 Group:      Applications/System
-BuildArch:  noarch
 Requires:   fusioninventory-agent = %{version}-%{release}
 Requires:   perl(Net::CUPS)
 Requires:   perl(Parse::EDID)
@@ -202,7 +206,6 @@ install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum
 install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum/pluginconf.d/%{name}.conf
 
 
-
 %post
 %systemd_post fusioninventory-agent.service
 
@@ -278,6 +281,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Sun Mar 1 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.15-4
+- arch build (due to dmidecode dependancy in x86_64)
+
 * Fri Feb 20 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.15-3
 - building as noarch
 

From 56a0d5a6bfdeb354399208062be7ddd078ff9759 Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Mon, 2 Mar 2015 08:03:15 +0100
Subject: [PATCH 028/106] update to 2.3.16

---
 fusioninventory-agent.spec | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index c86cca6..560f63c 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,8 +9,8 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.3.15
-Release:     4%{?dist}
+Version:     2.3.16
+Release:     1%{?dist}
 #BuildArch:   noarch
 Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 Source1:   %{name}.cron
@@ -20,6 +20,32 @@ Source1:   %{name}.cron
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(inc::Module::Install)
 BuildRequires: systemd
+BuildRequires: perl(Test::Compile)
+BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::Deep)
+BuildRequires: perl(Test::Exception)
+BuildRequires: perl(Test::NoWarnings)
+BuildRequires: perl(Test::MockModule)
+BuildRequires: perl(Test::MockObject::Extends)
+BuildRequires: perl(Test::HTTP::Server::Simple)
+BuildRequires: perl(UNIVERSAL::require)
+BuildRequires: perl(XML::TreePP)
+BuildRequires: perl(IPC::Run)
+BuildRequires: perl(Net::IP)
+BuildRequires: perl(Net::SNMP)
+BuildRequires: perl(Thread::Queue)
+BuildRequires: perl(Parse::EDID)
+BuildRequires: perl(JSON)
+BuildRequires: perl(HTTP::Proxy)
+BuildRequires: perl(HTTP::Daemon)
+BuildRequires: perl(HTTP::Server::Simple)
+BuildRequires: perl(File::Copy::Recursive)
+BuildRequires: perl(IO::Capture::Stderr)
+BuildRequires: perl(POE)
+BuildRequires: perl(POE::Component::Client::Ping)
+BuildRequires: perl(Sys::Syslog)
+BuildRequires: perl(LWP::Protocol::https)
+BuildRequires: perl(HTTP::Server::Simple::Authen)
 
 Requires:  perl-FusionInventory-Agent = %{version}-%{release}
 Requires:  logrotate
@@ -205,6 +231,8 @@ install -m 644 -D contrib/unix/%{name}.service	%{buildroot}%{_unitdir}/%{name}.s
 install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py
 install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum/pluginconf.d/%{name}.conf
 
+%check
+#make test
 
 %post
 %systemd_post fusioninventory-agent.service
@@ -281,6 +309,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Sun Mar 1 2015 Marianne Lombard <jehane@fedoraprojetc.org> - 2.3.16
+- update to 2.3.16
+- adding BuildRequires needed by test
+
 * Sun Mar 1 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.15-4
 - arch build (due to dmidecode dependancy in x86_64)
 

From 75a659f2279ef358a248af27f63290d7b404c37c Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Mon, 2 Mar 2015 08:10:26 +0100
Subject: [PATCH 029/106] new sources

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index d25ea84..c55cab8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /FusionInventory-Agent-2.3.15.tar.gz
+/FusionInventory-Agent-2.3.16.tar.gz
diff --git a/sources b/sources
index 7c4fa17..5c32a15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c34fefcb70076f860677eea056077ed  FusionInventory-Agent-2.3.15.tar.gz
+89467ae101a89544a6fbade2e7a879fe  FusionInventory-Agent-2.3.16.tar.gz

From df7a1db4165dd9b3752353dda82e8c9d07c0ce31 Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Sun, 29 Mar 2015 09:54:43 +0200
Subject: [PATCH 030/106] commenting unused buildrequires

---
 fusioninventory-agent.spec | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 560f63c..3c5008c 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -20,32 +20,32 @@ Source1:   %{name}.cron
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(inc::Module::Install)
 BuildRequires: systemd
-BuildRequires: perl(Test::Compile)
-BuildRequires: perl(Test::More)
-BuildRequires: perl(Test::Deep)
-BuildRequires: perl(Test::Exception)
-BuildRequires: perl(Test::NoWarnings)
-BuildRequires: perl(Test::MockModule)
-BuildRequires: perl(Test::MockObject::Extends)
-BuildRequires: perl(Test::HTTP::Server::Simple)
-BuildRequires: perl(UNIVERSAL::require)
-BuildRequires: perl(XML::TreePP)
-BuildRequires: perl(IPC::Run)
-BuildRequires: perl(Net::IP)
-BuildRequires: perl(Net::SNMP)
-BuildRequires: perl(Thread::Queue)
-BuildRequires: perl(Parse::EDID)
-BuildRequires: perl(JSON)
-BuildRequires: perl(HTTP::Proxy)
-BuildRequires: perl(HTTP::Daemon)
-BuildRequires: perl(HTTP::Server::Simple)
-BuildRequires: perl(File::Copy::Recursive)
-BuildRequires: perl(IO::Capture::Stderr)
-BuildRequires: perl(POE)
-BuildRequires: perl(POE::Component::Client::Ping)
-BuildRequires: perl(Sys::Syslog)
-BuildRequires: perl(LWP::Protocol::https)
-BuildRequires: perl(HTTP::Server::Simple::Authen)
+#BuildRequires: perl(Test::Compile)
+#BuildRequires: perl(Test::More)
+#BuildRequires: perl(Test::Deep)
+#BuildRequires: perl(Test::Exception)
+#BuildRequires: perl(Test::NoWarnings)
+#BuildRequires: perl(Test::MockModule)
+#BuildRequires: perl(Test::MockObject::Extends)
+#BuildRequires: perl(Test::HTTP::Server::Simple)
+#BuildRequires: perl(UNIVERSAL::require)
+#BuildRequires: perl(XML::TreePP)
+#BuildRequires: perl(IPC::Run)
+#BuildRequires: perl(Net::IP)
+#BuildRequires: perl(Net::SNMP)
+#BuildRequires: perl(Thread::Queue)
+#BuildRequires: perl(Parse::EDID)
+#BuildRequires: perl(JSON)
+#BuildRequires: perl(HTTP::Proxy)
+#BuildRequires: perl(HTTP::Daemon)
+#BuildRequires: perl(HTTP::Server::Simple)
+#BuildRequires: perl(File::Copy::Recursive)
+#BuildRequires: perl(IO::Capture::Stderr)
+#BuildRequires: perl(POE)
+#BuildRequires: perl(POE::Component::Client::Ping)
+#BuildRequires: perl(Sys::Syslog)
+#BuildRequires: perl(LWP::Protocol::https)
+#BuildRequires: perl(HTTP::Server::Simple::Authen)
 
 Requires:  perl-FusionInventory-Agent = %{version}-%{release}
 Requires:  logrotate

From edc4ff8d411fddc95661899fe54020368d376f33 Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Sun, 29 Mar 2015 09:56:14 +0200
Subject: [PATCH 031/106] adding changelog

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 3c5008c..58d1d5c 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.16
-Release:     1%{?dist}
+Release:     2%{?dist}
 #BuildArch:   noarch
 Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 Source1:   %{name}.cron
@@ -309,6 +309,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Sun Mar 29 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.16-2
+- commenting un-used BuildRequires
+
 * Sun Mar 1 2015 Marianne Lombard <jehane@fedoraprojetc.org> - 2.3.16
 - update to 2.3.16
 - adding BuildRequires needed by test

From 6fa60836953ffef266ecfd25cd1df52b52f9df3f Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Sat, 6 Jun 2015 09:30:22 +0200
Subject: [PATCH 032/106] Perl 5.22 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 58d1d5c..2d58ded 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.16
-Release:     2%{?dist}
+Release:     3%{?dist}
 #BuildArch:   noarch
 Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 Source1:   %{name}.cron
@@ -309,6 +309,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Sat Jun 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.16-3
+- Perl 5.22 rebuild
+
 * Sun Mar 29 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.16-2
 - commenting un-used BuildRequires
 

From e9f58b4c5fa912e9400a6c18d1a85160e0988e0a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 17 Jun 2015 06:51:34 +0000
Subject: [PATCH 033/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 2d58ded..9147080 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.16
-Release:     3%{?dist}
+Release:     4%{?dist}
 #BuildArch:   noarch
 Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 Source1:   %{name}.cron
@@ -309,6 +309,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Jun 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.16-3
 - Perl 5.22 rebuild
 

From da9733962964b3a56251a98492cd10e362f0cc5f Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Thu, 9 Jul 2015 13:55:00 +0200
Subject: [PATCH 034/106] bugfix

---
 fusioninventory-agent.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 9147080..75572f2 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.16
-Release:     4%{?dist}
+Release:     5%{?dist}
 #BuildArch:   noarch
 Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 Source1:   %{name}.cron
@@ -195,7 +195,7 @@ cat <<EOF | tee %{name}.conf
 # Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 # Global options (debug for verbose log, rpc-trust-localhost for yum-plugin)
-FUSINVOPT="--debug "
+OPTIONS="--debug "
 
 EOF
 
@@ -309,6 +309,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Jul 8 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.16-5
+- fix for #1240964 
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From c7493300b75beeed3980723ecddc68185438a0a8 Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Sun, 11 Oct 2015 17:01:09 +0200
Subject: [PATCH 035/106] new version

- Upstream switch to github, minor spec adaptation
---
 .gitignore                 |  1 +
 fusioninventory-agent.spec | 16 ++++++++++------
 sources                    |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c55cab8..5bdc389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /FusionInventory-Agent-2.3.15.tar.gz
 /FusionInventory-Agent-2.3.16.tar.gz
+/2.3.17.tar.gz
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 75572f2..a8de963 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,11 +9,11 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.3.16
-Release:     5%{?dist}
+Version:     2.3.17
+Release:     1%{?dist}
 #BuildArch:   noarch
-Source0:     http://search.cpan.org/CPAN/authors/id/G/GR/GROUSSE/FusionInventory-Agent-%{version}%{?prever}.tar.gz
-Source1:   %{name}.cron
+Source0:     https://github.com/fusioninventory/fusioninventory-agent/archive/%{version}.tar.gz
+Source1:     %{name}.cron
 #Source2:   %{name}.init
 #Source3:   %{name}.service
 
@@ -163,7 +163,7 @@ Requires:   perl(Parse::EDID)
 %description task-inventory
 fusioninventory-task-inventory
 %prep
-%setup -q -n FusionInventory-Agent-%{version}%{?prever}
+%setup -q -n %{name}-%{version}%{?prever}
 
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
@@ -172,7 +172,7 @@ cat <<EOF | tee %{name}-req
 sed -e '/perl(Win32/d'
 EOF
 
-%global __perl_requires %{_builddir}/FusionInventory-Agent-%{version}%{?prever}/%{name}-req
+%global __perl_requires %{_builddir}/%{name}-%{version}%{?prever}/%{name}-req
 chmod +x %{__perl_requires}
 
 cat <<EOF | tee logrotate
@@ -309,6 +309,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Oct 7 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.17
+- new version
+- Upstream switch to github, minor spec adaptation
+
 * Wed Jul 8 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.16-5
 - fix for #1240964 
 
diff --git a/sources b/sources
index 5c32a15..5f048ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89467ae101a89544a6fbade2e7a879fe  FusionInventory-Agent-2.3.16.tar.gz
+10a88ccc22d3ec0746147215eed6d3b2  2.3.17.tar.gz

From 69bf1e49af4e7593f3b34a015f04c32197700c49 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 3 Feb 2016 20:54:34 +0000
Subject: [PATCH 036/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index a8de963..1d5a4ef 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.17
-Release:     1%{?dist}
+Release:     2%{?dist}
 #BuildArch:   noarch
 Source0:     https://github.com/fusioninventory/fusioninventory-agent/archive/%{version}.tar.gz
 Source1:     %{name}.cron
@@ -309,6 +309,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Wed Oct 7 2015 Marianne Lombard <jehane@fedoraproject.org> - 2.3.17
 - new version
 - Upstream switch to github, minor spec adaptation

From 13f0bdd24403c3a59fd80a55e60742a4e14a4a8f Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Sun, 15 May 2016 23:13:07 +0200
Subject: [PATCH 037/106] Perl 5.24 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 1d5a4ef..2654be4 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.17
-Release:     2%{?dist}
+Release:     3%{?dist}
 #BuildArch:   noarch
 Source0:     https://github.com/fusioninventory/fusioninventory-agent/archive/%{version}.tar.gz
 Source1:     %{name}.cron
@@ -309,6 +309,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.17-3
+- Perl 5.24 rebuild
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From c588140dcd8edb4fbd88f999d2fcb5bf76e07151 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 21 Jun 2016 21:39:18 +0200
Subject: [PATCH 038/106] New upstream release

---
 .gitignore                    |  1 +
 fusioninventory-agent.service | 11 -------
 fusioninventory-agent.spec    | 55 ++++++++++-------------------------
 sources                       |  2 +-
 4 files changed, 17 insertions(+), 52 deletions(-)
 delete mode 100644 fusioninventory-agent.service

diff --git a/.gitignore b/.gitignore
index 5bdc389..4afe614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /FusionInventory-Agent-2.3.15.tar.gz
 /FusionInventory-Agent-2.3.16.tar.gz
 /2.3.17.tar.gz
+/2.3.18.tar.gz
diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service
deleted file mode 100644
index 0f4d9bb..0000000
--- a/fusioninventory-agent.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=FusionInventory agent
-After=syslog.target network.target
-
-[Service]
-EnvironmentFile=/etc/sysconfig/fusioninventory-agent
-ExecStart=/usr/bin/fusioninventory-agent $FUSINVOPT --logfile=/var/log/fusioninventory-agent/service.log --daemon --no-fork
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 2654be4..4d257ff 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,43 +9,14 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.3.17
-Release:     3%{?dist}
-#BuildArch:   noarch
+Version:     2.3.18
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/fusioninventory-agent/archive/%{version}.tar.gz
 Source1:     %{name}.cron
-#Source2:   %{name}.init
-#Source3:   %{name}.service
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(inc::Module::Install)
 BuildRequires: systemd
-#BuildRequires: perl(Test::Compile)
-#BuildRequires: perl(Test::More)
-#BuildRequires: perl(Test::Deep)
-#BuildRequires: perl(Test::Exception)
-#BuildRequires: perl(Test::NoWarnings)
-#BuildRequires: perl(Test::MockModule)
-#BuildRequires: perl(Test::MockObject::Extends)
-#BuildRequires: perl(Test::HTTP::Server::Simple)
-#BuildRequires: perl(UNIVERSAL::require)
-#BuildRequires: perl(XML::TreePP)
-#BuildRequires: perl(IPC::Run)
-#BuildRequires: perl(Net::IP)
-#BuildRequires: perl(Net::SNMP)
-#BuildRequires: perl(Thread::Queue)
-#BuildRequires: perl(Parse::EDID)
-#BuildRequires: perl(JSON)
-#BuildRequires: perl(HTTP::Proxy)
-#BuildRequires: perl(HTTP::Daemon)
-#BuildRequires: perl(HTTP::Server::Simple)
-#BuildRequires: perl(File::Copy::Recursive)
-#BuildRequires: perl(IO::Capture::Stderr)
-#BuildRequires: perl(POE)
-#BuildRequires: perl(POE::Component::Client::Ping)
-#BuildRequires: perl(Sys::Syslog)
-#BuildRequires: perl(LWP::Protocol::https)
-#BuildRequires: perl(HTTP::Server::Simple::Authen)
 
 Requires:  perl-FusionInventory-Agent = %{version}-%{release}
 Requires:  logrotate
@@ -142,14 +113,14 @@ Requires:   perl(Archive::Extract)
 This package provides software deployment support for FusionInventory-agent
 
 # Excluded due to the absence of perl-Net-Write
-# perl-Net-Write is licenced under Artistic Perl v1 licence, not accepted in Fedora 
-#%package task-wakeonlan
+# perl-Net-Write is licenced under Artistic Perl v1 licence, not accepted in Fedora
+#%%package task-wakeonlan
 #Summary:    WakeOnLan task for FusionInventory
 #Group:      Applications/System
 #BuildArch:  noarch
-#Requires:   fusioninventory-agent = %{version}-%{release}
+#Requires:   fusioninventory-agent = %%{version}-%%{release}
 
-#%description task-wakeonlan
+#%%description task-wakeonlan
 #fusioninventory-task-wakeonlan
 
 %package task-inventory
@@ -188,7 +159,7 @@ EOF
 cat <<EOF | tee %{name}.conf
 #
 # Fusion Inventory Agent Configuration File
-# used by hourly cron job and service launcher to override the %{name}.cfg setup.
+# used by hourly cron job and service launcher to override the %%{name}.cfg setup.
 #
 # DONT FORGET to enable the service !
 #
@@ -223,8 +194,7 @@ mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
 install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
-#install -m 644 -Dp %{SOURCE3}    %{buildroot}%{_unitdir}/%{name}.service
-install -m 644 -D contrib/unix/%{name}.service	%{buildroot}%{_unitdir}/%{name}.service
+install -m 644 -D contrib/unix/%{name}.service    %{buildroot}%{_unitdir}/%{name}.service
 
 
 # Yum plugin installation
@@ -265,7 +235,7 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent
 %dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task
 #excluding sub-packages files
-#%exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/
+#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/
 
 
 
@@ -296,7 +266,7 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy
 
 # Excluding task-wakeonlan
-#%files task-wakeonlan
+#%%files task-wakeonlan
 %exclude %{_bindir}/fusioninventory-wakeonlan
 %exclude %{_mandir}/man1/fusioninventory-wakeonlan.1*
 %exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
@@ -309,6 +279,11 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Tue Jun 21 2016 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.3.18-1
+- Last upstream release
+- Handle macros in comments to make rpmlint happy
+- Cleanup comments
+
 * Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.17-3
 - Perl 5.24 rebuild
 
diff --git a/sources b/sources
index 5f048ba..59746bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10a88ccc22d3ec0746147215eed6d3b2  2.3.17.tar.gz
+e646a25e250cc753a0ee9ea9c3504a06  2.3.18.tar.gz

From 2760b77beb5391a23bad3bb6ba831a50b743f4a8 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Wed, 22 Jun 2016 17:04:39 +0200
Subject: [PATCH 039/106] Add upstream patch for useless requires; change
 source, add task-collect

---
 .gitignore                                    |  1 +
 fusioninventory-agent-useless-module-cleaning | 34 ++++++++++++++++
 fusioninventory-agent.spec                    | 39 +++++++++++++++----
 sources                                       |  2 +-
 4 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 fusioninventory-agent-useless-module-cleaning

diff --git a/.gitignore b/.gitignore
index 4afe614..6e7c9b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /FusionInventory-Agent-2.3.16.tar.gz
 /2.3.17.tar.gz
 /2.3.18.tar.gz
+/FusionInventory-Agent-2.3.18.tar.gz
diff --git a/fusioninventory-agent-useless-module-cleaning b/fusioninventory-agent-useless-module-cleaning
new file mode 100644
index 0000000..22f6514
--- /dev/null
+++ b/fusioninventory-agent-useless-module-cleaning
@@ -0,0 +1,34 @@
+From 25404f038f99bd091e0fb2368879e848500f5082 Mon Sep 17 00:00:00 2001
+From: tlornet <tlornet@teclib.com>
+Date: Wed, 22 Jun 2016 16:01:54 +0200
+Subject: [PATCH] useless module cleaning
+
+---
+ Makefile.PL                         | 1 -
+ lib/FusionInventory/Agent/Config.pm | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 55987d3..ea39425 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -18,7 +18,6 @@ requires 'Net::IP'            => '0';
+ requires 'Text::Template'     => '0';
+ requires 'UNIVERSAL::require' => '0';
+ requires 'XML::TreePP'        => '0.26';
+-requires 'Data::Structure::Util' => '0';
+ 
+ if ($OSNAME eq 'MSWin32') {
+     requires 'Win32::OLE'         => '0';
+diff --git a/lib/FusionInventory/Agent/Config.pm b/lib/FusionInventory/Agent/Config.pm
+index 90d5295..8480018 100644
+--- a/lib/FusionInventory/Agent/Config.pm
++++ b/lib/FusionInventory/Agent/Config.pm
+@@ -7,7 +7,6 @@ use English qw(-no_match_vars);
+ use File::Spec;
+ use Getopt::Long;
+ use UNIVERSAL::require;
+-use Data::Structure::Util qw/unbless/;
+ 
+ require FusionInventory::Agent::Tools;
+ 
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 4d257ff..84bd460 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,12 +10,14 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.18
-Release:     1%{?dist}
-Source0:     https://github.com/fusioninventory/fusioninventory-agent/archive/%{version}.tar.gz
+Release:     2%{?dist}
+Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
+#Apply https://github.com/fusioninventory/fusioninventory-agent/commit/25404f038f99bd091e0fb2368879e848500f5082
+Patch0:      %{name}-useless-module-cleaning
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: perl(inc::Module::Install)
+BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: systemd
 
 Requires:  perl-FusionInventory-Agent = %{version}-%{release}
@@ -52,7 +54,9 @@ You can add additional packages for optional tasks:
     Software deployment support
 * fusioninventory-agent-task-esx
     vCenter/ESX/ESXi remote inventory
-* perl-FusionInventory-WakeOnLan
+* fusioninventory-agent-task-collect
+    Custom information retrieval support
+* fusioninventory-agent-task-wakeonlan
     not included due to a licensing issue for perl-Net-Write
 
 Edit the /etc/sysconfig/%{name} file for service configuration.
@@ -130,11 +134,23 @@ Requires:   fusioninventory-agent = %{version}-%{release}
 Requires:   perl(Net::CUPS)
 Requires:   perl(Parse::EDID)
 
-
 %description task-inventory
 fusioninventory-task-inventory
+
+%package task-collect
+Summary:    Custom information retrieval support for FusionInventory agent
+Group:      Applications/System
+Requires:   %{name} = %{version}-%{release}
+
+%description task-collect
+This package provides custom information retrieval support for
+FusionInventory agent
+
+
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
+%setup -q -n FusionInventory-Agent-%{version}
+
+%patch0 -p1
 
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
@@ -143,7 +159,7 @@ cat <<EOF | tee %{name}-req
 sed -e '/perl(Win32/d'
 EOF
 
-%global __perl_requires %{_builddir}/%{name}-%{version}%{?prever}/%{name}-req
+%global __perl_requires %{_builddir}/FusionInventory-Agent-%{version}%{?prever}/%{name}-req
 chmod +x %{__perl_requires}
 
 cat <<EOF | tee logrotate
@@ -159,7 +175,7 @@ EOF
 cat <<EOF | tee %{name}.conf
 #
 # Fusion Inventory Agent Configuration File
-# used by hourly cron job and service launcher to override the %%{name}.cfg setup.
+# used by hourly cron job and service launcher to override the %{name}.cfg setup.
 #
 # DONT FORGET to enable the service !
 #
@@ -277,8 +293,15 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.pm
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory
 
+%files task-collect
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Collect.pm
+
 
 %changelog
+* Wed Jun 22 2016 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.3.18-2
+- Add task-collect subpackage
+- Change package source according to upstream recomendations
+
 * Tue Jun 21 2016 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.3.18-1
 - Last upstream release
 - Handle macros in comments to make rpmlint happy
diff --git a/sources b/sources
index 59746bd..523b6a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e646a25e250cc753a0ee9ea9c3504a06  2.3.18.tar.gz
+caffff2fe695b2262529aa7541f1b94a  FusionInventory-Agent-2.3.18.tar.gz

From ee35b689b88e3e03cee0661705097e2eec8d0734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 24 Jun 2016 09:54:13 +0200
Subject: [PATCH 040/106] Mandatory Perl build-requires added
 <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl>

---
 fusioninventory-agent.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 84bd460..e8e786c 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -17,6 +17,7 @@ Source1:     %{name}.cron
 Patch0:      %{name}-useless-module-cleaning
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: perl-generators
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: systemd
 

From 389b60c31916727626569122194815f8aea38243 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 9 Feb 2017 14:08:20 +0100
Subject: [PATCH 041/106] Change configuration files

Re-add comments and default options to get cron mode working
Use new service file (proposed to upstream)
Deprecate using EnvironmentFile for service extra config
---
 fusioninventory-agent.cron    |  2 +-
 fusioninventory-agent.service | 23 +++++++++++++++++++++++
 fusioninventory-agent.spec    | 31 ++++++++++++++++++++++++++++---
 3 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 fusioninventory-agent.service

diff --git a/fusioninventory-agent.cron b/fusioninventory-agent.cron
index 8b4b99f..8129715 100644
--- a/fusioninventory-agent.cron
+++ b/fusioninventory-agent.cron
@@ -29,7 +29,7 @@ do
                 OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}"
         fi
         echo "[$(date '+%c')] Running $NAME $OPTS"
-        /usr/bin/$NAME $FUSINVOPT --logfile=$LOG $OPTS
+        /usr/bin/$NAME $OPTIONS --logfile=$LOG $OPTS
     fi
     ((i++))
 done
diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service
new file mode 100644
index 0000000..0d64a70
--- /dev/null
+++ b/fusioninventory-agent.service
@@ -0,0 +1,23 @@
+# It is not recommended to modify this file in-place, because it will be
+# overwritten during package upgrades.  If you want to customize, the best
+# way is to use the "systemctl edit" command to create an override unit.
+
+# For example, to pass additional options (for instance,
+# --debug --debug) to the agent at startup, create an override unit
+# (as is done by systemctl edit) and enter the following:
+
+# [Service]
+# Environment="OPTIONS=--debug --debug"
+
+[Unit]
+Description=FusionInventory agent
+After=syslog.target network.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/fusioninventory-agent
+Environment="OPTIONS=--debug"
+Environment="PATH=/sbin:/bin:/usr/sbin:/usr/bin"
+ExecStart=/usr/bin/fusioninventory-agent --daemon --no-fork $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index e8e786c..1d3d540 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,9 +10,13 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.18
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
+#From upstream proposed changes, see:
+#https://github.com/fusioninventory/fusioninventory-agent/pull/227
+#kept local to avoid upstream BC changes
+Source10:    %{name}.service
 #Apply https://github.com/fusioninventory/fusioninventory-agent/commit/25404f038f99bd091e0fb2368879e848500f5082
 Patch0:      %{name}-useless-module-cleaning
 
@@ -176,15 +180,32 @@ EOF
 cat <<EOF | tee %{name}.conf
 #
 # Fusion Inventory Agent Configuration File
-# used by hourly cron job and service launcher to override the %{name}.cfg setup.
+# used by hourly cron job to override the %{name}.cfg setup.
 #
-# DONT FORGET to enable the service !
+# /!\
+# USING THIS FILE TO OVERRIDE SERVICE OPTIONS IS DEPRECATED!
+# See %{_unitdir}/%{name}.service notice
 #
 # Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 # Global options (debug for verbose log, rpc-trust-localhost for yum-plugin)
 OPTIONS="--debug "
 
+# Mode, change to "cron" to activate
+# - none (default on install) no activity
+# - cron (inventory only) use the cron.hourly
+OCSMODE[0]=none
+# OCS Inventory or FusionInventory server URI
+# OCSSERVER[0]=your.ocsserver.name
+# OCSSERVER[0]=http://your.ocsserver.name/ocsinventory
+# OCSSERVER[0]=http://your.glpiserveur.name/glpi/plugins/fusioninventory/
+# corresponds with --local=%{_localstatedir}/lib/%{name}
+# OCSSERVER[0]=local
+# Wait before inventory (for cron mode)
+OCSPAUSE[0]=120
+# Administrative TAG (optional, must be filed before first inventory)
+OCSTAG[0]=
+
 EOF
 
 
@@ -299,6 +320,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Fri Feb 09 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.18-3
+- Change systemd unit to not use fork mode
+- Re-add options in sysconfig file to get cron mode running
+
 * Wed Jun 22 2016 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.3.18-2
 - Add task-collect subpackage
 - Change package source according to upstream recomendations

From d4d4157080baf98d1b908bdf2491d666c7ae999b Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 9 Feb 2017 14:27:20 +0100
Subject: [PATCH 042/106] Typo, more comprehensible example

---
 fusioninventory-agent.service | 4 ++--
 fusioninventory-agent.spec    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service
index 0d64a70..9116f01 100644
--- a/fusioninventory-agent.service
+++ b/fusioninventory-agent.service
@@ -3,11 +3,11 @@
 # way is to use the "systemctl edit" command to create an override unit.
 
 # For example, to pass additional options (for instance,
-# --debug --debug) to the agent at startup, create an override unit
+# --no-category=software) to the agent at startup, create an override unit
 # (as is done by systemctl edit) and enter the following:
 
 # [Service]
-# Environment="OPTIONS=--debug --debug"
+# Environment="OPTIONS=--no-category=software"
 
 [Unit]
 Description=FusionInventory agent
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 1d3d540..8b3846a 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -15,7 +15,7 @@ Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{vers
 Source1:     %{name}.cron
 #From upstream proposed changes, see:
 #https://github.com/fusioninventory/fusioninventory-agent/pull/227
-#kept local to avoid upstream BC changes
+#kept local to avoid upstream BC breaks
 Source10:    %{name}.service
 #Apply https://github.com/fusioninventory/fusioninventory-agent/commit/25404f038f99bd091e0fb2368879e848500f5082
 Patch0:      %{name}-useless-module-cleaning

From ec0ae32da4c9028f188bdf78d3c919e24910a448 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 9 Feb 2017 17:47:26 +0100
Subject: [PATCH 043/106] Another try for Environment

---
 fusioninventory-agent.service      | 3 ---
 fusioninventory-agent.service.conf | 9 +++++++++
 fusioninventory-agent.spec         | 9 ++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 fusioninventory-agent.service.conf

diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service
index 9116f01..2e220d4 100644
--- a/fusioninventory-agent.service
+++ b/fusioninventory-agent.service
@@ -14,9 +14,6 @@ Description=FusionInventory agent
 After=syslog.target network.target
 
 [Service]
-EnvironmentFile=-/etc/sysconfig/fusioninventory-agent
-Environment="OPTIONS=--debug"
-Environment="PATH=/sbin:/bin:/usr/sbin:/usr/bin"
 ExecStart=/usr/bin/fusioninventory-agent --daemon --no-fork $OPTIONS
 
 [Install]
diff --git a/fusioninventory-agent.service.conf b/fusioninventory-agent.service.conf
new file mode 100644
index 0000000..77ee066
--- /dev/null
+++ b/fusioninventory-agent.service.conf
@@ -0,0 +1,9 @@
+# Extra configuration file for fusioninventory-agent unit
+[Service]
+#Deprecated: will be removed in a future version
+EnvironmentFile=-/etc/sysconfig/fusioninventory-agent
+#New way to declare values
+#Commented right now, because it will be overriden from EnvironmentFile
+#Will be enabled in a future version
+#Environment="OPTIONS=--debug"
+#Environment="PATH=/sbin:/bin:/usr/sbin:/usr/bin"
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 8b3846a..fee1a00 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -17,6 +17,7 @@ Source1:     %{name}.cron
 #https://github.com/fusioninventory/fusioninventory-agent/pull/227
 #kept local to avoid upstream BC breaks
 Source10:    %{name}.service
+Source11:    %{name}.service.conf
 #Apply https://github.com/fusioninventory/fusioninventory-agent/commit/25404f038f99bd091e0fb2368879e848500f5082
 Patch0:      %{name}-useless-module-cleaning
 
@@ -64,7 +65,6 @@ You can add additional packages for optional tasks:
 * fusioninventory-agent-task-wakeonlan
     not included due to a licensing issue for perl-Net-Write
 
-Edit the /etc/sysconfig/%{name} file for service configuration.
 
 %package -n perl-FusionInventory-Agent
 Summary:        Libraries for Fusioninventory agent
@@ -232,7 +232,8 @@ mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
 install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
-install -m 644 -D contrib/unix/%{name}.service    %{buildroot}%{_unitdir}/%{name}.service
+install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
+install -m 644 -D  %{SOURCE11}   %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/%{name}.conf
 
 
 # Yum plugin installation
@@ -261,6 +262,8 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg
 %{_sysconfdir}/cron.hourly/%{name}
 %{_unitdir}/%{name}.service
+%dir %{_sysconfdir}/systemd/system/%{name}.service.d
+%{_sysconfdir}/systemd/system/%{name}.service.d/%{name}.conf
 %{_bindir}/fusioninventory-agent
 %{_bindir}/fusioninventory-injector
 %{_mandir}/man1/fusioninventory-agent*
@@ -320,7 +323,7 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
-* Fri Feb 09 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.18-3
+* Thu Feb 09 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.18-3
 - Change systemd unit to not use fork mode
 - Re-add options in sysconfig file to get cron mode running
 

From a94e135d723c7b863c739ed4161256f0d3ab5563 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Fri, 10 Feb 2017 08:34:59 +0100
Subject: [PATCH 044/106] Rename file so it will be directly opened on
 'systemctl edit'

Change .service comment, patch has been refused upstream
---
 fusioninventory-agent.spec | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index fee1a00..cd62ec3 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -13,9 +13,7 @@ Version:     2.3.18
 Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
-#From upstream proposed changes, see:
-#https://github.com/fusioninventory/fusioninventory-agent/pull/227
-#kept local to avoid upstream BC breaks
+#Use systemd override capabilities
 Source10:    %{name}.service
 Source11:    %{name}.service.conf
 #Apply https://github.com/fusioninventory/fusioninventory-agent/commit/25404f038f99bd091e0fb2368879e848500f5082
@@ -233,8 +231,7 @@ install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
 install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
-install -m 644 -D  %{SOURCE11}   %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/%{name}.conf
-
+install -m 644 -D  %{SOURCE11}   %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/override.conf
 
 # Yum plugin installation
 install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py
@@ -263,7 +260,7 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %{_sysconfdir}/cron.hourly/%{name}
 %{_unitdir}/%{name}.service
 %dir %{_sysconfdir}/systemd/system/%{name}.service.d
-%{_sysconfdir}/systemd/system/%{name}.service.d/%{name}.conf
+%{_sysconfdir}/systemd/system/%{name}.service.d/override.conf
 %{_bindir}/fusioninventory-agent
 %{_bindir}/fusioninventory-injector
 %{_mandir}/man1/fusioninventory-agent*

From 8f557ada2f3ebe37384d3348de1ef93aca28cc3f Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Sat, 18 Feb 2017 18:50:48 +0100
Subject: [PATCH 045/106] Last upstream release

---
 .gitignore                                    |  1 +
 fusioninventory-agent-useless-module-cleaning | 34 -------------------
 fusioninventory-agent.spec                    | 13 ++++---
 sources                                       |  2 +-
 4 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 fusioninventory-agent-useless-module-cleaning

diff --git a/.gitignore b/.gitignore
index 6e7c9b0..a7d0d83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /2.3.17.tar.gz
 /2.3.18.tar.gz
 /FusionInventory-Agent-2.3.18.tar.gz
+/FusionInventory-Agent-2.3.19.tar.gz
diff --git a/fusioninventory-agent-useless-module-cleaning b/fusioninventory-agent-useless-module-cleaning
deleted file mode 100644
index 22f6514..0000000
--- a/fusioninventory-agent-useless-module-cleaning
+++ /dev/null
@@ -1,34 +0,0 @@
-From 25404f038f99bd091e0fb2368879e848500f5082 Mon Sep 17 00:00:00 2001
-From: tlornet <tlornet@teclib.com>
-Date: Wed, 22 Jun 2016 16:01:54 +0200
-Subject: [PATCH] useless module cleaning
-
----
- Makefile.PL                         | 1 -
- lib/FusionInventory/Agent/Config.pm | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index 55987d3..ea39425 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -18,7 +18,6 @@ requires 'Net::IP'            => '0';
- requires 'Text::Template'     => '0';
- requires 'UNIVERSAL::require' => '0';
- requires 'XML::TreePP'        => '0.26';
--requires 'Data::Structure::Util' => '0';
- 
- if ($OSNAME eq 'MSWin32') {
-     requires 'Win32::OLE'         => '0';
-diff --git a/lib/FusionInventory/Agent/Config.pm b/lib/FusionInventory/Agent/Config.pm
-index 90d5295..8480018 100644
---- a/lib/FusionInventory/Agent/Config.pm
-+++ b/lib/FusionInventory/Agent/Config.pm
-@@ -7,7 +7,6 @@ use English qw(-no_match_vars);
- use File::Spec;
- use Getopt::Long;
- use UNIVERSAL::require;
--use Data::Structure::Util qw/unbless/;
- 
- require FusionInventory::Agent::Tools;
- 
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index cd62ec3..7befc84 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,15 +9,13 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.3.18
-Release:     3%{?dist}
+Version:     2.3.19
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
 Source10:    %{name}.service
 Source11:    %{name}.service.conf
-#Apply https://github.com/fusioninventory/fusioninventory-agent/commit/25404f038f99bd091e0fb2368879e848500f5082
-Patch0:      %{name}-useless-module-cleaning
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -153,8 +151,6 @@ FusionInventory agent
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
-%patch0 -p1
-
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
 #!/bin/sh
@@ -260,7 +256,7 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %{_sysconfdir}/cron.hourly/%{name}
 %{_unitdir}/%{name}.service
 %dir %{_sysconfdir}/systemd/system/%{name}.service.d
-%{_sysconfdir}/systemd/system/%{name}.service.d/override.conf
+%config(noreplace) %{_sysconfdir}/systemd/system/%{name}.service.d/override.conf
 %{_bindir}/fusioninventory-agent
 %{_bindir}/fusioninventory-injector
 %{_mandir}/man1/fusioninventory-agent*
@@ -320,6 +316,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Sat Feb 18 2017 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.3.19-1
+- Last upstream release
+
 * Thu Feb 09 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.18-3
 - Change systemd unit to not use fork mode
 - Re-add options in sysconfig file to get cron mode running
diff --git a/sources b/sources
index 523b6a9..6877158 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-caffff2fe695b2262529aa7541f1b94a  FusionInventory-Agent-2.3.18.tar.gz
+SHA512 (FusionInventory-Agent-2.3.19.tar.gz) = 438b2df00d82ae272106ce5f3bb5006afe58e67651f566e7d1b3c1f4a508f0f523dca7f01dfad73f845b537de7c3a51fdaf09a9d098a955cfce331b2f8d2aaa1

From e1af1ddc84d2623a3032b92f2db2a7673d28681f Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Mon, 20 Feb 2017 13:23:07 +0100
Subject: [PATCH 046/106] Fix setup.pm path that are no longer changed from
 makefile call

---
 fusioninventory-agent-setup.pm.patch | 41 ++++++++++++++++++++++++++++
 fusioninventory-agent.spec           | 14 +++++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 fusioninventory-agent-setup.pm.patch

diff --git a/fusioninventory-agent-setup.pm.patch b/fusioninventory-agent-setup.pm.patch
new file mode 100644
index 0000000..045dd9d
--- /dev/null
+++ b/fusioninventory-agent-setup.pm.patch
@@ -0,0 +1,41 @@
+diff --git a/bin/setup.pm b/bin/setup.pm
+index 3f92279..c7132f0 100644
+--- a/bin/setup.pm
++++ b/bin/setup.pm
+@@ -8,30 +8,11 @@ our @EXPORT = ('%setup');
+ 
+ our %setup;
+ 
+-# From here we can setup @INC so any needed perl module can be found. We add
+-# as many 'use lib' directive as needed
+-# We could also define '%setup' hash while useful
+-
+-# Here is a sample working from sources directory or its bin subfolder
+-if (-d 'lib') {
+-    use lib './lib' ;
+-
+-    %setup = (
+-        confdir => './etc',
+-        datadir => './share',
+-        libdir  => './lib',
+-        vardir  => './var',
+-    );
+-
+-} elsif (-d '../lib') {
+-    use lib '../lib';
+-
+-    %setup = (
+-        confdir => '../etc',
+-        datadir => '../share',
+-        libdir  => '../lib',
+-        vardir  => '../var',
+-    );
+-}
++%setup = (
++   confdir => 'CONFDIR',
++   datadir => 'DATADIR',
++   libdir  => 'LIBDIR',
++   vardir  => 'VARDIR',
++);
+ 
+ 1;
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 7befc84..2a8f85b 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,12 +10,13 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.19
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
 Source10:    %{name}.service
 Source11:    %{name}.service.conf
+Patch0:      %{name}-setup.pm.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -151,6 +152,14 @@ FusionInventory agent
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
+%patch0 -p1
+sed \
+    -e "s|CONFDIR|%{_sysconfdir}/fusioninventory|"  \
+    -e "s|DATADIR|%{_datarootdir}/fusioninventory|"   \
+    -e "s|LIBDIR|%{_datarootdir}/fusioninventory/lib|"    \
+    -e "s|VARDIR|%{_sharedstatedir}/fusioninventory|" \
+    -i bin/setup.pm
+
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
 #!/bin/sh
@@ -316,6 +325,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Mon Feb 20 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.19-2
+- Fix setup.pm values
+
 * Sat Feb 18 2017 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.3.19-1
 - Last upstream release
 

From 47a59da851f05b2ad49fa9855b3cdb7ec98c6d31 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Wed, 17 May 2017 17:04:36 +0200
Subject: [PATCH 047/106] Fix building on Perl without '.' in @INC

---
 ...ry-agent-Fix-building-on-Perl-without-dot-in-INC.patch | 8 ++++++++
 fusioninventory-agent.spec                                | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 fusioninventory-agent-Fix-building-on-Perl-without-dot-in-INC.patch

diff --git a/fusioninventory-agent-Fix-building-on-Perl-without-dot-in-INC.patch b/fusioninventory-agent-Fix-building-on-Perl-without-dot-in-INC.patch
new file mode 100644
index 0000000..5a179a6
--- /dev/null
+++ b/fusioninventory-agent-Fix-building-on-Perl-without-dot-in-INC.patch
@@ -0,0 +1,8 @@
+diff -up FusionInventory-Agent-2.3.19/Makefile.PL.orig FusionInventory-Agent-2.3.19/Makefile.PL
+--- FusionInventory-Agent-2.3.19/Makefile.PL.orig	2017-05-17 16:56:26.614727923 +0200
++++ FusionInventory-Agent-2.3.19/Makefile.PL	2017-05-17 16:56:44.532657797 +0200
+@@ -1,3 +1,4 @@
++BEGIN { push @INC, '.'; }
+ 
+ use inc::Module::Install;
+ use English qw(-no_match_vars);
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 2a8f85b..39df2ca 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,13 +10,14 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.19
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
 Source10:    %{name}.service
 Source11:    %{name}.service.conf
 Patch0:      %{name}-setup.pm.patch
+Patch1:      %{name}-Fix-building-on-Perl-without-dot-in-INC.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -153,6 +154,7 @@ FusionInventory agent
 %setup -q -n FusionInventory-Agent-%{version}
 
 %patch0 -p1
+%patch1 -p1
 sed \
     -e "s|CONFDIR|%{_sysconfdir}/fusioninventory|"  \
     -e "s|DATADIR|%{_datarootdir}/fusioninventory|"   \
@@ -325,6 +327,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed May 17 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.19-3
+- Fix building on Perl without '.' in @INC
+
 * Mon Feb 20 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.19-2
 - Fix setup.pm values
 

From 0fca4ecd0dd717efc1b7139a96c17535c87ceb77 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Sun, 4 Jun 2017 09:30:13 +0200
Subject: [PATCH 048/106] Perl 5.26 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 39df2ca..f035de3 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.19
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
@@ -327,6 +327,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.19-4
+- Perl 5.26 rebuild
+
 * Wed May 17 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.19-3
 - Fix building on Perl without '.' in @INC
 

From ed5110ce9ea28a514ed187a3f12c43cb4190b6c8 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 6 Jun 2017 10:04:56 +0200
Subject: [PATCH 049/106] Update to latest upstream release

Drop patches applied upstream
---
 .gitignore                                    |  1 +
 ...-building-on-Perl-without-dot-in-INC.patch |  8 ----
 fusioninventory-agent-setup.pm.patch          | 41 -------------------
 fusioninventory-agent.spec                    | 19 +++------
 sources                                       |  2 +-
 5 files changed, 8 insertions(+), 63 deletions(-)
 delete mode 100644 fusioninventory-agent-Fix-building-on-Perl-without-dot-in-INC.patch
 delete mode 100644 fusioninventory-agent-setup.pm.patch

diff --git a/.gitignore b/.gitignore
index a7d0d83..f8cca5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /2.3.18.tar.gz
 /FusionInventory-Agent-2.3.18.tar.gz
 /FusionInventory-Agent-2.3.19.tar.gz
+/FusionInventory-Agent-2.3.20.tar.gz
diff --git a/fusioninventory-agent-Fix-building-on-Perl-without-dot-in-INC.patch b/fusioninventory-agent-Fix-building-on-Perl-without-dot-in-INC.patch
deleted file mode 100644
index 5a179a6..0000000
--- a/fusioninventory-agent-Fix-building-on-Perl-without-dot-in-INC.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -up FusionInventory-Agent-2.3.19/Makefile.PL.orig FusionInventory-Agent-2.3.19/Makefile.PL
---- FusionInventory-Agent-2.3.19/Makefile.PL.orig	2017-05-17 16:56:26.614727923 +0200
-+++ FusionInventory-Agent-2.3.19/Makefile.PL	2017-05-17 16:56:44.532657797 +0200
-@@ -1,3 +1,4 @@
-+BEGIN { push @INC, '.'; }
- 
- use inc::Module::Install;
- use English qw(-no_match_vars);
diff --git a/fusioninventory-agent-setup.pm.patch b/fusioninventory-agent-setup.pm.patch
deleted file mode 100644
index 045dd9d..0000000
--- a/fusioninventory-agent-setup.pm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/bin/setup.pm b/bin/setup.pm
-index 3f92279..c7132f0 100644
---- a/bin/setup.pm
-+++ b/bin/setup.pm
-@@ -8,30 +8,11 @@ our @EXPORT = ('%setup');
- 
- our %setup;
- 
--# From here we can setup @INC so any needed perl module can be found. We add
--# as many 'use lib' directive as needed
--# We could also define '%setup' hash while useful
--
--# Here is a sample working from sources directory or its bin subfolder
--if (-d 'lib') {
--    use lib './lib' ;
--
--    %setup = (
--        confdir => './etc',
--        datadir => './share',
--        libdir  => './lib',
--        vardir  => './var',
--    );
--
--} elsif (-d '../lib') {
--    use lib '../lib';
--
--    %setup = (
--        confdir => '../etc',
--        datadir => '../share',
--        libdir  => '../lib',
--        vardir  => '../var',
--    );
--}
-+%setup = (
-+   confdir => 'CONFDIR',
-+   datadir => 'DATADIR',
-+   libdir  => 'LIBDIR',
-+   vardir  => 'VARDIR',
-+);
- 
- 1;
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index f035de3..d07affd 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,15 +9,13 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.3.19
-Release:     4%{?dist}
+Version:     2.3.20
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
 Source10:    %{name}.service
 Source11:    %{name}.service.conf
-Patch0:      %{name}-setup.pm.patch
-Patch1:      %{name}-Fix-building-on-Perl-without-dot-in-INC.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -153,15 +151,6 @@ FusionInventory agent
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
-%patch0 -p1
-%patch1 -p1
-sed \
-    -e "s|CONFDIR|%{_sysconfdir}/fusioninventory|"  \
-    -e "s|DATADIR|%{_datarootdir}/fusioninventory|"   \
-    -e "s|LIBDIR|%{_datarootdir}/fusioninventory/lib|"    \
-    -e "s|VARDIR|%{_sharedstatedir}/fusioninventory|" \
-    -i bin/setup.pm
-
 # This work only on older version, and is ignored on recent
 cat <<EOF | tee %{name}-req
 #!/bin/sh
@@ -327,6 +316,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Tue Jun 06 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.20-1
+- Last upstream release
+- Drop patches, upstream has provided fixes
+
 * Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.19-4
 - Perl 5.26 rebuild
 
diff --git a/sources b/sources
index 6877158..2adf09a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.3.19.tar.gz) = 438b2df00d82ae272106ce5f3bb5006afe58e67651f566e7d1b3c1f4a508f0f523dca7f01dfad73f845b537de7c3a51fdaf09a9d098a955cfce331b2f8d2aaa1
+SHA512 (FusionInventory-Agent-2.3.20.tar.gz) = 3037a6af26e9b670c249a95755891c9bbd77ade50b4ec3c0cbcbd8b61085e2181414d2e74d6f7351806165ccde47b02b2a4aa5f91b5f0649577ee2d6f8d6c717

From be8f25b05799b063757ba89667a52d859bcead74 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Wed, 7 Jun 2017 23:31:52 +0200
Subject: [PATCH 050/106] Perl 5.26 re-rebuild of bootstrapped packages

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index d07affd..d996664 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.20
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
@@ -316,6 +316,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.20-2
+- Perl 5.26 re-rebuild of bootstrapped packages
+
 * Tue Jun 06 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.20-1
 - Last upstream release
 - Drop patches, upstream has provided fixes

From bd190a424083565bc9d549585b400b943565b6b7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 08:54:29 +0000
Subject: [PATCH 051/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index d996664..cae9bb7 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.20
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
@@ -316,6 +316,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.3.20-2
 - Perl 5.26 re-rebuild of bootstrapped packages
 

From 36959719a45609cd7ccb31c1dc3765ad9e040cc4 Mon Sep 17 00:00:00 2001
From: jehane <marianne@tuxette.fr>
Date: Tue, 1 Aug 2017 14:45:29 +0200
Subject: [PATCH 052/106] new version

---
 .gitignore                 | 1 +
 fusioninventory-agent.spec | 7 +++++--
 sources                    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f8cca5e..fddab8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /FusionInventory-Agent-2.3.18.tar.gz
 /FusionInventory-Agent-2.3.19.tar.gz
 /FusionInventory-Agent-2.3.20.tar.gz
+/FusionInventory-Agent-2.3.21.tar.gz
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index cae9bb7..0aa169f 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,8 +9,8 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.3.20
-Release:     3%{?dist}
+Version:     2.3.21
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
@@ -316,6 +316,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Tue Aug 01 2017 Marianne Lombard <jehane@fedoraproject.org> - 2.3.21
+- Last upstream release
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 2adf09a..ac42af3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.3.20.tar.gz) = 3037a6af26e9b670c249a95755891c9bbd77ade50b4ec3c0cbcbd8b61085e2181414d2e74d6f7351806165ccde47b02b2a4aa5f91b5f0649577ee2d6f8d6c717
+SHA512 (FusionInventory-Agent-2.3.21.tar.gz) = 5f5628b4851431fe0c93ebfffdc91281efaa8aed721cf79439dbb738bfc765d3d01bb5e639de7dd2fcfc06537f7b472ea8b14ae4b9e6e5c408b68039a8b2185e

From 76234f1bb0f3f77ec2466cd72c8de11f68152326 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Mon, 14 Aug 2017 08:24:52 +0200
Subject: [PATCH 053/106] Add missing provides on perl(setup)

---
 fusioninventory-agent.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 0aa169f..99b7426 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.21
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
@@ -72,6 +72,7 @@ Requires:       perl(Net::SSLeay)
 Requires:       perl(Proc::Daemon)
 Requires:       perl(Proc::PID::File)
 Requires:       perl(Socket::GetAddrInfo)
+Provides:       perl(setup) = %{version}-%{release}
 
 %description -n perl-FusionInventory-Agent
 Libraries for Fusioninventory agent.
@@ -316,7 +317,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
-* Tue Aug 01 2017 Marianne Lombard <jehane@fedoraproject.org> - 2.3.21
+* Thu Aug 10 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.21-2
+- Fix missing provides issue on perl(setup)
+
+* Tue Aug 01 2017 Marianne Lombard <jehane@fedoraproject.org> - 2.3.21-1
 - Last upstream release
 
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.20-3

From 3d85a3014d4ea8dbb26454ed6a3fabac152d4769 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Wed, 18 Oct 2017 09:06:53 +0200
Subject: [PATCH 054/106] Do not provides perl(setup); BZ #1485919 - thanks to
 E. Seyman

---
 fusioninventory-agent.spec | 49 ++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 99b7426..3739100 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.3.21
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
@@ -34,9 +34,10 @@ Requires(preun):    systemd
 Requires(postun):   systemd
 
 # excluding internal requires and windows stuff
-%global __provides_exclude %{?__provides_exclude:__provides_exclude|}^perl\\(FusionInventory::
-%global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(FusionInventory::
-%global __requires_exclude %__requires_exclude|^perl\\(Win32
+# excluding perl(setup) and windows stuff
+%{?perl_default_filter}
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(setup\\)$
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Win32|setup\\)$
 
 %description
 FusionInventory Agent is an application designed to help a network
@@ -72,7 +73,6 @@ Requires:       perl(Net::SSLeay)
 Requires:       perl(Proc::Daemon)
 Requires:       perl(Proc::PID::File)
 Requires:       perl(Socket::GetAddrInfo)
-Provides:       perl(setup) = %{version}-%{release}
 
 %description -n perl-FusionInventory-Agent
 Libraries for Fusioninventory agent.
@@ -80,7 +80,7 @@ Libraries for Fusioninventory agent.
 %package task-esx
 Summary:    FusionInventory plugin to inventory vCenter/ESX/ESXi
 BuildArch:  noarch
-Requires:   fusioninventory-agent = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
 
 %description task-esx
 fusioninventory-agent-task-ESX ask the running service agent to inventory an 
@@ -103,7 +103,7 @@ This requires the service to be running with the --rpc-trust-localhost option.
 Summary:    NetDiscovery and NetInventory task for FusionInventory
 Group:      Applications/System
 BuildArch:      noarch
-Requires:       fusioninventory-agent = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description task-network
 fusioninventory-task-netdiscovery and fusioninventory-task-netinventory
@@ -112,27 +112,29 @@ fusioninventory-task-netdiscovery and fusioninventory-task-netinventory
 Summary:    Software deployment support for FusionInventory agent
 Group:      Applications/System
 BuildArch:  noarch
-Requires:   fusioninventory-agent = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
 Requires:   perl(Archive::Extract)
 
 %description task-deploy
 This package provides software deployment support for FusionInventory-agent
 
+%if !%{defined perl_net_write}
 # Excluded due to the absence of perl-Net-Write
 # perl-Net-Write is licenced under Artistic Perl v1 licence, not accepted in Fedora
-#%%package task-wakeonlan
-#Summary:    WakeOnLan task for FusionInventory
-#Group:      Applications/System
-#BuildArch:  noarch
-#Requires:   fusioninventory-agent = %%{version}-%%{release}
+%package task-wakeonlan
+Summary:    WakeOnLan task for FusionInventory
+Group:      Applications/System
+BuildArch:  noarch
+Requires:   %{name} = %{version}-%{release}
 
-#%%description task-wakeonlan
-#fusioninventory-task-wakeonlan
+%description task-wakeonlan
+fusioninventory-task-wakeonlan
+%endif
 
 %package task-inventory
 Summary:    Inventory task for FusionInventory
 Group:      Applications/System
-Requires:   fusioninventory-agent = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
 Requires:   perl(Net::CUPS)
 Requires:   perl(Parse::EDID)
 
@@ -152,16 +154,6 @@ FusionInventory agent
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
-# This work only on older version, and is ignored on recent
-cat <<EOF | tee %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |
-sed -e '/perl(Win32/d'
-EOF
-
-%global __perl_requires %{_builddir}/FusionInventory-Agent-%{version}%{?prever}/%{name}-req
-chmod +x %{__perl_requires}
-
 cat <<EOF | tee logrotate
 %{_localstatedir}/log/%{name}/*.log {
     weekly
@@ -215,8 +207,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 
@@ -317,6 +307,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Mon Oct 16 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.21-3
+- Do not provides perl(setup); BZ #1485919 - thanks to E. Seyman
+
 * Thu Aug 10 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.21-2
 - Fix missing provides issue on perl(setup)
 

From 44573d3a36722dbbabe98e76e832c9f7570fd8b5 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Fri, 12 Jan 2018 11:53:49 +0100
Subject: [PATCH 055/106] New upstream release

Cron config stuff is now in a separate sub-package
Old sysconfig file is no longer used from systemd service
A conf.d directory has been added
Dependency on obsolete perl-pid-file has been removed
---
 .gitignore                         |  1 +
 fusioninventory-agent.service.conf |  9 ++-------
 fusioninventory-agent.spec         | 29 +++++++++++++++++++++++------
 sources                            |  2 +-
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index fddab8c..8b35181 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /FusionInventory-Agent-2.3.19.tar.gz
 /FusionInventory-Agent-2.3.20.tar.gz
 /FusionInventory-Agent-2.3.21.tar.gz
+/FusionInventory-Agent-2.4.tar.gz
diff --git a/fusioninventory-agent.service.conf b/fusioninventory-agent.service.conf
index 77ee066..5dfcb9e 100644
--- a/fusioninventory-agent.service.conf
+++ b/fusioninventory-agent.service.conf
@@ -1,9 +1,4 @@
 # Extra configuration file for fusioninventory-agent unit
 [Service]
-#Deprecated: will be removed in a future version
-EnvironmentFile=-/etc/sysconfig/fusioninventory-agent
-#New way to declare values
-#Commented right now, because it will be overriden from EnvironmentFile
-#Will be enabled in a future version
-#Environment="OPTIONS=--debug"
-#Environment="PATH=/sbin:/bin:/usr/sbin:/usr/bin"
+Environment="OPTIONS=--debug"
+Environment="PATH=/sbin:/bin:/usr/sbin:/usr/bin"
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 3739100..e0b3234 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,8 +9,8 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.3.21
-Release:     3%{?dist}
+Version:     2.4
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 #Use systemd override capabilities
@@ -71,7 +71,6 @@ Requires:       perl(LWP)
 Requires:       perl(Net::CUPS)
 Requires:       perl(Net::SSLeay)
 Requires:       perl(Proc::Daemon)
-Requires:       perl(Proc::PID::File)
 Requires:       perl(Socket::GetAddrInfo)
 
 %description -n perl-FusionInventory-Agent
@@ -150,6 +149,14 @@ Requires:   %{name} = %{version}-%{release}
 This package provides custom information retrieval support for
 FusionInventory agent
 
+%package cron
+Summary:    Cron for FusionInventory agent
+Group:      Applications/System
+Requires:   %{name} = %{version}-%{release}
+
+%description cron
+fusioninventory cron task
+
 
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
@@ -164,6 +171,8 @@ cat <<EOF | tee logrotate
 }
 EOF
 
+sed -e 's|#include "conf\.d/"|include "conf\.d/"|' -i etc/agent.cfg
+
 cat <<EOF | tee %{name}.conf
 #
 # Fusion Inventory Agent Configuration File
@@ -196,7 +205,6 @@ OCSTAG[0]=
 EOF
 
 
-
 %build
 perl Makefile.PL \
      PREFIX=%{_prefix} \
@@ -213,6 +221,7 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 %{_fixperms} %{buildroot}/*
 
 mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
+mkdir -p %{buildroot}%{_sysconfdir}/fusioninventory/conf.d
 
 install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
@@ -242,9 +251,8 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %files
 %dir %{_sysconfdir}/fusioninventory
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg
-%{_sysconfdir}/cron.hourly/%{name}
+%config(noreplace) %{_sysconfdir}/fusioninventory/conf.d
 %{_unitdir}/%{name}.service
 %dir %{_sysconfdir}/systemd/system/%{name}.service.d
 %config(noreplace) %{_sysconfdir}/systemd/system/%{name}.service.d/override.conf
@@ -305,8 +313,17 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %files task-collect
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Collect.pm
 
+%files cron
+%{_sysconfdir}/cron.hourly/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+
 
 %changelog
+* Thu Jan 11 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4-1
+- Last upstream release
+- Put cron stuff in a separate sub-package
+- Provide conf.d configuration directory
+
 * Mon Oct 16 2017 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.3.21-3
 - Do not provides perl(setup); BZ #1485919 - thanks to E. Seyman
 
diff --git a/sources b/sources
index ac42af3..eda5def 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.3.21.tar.gz) = 5f5628b4851431fe0c93ebfffdc91281efaa8aed721cf79439dbb738bfc765d3d01bb5e639de7dd2fcfc06537f7b472ea8b14ae4b9e6e5c408b68039a8b2185e
+SHA512 (FusionInventory-Agent-2.4.tar.gz) = f232ad610d11c46e7f0feb6dee0073c7d7f95af9d6903300327195bf9239769265cb5d21ddd7e9b7ff35f3328a75acb442f6e7fb995cd8452be9b49dfc0f5491

From a295434a8f36ce8194b1aa8c40fc8d4f43927402 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Fri, 12 Jan 2018 14:47:14 +0100
Subject: [PATCH 056/106] Drop systemd override configuration, this is no
 longer needed

---
 fusioninventory-agent.service.conf | 4 ----
 fusioninventory-agent.spec         | 9 ++++-----
 2 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 fusioninventory-agent.service.conf

diff --git a/fusioninventory-agent.service.conf b/fusioninventory-agent.service.conf
deleted file mode 100644
index 5dfcb9e..0000000
--- a/fusioninventory-agent.service.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Extra configuration file for fusioninventory-agent unit
-[Service]
-Environment="OPTIONS=--debug"
-Environment="PATH=/sbin:/bin:/usr/sbin:/usr/bin"
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index e0b3234..c8c3939 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,12 +10,10 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
-#Use systemd override capabilities
 Source10:    %{name}.service
-Source11:    %{name}.service.conf
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -227,7 +225,6 @@ install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
 install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
-install -m 644 -D  %{SOURCE11}   %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/override.conf
 
 # Yum plugin installation
 install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py
@@ -255,7 +252,6 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %config(noreplace) %{_sysconfdir}/fusioninventory/conf.d
 %{_unitdir}/%{name}.service
 %dir %{_sysconfdir}/systemd/system/%{name}.service.d
-%config(noreplace) %{_sysconfdir}/systemd/system/%{name}.service.d/override.conf
 %{_bindir}/fusioninventory-agent
 %{_bindir}/fusioninventory-injector
 %{_mandir}/man1/fusioninventory-agent*
@@ -319,6 +315,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Thu Jan 11 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4-2
+- Drop systemd override conf file, thits is no longer needed
+
 * Thu Jan 11 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4-1
 - Last upstream release
 - Put cron stuff in a separate sub-package

From 8c5b48861347f578b739e487419ad61e2ee98aa1 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Sat, 13 Jan 2018 08:46:19 +0100
Subject: [PATCH 057/106] Missing directory

---
 fusioninventory-agent.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index c8c3939..49563f8 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -220,6 +220,7 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 
 mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
 mkdir -p %{buildroot}%{_sysconfdir}/fusioninventory/conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d
 
 install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}

From b332b7c0bf502e482be075c5a0b74eb67f81425c Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Mon, 15 Jan 2018 11:19:47 +0100
Subject: [PATCH 058/106] Change logging according to upstream recommandations

---
 fusioninventory-agent.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 49563f8..7dabd1c 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -169,7 +169,11 @@ cat <<EOF | tee logrotate
 }
 EOF
 
-sed -e 's|#include "conf\.d/"|include "conf\.d/"|' -i etc/agent.cfg
+sed \
+    -e "s/logger = .*/logger = syslog/" \
+    -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \
+    -e 's|#include "conf\.d/"|include "conf\.d/"|' \
+    -i etc/agent.cfg
 
 cat <<EOF | tee %{name}.conf
 #
@@ -316,6 +320,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Mon Jan 15 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4-3
+- Change logging according to upstream recommandations
+
 * Thu Jan 11 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4-2
 - Drop systemd override conf file, thits is no longer needed
 

From 92f0c5c4770bdcb531bdc731a043658d018961c8 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Fri, 26 Jan 2018 09:08:35 +0100
Subject: [PATCH 059/106] Logrotate is no longer used since we now rely on
 syslog

---
 fusioninventory-agent.spec | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 7dabd1c..114ea4c 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -21,7 +21,6 @@ BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: systemd
 
 Requires:  perl-FusionInventory-Agent = %{version}-%{release}
-Requires:  logrotate
 Requires:  cronie
 %ifarch %{ix86} x86_64
 Requires:  dmidecode
@@ -159,16 +158,6 @@ fusioninventory cron task
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
-cat <<EOF | tee logrotate
-%{_localstatedir}/log/%{name}/*.log {
-    weekly
-    rotate 7
-    compress
-    notifempty
-    missingok
-}
-EOF
-
 sed \
     -e "s/logger = .*/logger = syslog/" \
     -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \
@@ -222,11 +211,10 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 
 %{_fixperms} %{buildroot}/*
 
-mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
 mkdir -p %{buildroot}%{_sysconfdir}/fusioninventory/conf.d
 mkdir -p %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d
 
-install -m 644 -D  logrotate     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
 install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
@@ -252,7 +240,6 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 %files
 %dir %{_sysconfdir}/fusioninventory
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg
 %config(noreplace) %{_sysconfdir}/fusioninventory/conf.d
 %{_unitdir}/%{name}.service
@@ -261,7 +248,6 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %{_bindir}/fusioninventory-injector
 %{_mandir}/man1/fusioninventory-agent*
 %{_mandir}/man1/fusioninventory-injector*
-%dir %{_localstatedir}/log/%{name}
 %dir %{_localstatedir}/lib/%{name}
 %dir %{_datadir}/fusioninventory
 %dir %{_datadir}/fusioninventory/lib
@@ -320,6 +306,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Fri Jan 26 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4-4
+- Logrotate is no longer needed since we now use syslog
+
 * Mon Jan 15 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4-3
 - Change logging according to upstream recommandations
 

From f101bb3d59c92e3bc9ff3c9ea6e29b3300000f66 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Fri, 26 Jan 2018 09:10:20 +0100
Subject: [PATCH 060/106] Missing bump release

---
 fusioninventory-agent.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 114ea4c..5b56270 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service

From 3716f5d37f2ae9013c8fb3c91ea952976ba1281e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 10:21:18 +0000
Subject: [PATCH 061/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 5b56270..78e38b3 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4
-Release:     4%{?dist}
+Release:     5%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -306,6 +306,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Fri Jan 26 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4-4
 - Logrotate is no longer needed since we now use syslog
 

From c1aa6e3561e975cc3b02041851644c69be420169 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Wed, 27 Jun 2018 21:18:58 +0200
Subject: [PATCH 062/106] Perl 5.28 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 78e38b3..aade66e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4
-Release:     5%{?dist}
+Release:     6%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -306,6 +306,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.4-6
+- Perl 5.28 rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 0b26970a8d01f9b46d1614cda7a4ad198aaf54f8 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 3 Jul 2018 14:42:01 +0200
Subject: [PATCH 063/106] New upstream release

---
 fusioninventory-agent.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index aade66e..aafda83 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,8 +9,8 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.4
-Release:     6%{?dist}
+Version:     2.4.1
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -200,7 +200,8 @@ EOF
 perl Makefile.PL \
      PREFIX=%{_prefix} \
      SYSCONFDIR=%{_sysconfdir}/fusioninventory \
-     LOCALSTATEDIR=%{_localstatedir}/lib/%{name}
+     LOCALSTATEDIR=%{_localstatedir}/lib/%{name} \
+     VERSION=%{version}-%{release}
 
 make %{?_smp_mflags}
 
@@ -306,6 +307,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Tue Jul 02 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.1-1
+- Last upstream release
+
 * Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.4-6
 - Perl 5.28 rebuild
 

From a5720d6b97c420cd29b1dc76230baf85781d7c25 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 3 Jul 2018 14:43:43 +0200
Subject: [PATCH 064/106] New sources

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8b35181..30f116d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /FusionInventory-Agent-2.3.20.tar.gz
 /FusionInventory-Agent-2.3.21.tar.gz
 /FusionInventory-Agent-2.4.tar.gz
+/FusionInventory-Agent-2.4.1.tar.gz
diff --git a/sources b/sources
index eda5def..02f0cee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.4.tar.gz) = f232ad610d11c46e7f0feb6dee0073c7d7f95af9d6903300327195bf9239769265cb5d21ddd7e9b7ff35f3328a75acb442f6e7fb995cd8452be9b49dfc0f5491
+SHA512 (FusionInventory-Agent-2.4.1.tar.gz) = 4ed768f706114b3de30e235673661dcb45021a7320428134b6773517e8397c0aa4957056a5616e421f12d21f504776eaa07f6b0fc80ea2f41dd6add15838eaf2

From a1a2dd5a291f26000b0eb25c6107a2871b3c0591 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 3 Jul 2018 14:46:06 +0200
Subject: [PATCH 065/106] Fix date in changelog

---
 fusioninventory-agent.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index aafda83..dbbfffe 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -307,7 +307,7 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
-* Tue Jul 02 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.1-1
+* Tue Jul 03 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.1-1
 - Last upstream release
 
 * Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.4-6

From 61d059816b1e008c1c4e325fa01202fccec77313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 6 Jul 2018 09:36:36 +0200
Subject: [PATCH 066/106] Perl 5.28 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index dbbfffe..ff04e74 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4.1
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -307,6 +307,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Fri Jul 06 2018 Petr Pisar <ppisar@redhat.com> - 2.4.1-2
+- Perl 5.28 rebuild
+
 * Tue Jul 03 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.1-1
 - Last upstream release
 

From d6e020d6db57b92214ca014bda5a9a39ee2c5f9e Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 10 Jul 2018 13:03:44 +0200
Subject: [PATCH 067/106] Apply upstream patch to fix wrong variable name

---
 ...c7242660fa595f3877805d61d5fb05287bd3.patch | 32 +++++++++++++++++++
 fusioninventory-agent.spec                    |  8 ++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 f950c7242660fa595f3877805d61d5fb05287bd3.patch

diff --git a/f950c7242660fa595f3877805d61d5fb05287bd3.patch b/f950c7242660fa595f3877805d61d5fb05287bd3.patch
new file mode 100644
index 0000000..60ab1c8
--- /dev/null
+++ b/f950c7242660fa595f3877805d61d5fb05287bd3.patch
@@ -0,0 +1,32 @@
+From f950c7242660fa595f3877805d61d5fb05287bd3 Mon Sep 17 00:00:00 2001
+From: Guillaume Bougard <gbougard@teclib.com>
+Date: Wed, 4 Jul 2018 13:44:38 +0200
+Subject: [PATCH] Fix type and wrong variable usage in new Scheduler target
+ only visible while using --lazy option from agent script
+
+---
+ lib/FusionInventory/Agent/Target/Scheduler.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/FusionInventory/Agent/Target/Scheduler.pm b/lib/FusionInventory/Agent/Target/Scheduler.pm
+index 7c063725d0..beb271a1c6 100644
+--- a/lib/FusionInventory/Agent/Target/Scheduler.pm
++++ b/lib/FusionInventory/Agent/Target/Scheduler.pm
+@@ -16,7 +16,7 @@ sub new {
+     my $self = $class->SUPER::new(%params);
+ 
+     $self->{storage} = $params{storage};
+-    $self->{name}    = 'scheduler' . $count++,
++    $self->{id}      = 'scheduler' . $count++;
+ 
+     # handle persistent state
+     $self->_loadState();
+@@ -32,7 +32,7 @@ sub new {
+ sub getName {
+     my ($self) = @_;
+ 
+-    return $self->{name};
++    return $self->{id};
+ }
+ 
+ sub getType {
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index ff04e74..b9899e1 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,10 +10,11 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4.1
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
+Patch0:      f950c7242660fa595f3877805d61d5fb05287bd3.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -158,6 +159,8 @@ fusioninventory cron task
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
+%patch0 -p1
+
 sed \
     -e "s/logger = .*/logger = syslog/" \
     -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \
@@ -307,6 +310,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Tue Jul 10 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.1-3
+- Add upstream patch to fix wrong variable name
+
 * Fri Jul 06 2018 Petr Pisar <ppisar@redhat.com> - 2.4.1-2
 - Perl 5.28 rebuild
 

From 681cb745602f173ec01ca80aee312577a3cd5e12 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 00:57:35 +0000
Subject: [PATCH 068/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index b9899e1..e3e40c6 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4.1
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -310,6 +310,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue Jul 10 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.1-3
 - Add upstream patch to fix wrong variable name
 

From 426d25abba522bec04b98216eabbd8e653a3e302 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 4 Oct 2018 15:04:01 +0200
Subject: [PATCH 069/106] New upstream release

---
 .gitignore                                    |  1 +
 ...c7242660fa595f3877805d61d5fb05287bd3.patch | 32 -------------------
 fusioninventory-agent.service                 |  2 ++
 fusioninventory-agent.spec                    | 11 ++++---
 sources                                       |  2 +-
 5 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 f950c7242660fa595f3877805d61d5fb05287bd3.patch

diff --git a/.gitignore b/.gitignore
index 30f116d..0636e04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /FusionInventory-Agent-2.3.21.tar.gz
 /FusionInventory-Agent-2.4.tar.gz
 /FusionInventory-Agent-2.4.1.tar.gz
+/FusionInventory-Agent-2.4.2.tar.gz
diff --git a/f950c7242660fa595f3877805d61d5fb05287bd3.patch b/f950c7242660fa595f3877805d61d5fb05287bd3.patch
deleted file mode 100644
index 60ab1c8..0000000
--- a/f950c7242660fa595f3877805d61d5fb05287bd3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f950c7242660fa595f3877805d61d5fb05287bd3 Mon Sep 17 00:00:00 2001
-From: Guillaume Bougard <gbougard@teclib.com>
-Date: Wed, 4 Jul 2018 13:44:38 +0200
-Subject: [PATCH] Fix type and wrong variable usage in new Scheduler target
- only visible while using --lazy option from agent script
-
----
- lib/FusionInventory/Agent/Target/Scheduler.pm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/FusionInventory/Agent/Target/Scheduler.pm b/lib/FusionInventory/Agent/Target/Scheduler.pm
-index 7c063725d0..beb271a1c6 100644
---- a/lib/FusionInventory/Agent/Target/Scheduler.pm
-+++ b/lib/FusionInventory/Agent/Target/Scheduler.pm
-@@ -16,7 +16,7 @@ sub new {
-     my $self = $class->SUPER::new(%params);
- 
-     $self->{storage} = $params{storage};
--    $self->{name}    = 'scheduler' . $count++,
-+    $self->{id}      = 'scheduler' . $count++;
- 
-     # handle persistent state
-     $self->_loadState();
-@@ -32,7 +32,7 @@ sub new {
- sub getName {
-     my ($self) = @_;
- 
--    return $self->{name};
-+    return $self->{id};
- }
- 
- sub getType {
diff --git a/fusioninventory-agent.service b/fusioninventory-agent.service
index 2e220d4..56526ab 100644
--- a/fusioninventory-agent.service
+++ b/fusioninventory-agent.service
@@ -11,10 +11,12 @@
 
 [Unit]
 Description=FusionInventory agent
+Documentation=man:fusioninventory-agent
 After=syslog.target network.target
 
 [Service]
 ExecStart=/usr/bin/fusioninventory-agent --daemon --no-fork $OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index e3e40c6..4fbb79a 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,12 +9,11 @@ Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.4.1
-Release:     4%{?dist}
+Version:     2.4.2
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
-Patch0:      f950c7242660fa595f3877805d61d5fb05287bd3.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -159,8 +158,6 @@ fusioninventory cron task
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
-%patch0 -p1
-
 sed \
     -e "s/logger = .*/logger = syslog/" \
     -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \
@@ -310,6 +307,10 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Wed Oct 03 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.2-1
+- Last upstream release
+- Drop patch applied upstream
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 02f0cee..5171ea3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.4.1.tar.gz) = 4ed768f706114b3de30e235673661dcb45021a7320428134b6773517e8397c0aa4957056a5616e421f12d21f504776eaa07f6b0fc80ea2f41dd6add15838eaf2
+SHA512 (FusionInventory-Agent-2.4.2.tar.gz) = 02da9013011de3964ffff5f320516aa1a44aa0bc88f4b5ca5de0224feb7567ed9cb5c3529309ce42bfcc87cbb20f131d88c95ebe2136eb18d35b2837cebda45f

From ab52212c105f4dbf846915b832a285acac1330fc Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:44 +0100
Subject: [PATCH 070/106] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 fusioninventory-agent.spec | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 4fbb79a..bc2ae3e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -5,7 +5,6 @@
 
 Name:        fusioninventory-agent
 Summary:     FusionInventory agent
-Group:       Applications/System
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
@@ -84,7 +83,6 @@ VMWare vCenter/ESX/ESXi server through SOAP interface
 
 %package yum-plugin
 Summary:       Ask FusionInventory agent to send an inventory when yum exits
-Group:         System Environment/Base
 BuildArch:     noarch
 Requires:      yum
 Requires:      %{name}
@@ -97,7 +95,6 @@ This requires the service to be running with the --rpc-trust-localhost option.
 
 %package task-network
 Summary:    NetDiscovery and NetInventory task for FusionInventory
-Group:      Applications/System
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
@@ -106,7 +103,6 @@ fusioninventory-task-netdiscovery and fusioninventory-task-netinventory
 
 %package task-deploy
 Summary:    Software deployment support for FusionInventory agent
-Group:      Applications/System
 BuildArch:  noarch
 Requires:   %{name} = %{version}-%{release}
 Requires:   perl(Archive::Extract)
@@ -119,7 +115,6 @@ This package provides software deployment support for FusionInventory-agent
 # perl-Net-Write is licenced under Artistic Perl v1 licence, not accepted in Fedora
 %package task-wakeonlan
 Summary:    WakeOnLan task for FusionInventory
-Group:      Applications/System
 BuildArch:  noarch
 Requires:   %{name} = %{version}-%{release}
 
@@ -129,7 +124,6 @@ fusioninventory-task-wakeonlan
 
 %package task-inventory
 Summary:    Inventory task for FusionInventory
-Group:      Applications/System
 Requires:   %{name} = %{version}-%{release}
 Requires:   perl(Net::CUPS)
 Requires:   perl(Parse::EDID)
@@ -139,7 +133,6 @@ fusioninventory-task-inventory
 
 %package task-collect
 Summary:    Custom information retrieval support for FusionInventory agent
-Group:      Applications/System
 Requires:   %{name} = %{version}-%{release}
 
 %description task-collect
@@ -148,7 +141,6 @@ FusionInventory agent
 
 %package cron
 Summary:    Cron for FusionInventory agent
-Group:      Applications/System
 Requires:   %{name} = %{version}-%{release}
 
 %description cron

From 30445f1d1e55eb4c5d62ec58456e169be3f4f070 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 20:19:44 +0000
Subject: [PATCH 071/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index bc2ae3e..a4a8dd4 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4.2
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -299,6 +299,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Wed Oct 03 2018 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.2-1
 - Last upstream release
 - Drop patch applied upstream

From 89dc01366ce76089af633cd0d5f0a8d7b6489b59 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Mon, 25 Feb 2019 15:31:35 +0100
Subject: [PATCH 072/106] New upstream release

---
 .gitignore                 | 1 +
 fusioninventory-agent.spec | 7 +++++--
 sources                    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0636e04..b4e0edf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /FusionInventory-Agent-2.4.tar.gz
 /FusionInventory-Agent-2.4.1.tar.gz
 /FusionInventory-Agent-2.4.2.tar.gz
+/FusionInventory-Agent-2.4.3.tar.gz
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index a4a8dd4..cc17039 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -8,8 +8,8 @@ Summary:     FusionInventory agent
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.4.2
-Release:     2%{?dist}
+Version:     2.4.3
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -299,6 +299,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+* Mon Feb 25 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.3-1
+- Last upstream release
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 5171ea3..bc0e88a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.4.2.tar.gz) = 02da9013011de3964ffff5f320516aa1a44aa0bc88f4b5ca5de0224feb7567ed9cb5c3529309ce42bfcc87cbb20f131d88c95ebe2136eb18d35b2837cebda45f
+SHA512 (FusionInventory-Agent-2.4.3.tar.gz) = 079ce8355b347c213e330c0f5652da524579a29d72c668a05ec0a80978e9a113c8310f4e243a52151c03dfacd25014b2010aebc4ec3ea19b14bf320fd060964f

From 3240e9ee529b9cb25ed58cec7c5ed9e955f25716 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 26 Feb 2019 17:36:17 +0100
Subject: [PATCH 073/106] Remove dependency on yum

---
 fusioninventory-agent.spec | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index cc17039..d3038bb 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.4.3
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -81,17 +81,6 @@ Requires:   %{name} = %{version}-%{release}
 fusioninventory-agent-task-ESX ask the running service agent to inventory an 
 VMWare vCenter/ESX/ESXi server through SOAP interface
 
-%package yum-plugin
-Summary:       Ask FusionInventory agent to send an inventory when yum exits
-BuildArch:     noarch
-Requires:      yum
-Requires:      %{name}
-
-%description yum-plugin
-fusioninventory-agent-yum-plugin asks the running service agent to send an
-inventory when yum exits.
-
-This requires the service to be running with the --rpc-trust-localhost option.
 
 %package task-network
 Summary:    NetDiscovery and NetInventory task for FusionInventory
@@ -167,7 +156,7 @@ cat <<EOF | tee %{name}.conf
 #
 # Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-# Global options (debug for verbose log, rpc-trust-localhost for yum-plugin)
+# Global options (debug for verbose log)
 OPTIONS="--debug "
 
 # Mode, change to "cron" to activate
@@ -212,9 +201,6 @@ install -m 644 -D  %{name}.conf  %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -m 755 -Dp %{SOURCE1}    %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
 install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
-# Yum plugin installation
-install -m 644 -D contrib/yum-plugin/%{name}.py   %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py
-install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum/pluginconf.d/%{name}.conf
 
 %check
 #make test
@@ -256,10 +242,6 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 %doc Changes LICENSE THANKS
 %{_datadir}/fusioninventory
 
-%files yum-plugin
-%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf
-%{_prefix}/lib/yum-plugins/%{name}.*
-
 %files task-esx
 %{_bindir}/fusioninventory-esx
 %{_mandir}/man1/fusioninventory-esx.1*
@@ -299,6 +281,9 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum
 
 
 %changelog
+- Tue Deb 26 2019 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.4.3-2
+- Remove yum plugin (and therefore dependency on yum)
+
 * Mon Feb 25 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.3-1
 - Last upstream release
 

From 4f71a4d8b78755683f66aaf637de013b82960491 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 26 Feb 2019 17:38:03 +0100
Subject: [PATCH 074/106] Fix syntax

---
 fusioninventory-agent.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index d3038bb..9af1997 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -281,7 +281,7 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
-- Tue Deb 26 2019 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.4.3-2
+* Tue Feb 26 2019 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.4.3-2
 - Remove yum plugin (and therefore dependency on yum)
 
 * Mon Feb 25 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.4.3-1

From 579d0b4c36c5755aba089beb465bde364dace559 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Mon, 15 Apr 2019 10:48:14 +0200
Subject: [PATCH 075/106] New upstream release, drop task files from main perl
 package

---
 .gitignore                            |  1 +
 fusioninventory-agent-7ae7c838b.patch | 56 +++++++++++++++++++++++++++
 fusioninventory-agent.spec            | 27 +++++++++----
 sources                               |  2 +-
 4 files changed, 78 insertions(+), 8 deletions(-)
 create mode 100644 fusioninventory-agent-7ae7c838b.patch

diff --git a/.gitignore b/.gitignore
index b4e0edf..2f5d9f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /FusionInventory-Agent-2.4.1.tar.gz
 /FusionInventory-Agent-2.4.2.tar.gz
 /FusionInventory-Agent-2.4.3.tar.gz
+/FusionInventory-Agent-2.5.tar.gz
diff --git a/fusioninventory-agent-7ae7c838b.patch b/fusioninventory-agent-7ae7c838b.patch
new file mode 100644
index 0000000..ba96d23
--- /dev/null
+++ b/fusioninventory-agent-7ae7c838b.patch
@@ -0,0 +1,56 @@
+From 7ae7c838b156ba1b6bf89ab60ba9c8df04532dd0 Mon Sep 17 00:00:00 2001
+From: Guillaume Bougard <gbougard@teclib.com>
+Date: Sat, 13 Apr 2019 18:47:36 +0200
+Subject: [PATCH] fix: Add few minor fixes
+
+* build: fix fusioninventory-remoteinventory was not installed
+* inventory: fix error message while starting fusioninventory-inventory script
+---
+ Changes                                     | 8 ++++++++
+ Makefile.PL                                 | 1 +
+ lib/FusionInventory/Agent/Task/Inventory.pm | 2 +-
+ 3 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/Changes b/Changes
+index 83be862d0d..36849904a7 100644
+--- a/Changes
++++ b/Changes
+@@ -1,5 +1,13 @@
+ Revision history for FusionInventory agent
+ 
++2.5.1 not relased yet
++
++core:
++* build: fix fusioninventory-remoteinventory was not installed
++
++inventory:
++* fix error message while starting fusioninventory-inventory script
++
+ 2.5 Fri, 12 Apr 2019
+ 
+ core:
+diff --git a/Makefile.PL b/Makefile.PL
+index 38e6eebdca..71aae700c9 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -104,6 +104,7 @@ install_script 'bin/fusioninventory-wakeonlan';
+ install_script 'bin/fusioninventory-netdiscovery';
+ install_script 'bin/fusioninventory-netinventory';
+ install_script 'bin/fusioninventory-esx';
++install_script 'bin/fusioninventory-remoteinventory';
+ 
+ resources
+     homepage    => "http://www.fusioninventory.org",
+diff --git a/lib/FusionInventory/Agent/Task/Inventory.pm b/lib/FusionInventory/Agent/Task/Inventory.pm
+index 84a3cafbda..8fb2cd8806 100644
+--- a/lib/FusionInventory/Agent/Task/Inventory.pm
++++ b/lib/FusionInventory/Agent/Task/Inventory.pm
+@@ -59,7 +59,7 @@ sub run {
+         tag      => $tag
+     );
+ 
+-    $self->{logger}->info("New inventory from $self->{deviceid} for $self->{target}->{id}".
++    $self->{logger}->info("New inventory from ".$inventory->getDeviceId()." for $self->{target}->{id}".
+         ( (defined($tag) && length($tag)) ? " (tag=$tag)" : "" ));
+ 
+     # Set inventory as remote if running remote inventory like from wmi task
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 9af1997..c4bff8e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -8,11 +8,12 @@ Summary:     FusionInventory agent
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.4.3
-Release:     2%{?dist}
+Version:     2.5
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
+Patch0:      fusioninventory-agent-7ae7c838b.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -139,6 +140,9 @@ fusioninventory cron task
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
+%patch0 -p1
+
+
 sed \
     -e "s/logger = .*/logger = syslog/" \
     -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \
@@ -221,6 +225,10 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 %dir %{_sysconfdir}/fusioninventory
 %config(noreplace) %{_sysconfdir}/fusioninventory/agent.cfg
 %config(noreplace) %{_sysconfdir}/fusioninventory/conf.d
+%config(noreplace) %{_sysconfdir}/fusioninventory/inventory-server-plugin.cfg
+%config(noreplace) %{_sysconfdir}/fusioninventory/server-test-plugin.cfg
+%config(noreplace) %{_sysconfdir}/fusioninventory/ssl-server-plugin.cfg
+
 %{_unitdir}/%{name}.service
 %dir %{_sysconfdir}/systemd/system/%{name}.service.d
 %{_bindir}/fusioninventory-agent
@@ -233,13 +241,12 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 %dir %{_datadir}/fusioninventory/lib/FusionInventory
 %dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent
 %dir %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task
-#excluding sub-packages files
-#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/
-
 
 
 %files -n perl-FusionInventory-Agent
 %doc Changes LICENSE THANKS
+#excluding sub-packages files
+%exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/*
 %{_datadir}/fusioninventory
 
 %files task-esx
@@ -264,11 +271,12 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 #%%files task-wakeonlan
 %exclude %{_bindir}/fusioninventory-wakeonlan
 %exclude %{_mandir}/man1/fusioninventory-wakeonlan.1*
-%exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
+#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
 
 %files task-inventory
 %{_bindir}/fusioninventory-inventory
-%{_mandir}/man1/fusioninventory-inventory.1*
+%{_bindir}/fusioninventory-remoteinventory
+%{_mandir}/man1/fusioninventory-*inventory.1*
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.pm
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Inventory
 
@@ -281,6 +289,11 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Mon Apr 15 2019 Johan Cwiklinski <jcwiklinski AT teclib DOt com> - 2.5-1
+- Last upstream release
+- Tasks files were provided also in main perl package
+- Apply upstream minor fixes patch
+
 * Tue Feb 26 2019 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.4.3-2
 - Remove yum plugin (and therefore dependency on yum)
 
diff --git a/sources b/sources
index bc0e88a..9479a53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.4.3.tar.gz) = 079ce8355b347c213e330c0f5652da524579a29d72c668a05ec0a80978e9a113c8310f4e243a52151c03dfacd25014b2010aebc4ec3ea19b14bf320fd060964f
+SHA512 (FusionInventory-Agent-2.5.tar.gz) = 37f0545df716e482fffd018a56b9c7482d7fce64fd0fa277c481a553a2108e7588f34077fb4775bb6352668efc96b3525fe97b1d6331d637401e8db8c0c91333

From c5f4c47da44535e6d5a323d59b46937c24dfa2d7 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Mon, 15 Apr 2019 11:31:57 +0200
Subject: [PATCH 076/106] Add wakeonlan task

---
 fusioninventory-agent.spec | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index c4bff8e..023b690 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -57,7 +57,7 @@ You can add additional packages for optional tasks:
 * fusioninventory-agent-task-collect
     Custom information retrieval support
 * fusioninventory-agent-task-wakeonlan
-    not included due to a licensing issue for perl-Net-Write
+    Wake o lan task
 
 
 %package -n perl-FusionInventory-Agent
@@ -100,9 +100,6 @@ Requires:   perl(Archive::Extract)
 %description task-deploy
 This package provides software deployment support for FusionInventory-agent
 
-%if !%{defined perl_net_write}
-# Excluded due to the absence of perl-Net-Write
-# perl-Net-Write is licenced under Artistic Perl v1 licence, not accepted in Fedora
 %package task-wakeonlan
 Summary:    WakeOnLan task for FusionInventory
 BuildArch:  noarch
@@ -110,7 +107,6 @@ Requires:   %{name} = %{version}-%{release}
 
 %description task-wakeonlan
 fusioninventory-task-wakeonlan
-%endif
 
 %package task-inventory
 Summary:    Inventory task for FusionInventory
@@ -267,11 +263,10 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy.pm
 %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/Deploy
 
-# Excluding task-wakeonlan
-#%%files task-wakeonlan
-%exclude %{_bindir}/fusioninventory-wakeonlan
-%exclude %{_mandir}/man1/fusioninventory-wakeonlan.1*
-#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
+%files task-wakeonlan
+%{_bindir}/fusioninventory-wakeonlan
+%{_mandir}/man1/fusioninventory-wakeonlan.1*
+%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
 
 %files task-inventory
 %{_bindir}/fusioninventory-inventory
@@ -293,6 +288,7 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 - Last upstream release
 - Tasks files were provided also in main perl package
 - Apply upstream minor fixes patch
+- task-wakeonlan is back (see https://github.com/fusioninventory/fusioninventory-agent/issues/495#issuecomment-435110369 about dependancy issue)
 
 * Tue Feb 26 2019 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.4.3-2
 - Remove yum plugin (and therefore dependency on yum)

From 5cfda3230be8084bc4a3a41b8d00831287e687b0 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 18 Apr 2019 13:43:17 +0200
Subject: [PATCH 077/106] Re-add tasks files in main perl package, to solve
 dependencies issues on package

---
 fusioninventory-agent.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 023b690..f010cca 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -242,7 +242,7 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 %files -n perl-FusionInventory-Agent
 %doc Changes LICENSE THANKS
 #excluding sub-packages files
-%exclude %{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/*
+#%%exclude %%{_datadir}/fusioninventory/lib/FusionInventory/Agent/Task/*
 %{_datadir}/fusioninventory
 
 %files task-esx
@@ -284,6 +284,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu Apr 18 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5-2
+- Re-add tasks files in main perl package, to solve dependencies issues on package
+
 * Mon Apr 15 2019 Johan Cwiklinski <jcwiklinski AT teclib DOt com> - 2.5-1
 - Last upstream release
 - Tasks files were provided also in main perl package

From 607a6da4d137fef9526810977f845cce278c5d97 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 2 May 2019 11:21:09 +0200
Subject: [PATCH 078/106] Fix httpd server plugin integration

---
 fix-httpd-plugins-configs-folder.patch  | 21 +++++++++++++++++++++
 fix-install-httpd-plugins-configs.patch | 17 +++++++++++++++++
 fusioninventory-agent-7ae7c838b.patch   | 21 +--------------------
 fusioninventory-agent.spec              | 11 +++++++++--
 4 files changed, 48 insertions(+), 22 deletions(-)
 create mode 100644 fix-httpd-plugins-configs-folder.patch
 create mode 100644 fix-install-httpd-plugins-configs.patch

diff --git a/fix-httpd-plugins-configs-folder.patch b/fix-httpd-plugins-configs-folder.patch
new file mode 100644
index 0000000..9db5b8c
--- /dev/null
+++ b/fix-httpd-plugins-configs-folder.patch
@@ -0,0 +1,21 @@
+commit b4710078310e9a5243932ab90b77b760fa97faa3
+Author: Guillaume Bougard <gbougard@teclib.com>
+Date:   Tue Apr 30 12:56:06 2019 +0200
+
+    fix: HTTP server plugins base configuration folder
+
+diff --git a/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm b/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm
+index 5d570aab5..1076eb30e 100644
+--- a/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm
++++ b/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm
+@@ -23,6 +23,10 @@ sub new {
+ 
+     bless $self, $class;
+ 
++    # Import _confdir from agent configuration
++    $self->{_confdir} = $self->{server}->{agent}->{config}->{_confdir}
++        if $self->{server};
++
+     # Check _confdir imported from FusionInventory::Agent::Config
+     unless ($self->{_confdir} && -d $self->{_confdir}) {
+         # Set absolute confdir from default if replaced by Makefile otherwise search
diff --git a/fix-install-httpd-plugins-configs.patch b/fix-install-httpd-plugins-configs.patch
new file mode 100644
index 0000000..3fabbc2
--- /dev/null
+++ b/fix-install-httpd-plugins-configs.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile.PL b/Makefile.PL
+index 38e6eebdc..db2edcf5e 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -245,10 +245,10 @@ config_install : pure_install
+ 	do \
+ 	  if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
+ 	    $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+-	    $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
++	    $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+ 	    $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+ 	  else \
+-	    $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config; \
++	    $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config; \
+ 	    $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \
+ 	  fi; \
+ 	done
diff --git a/fusioninventory-agent-7ae7c838b.patch b/fusioninventory-agent-7ae7c838b.patch
index ba96d23..cafe66c 100644
--- a/fusioninventory-agent-7ae7c838b.patch
+++ b/fusioninventory-agent-7ae7c838b.patch
@@ -6,29 +6,10 @@ Subject: [PATCH] fix: Add few minor fixes
 * build: fix fusioninventory-remoteinventory was not installed
 * inventory: fix error message while starting fusioninventory-inventory script
 ---
- Changes                                     | 8 ++++++++
  Makefile.PL                                 | 1 +
  lib/FusionInventory/Agent/Task/Inventory.pm | 2 +-
- 3 files changed, 10 insertions(+), 1 deletion(-)
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/Changes b/Changes
-index 83be862d0d..36849904a7 100644
---- a/Changes
-+++ b/Changes
-@@ -1,5 +1,13 @@
- Revision history for FusionInventory agent
- 
-+2.5.1 not relased yet
-+
-+core:
-+* build: fix fusioninventory-remoteinventory was not installed
-+
-+inventory:
-+* fix error message while starting fusioninventory-inventory script
-+
- 2.5 Fri, 12 Apr 2019
- 
- core:
 diff --git a/Makefile.PL b/Makefile.PL
 index 38e6eebdca..71aae700c9 100644
 --- a/Makefile.PL
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index f010cca..56974fc 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,11 +9,13 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
 Patch0:      fusioninventory-agent-7ae7c838b.patch
+Patch1:      fix-install-httpd-plugins-configs.patch
+Patch2:      fix-httpd-plugins-configs-folder.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -137,6 +139,8 @@ fusioninventory cron task
 %setup -q -n FusionInventory-Agent-%{version}
 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 
 sed \
@@ -284,10 +288,13 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu May 02 2019 Guillaume Bougard <gbougard AT teclib DOT com> - 2.5-3
+- Add patches to fix agent HTTP server plugins integration
+
 * Thu Apr 18 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5-2
 - Re-add tasks files in main perl package, to solve dependencies issues on package
 
-* Mon Apr 15 2019 Johan Cwiklinski <jcwiklinski AT teclib DOt com> - 2.5-1
+* Mon Apr 15 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5-1
 - Last upstream release
 - Tasks files were provided also in main perl package
 - Apply upstream minor fixes patch

From 4f73478826cc78f01d282c2ff943164663023a40 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 7 May 2019 14:47:06 +0200
Subject: [PATCH 079/106] Add patch to fix SSL on with http modules

---
 fusioninventory-agent-d4f29af.patch | 23 +++++++++++++++++++++++
 fusioninventory-agent.spec          |  7 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 fusioninventory-agent-d4f29af.patch

diff --git a/fusioninventory-agent-d4f29af.patch b/fusioninventory-agent-d4f29af.patch
new file mode 100644
index 0000000..8282318
--- /dev/null
+++ b/fusioninventory-agent-d4f29af.patch
@@ -0,0 +1,23 @@
+From d4f29affa9c9b8e80ea53171570c6d70eab28027 Mon Sep 17 00:00:00 2001
+From: Guillaume Bougard <gbougard@teclib.com>
+Date: Tue, 7 May 2019 14:33:09 +0200
+Subject: [PATCH] fix: Keep HTTP Server SSL plugin sessions opened
+
+---
+ lib/FusionInventory/Agent/HTTP/Server/SSL.pm | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/FusionInventory/Agent/HTTP/Server/SSL.pm b/lib/FusionInventory/Agent/HTTP/Server/SSL.pm
+index f6238104a5..32442ec2cc 100644
+--- a/lib/FusionInventory/Agent/HTTP/Server/SSL.pm
++++ b/lib/FusionInventory/Agent/HTTP/Server/SSL.pm
+@@ -139,6 +139,9 @@ sub new {
+         return;
+     }
+ 
++    # Disable Timeout to leave SSL session opened until we get data
++    $client->timeout(0);
++
+     $plugin->debug("HTTPD started new SSL session");
+ 
+     bless $client, $class;
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 56974fc..d3d7e9f 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,13 +9,14 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
 Patch0:      fusioninventory-agent-7ae7c838b.patch
 Patch1:      fix-install-httpd-plugins-configs.patch
 Patch2:      fix-httpd-plugins-configs-folder.patch
+Patch3:      fusioninventory-agent-d4f29af.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -141,6 +142,7 @@ fusioninventory cron task
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 sed \
@@ -288,6 +290,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Tue May 07 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5-4
+- Add patch to fix SSL on with http modules
+
 * Thu May 02 2019 Guillaume Bougard <gbougard AT teclib DOT com> - 2.5-3
 - Add patches to fix agent HTTP server plugins integration
 

From e09c20a06a8165497a2cbebb3ca4b045481b041e Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Thu, 30 May 2019 13:23:30 +0200
Subject: [PATCH 080/106] Perl 5.30 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index d3d7e9f..7220138 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5
-Release:     4%{?dist}
+Release:     5%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -290,6 +290,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.5-5
+- Perl 5.30 rebuild
+
 * Tue May 07 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5-4
 - Add patch to fix SSL on with http modules
 

From fdda74df57ded6dfa059f9a894a6fae9dba586ac Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Mon, 8 Jul 2019 14:10:14 +0200
Subject: [PATCH 081/106] New upstream release

---
 .gitignore                              |  1 +
 fix-httpd-plugins-configs-folder.patch  | 21 --------------
 fix-install-httpd-plugins-configs.patch | 17 ------------
 fusioninventory-agent-7ae7c838b.patch   | 37 -------------------------
 fusioninventory-agent-d4f29af.patch     | 23 ---------------
 fusioninventory-agent.spec              | 18 ++++--------
 sources                                 |  2 +-
 7 files changed, 8 insertions(+), 111 deletions(-)
 delete mode 100644 fix-httpd-plugins-configs-folder.patch
 delete mode 100644 fix-install-httpd-plugins-configs.patch
 delete mode 100644 fusioninventory-agent-7ae7c838b.patch
 delete mode 100644 fusioninventory-agent-d4f29af.patch

diff --git a/.gitignore b/.gitignore
index 2f5d9f1..8607f58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /FusionInventory-Agent-2.4.2.tar.gz
 /FusionInventory-Agent-2.4.3.tar.gz
 /FusionInventory-Agent-2.5.tar.gz
+/FusionInventory-Agent-2.5.1.tar.gz
diff --git a/fix-httpd-plugins-configs-folder.patch b/fix-httpd-plugins-configs-folder.patch
deleted file mode 100644
index 9db5b8c..0000000
--- a/fix-httpd-plugins-configs-folder.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit b4710078310e9a5243932ab90b77b760fa97faa3
-Author: Guillaume Bougard <gbougard@teclib.com>
-Date:   Tue Apr 30 12:56:06 2019 +0200
-
-    fix: HTTP server plugins base configuration folder
-
-diff --git a/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm b/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm
-index 5d570aab5..1076eb30e 100644
---- a/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm
-+++ b/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm
-@@ -23,6 +23,10 @@ sub new {
- 
-     bless $self, $class;
- 
-+    # Import _confdir from agent configuration
-+    $self->{_confdir} = $self->{server}->{agent}->{config}->{_confdir}
-+        if $self->{server};
-+
-     # Check _confdir imported from FusionInventory::Agent::Config
-     unless ($self->{_confdir} && -d $self->{_confdir}) {
-         # Set absolute confdir from default if replaced by Makefile otherwise search
diff --git a/fix-install-httpd-plugins-configs.patch b/fix-install-httpd-plugins-configs.patch
deleted file mode 100644
index 3fabbc2..0000000
--- a/fix-install-httpd-plugins-configs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.PL b/Makefile.PL
-index 38e6eebdc..db2edcf5e 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -245,10 +245,10 @@ config_install : pure_install
- 	do \
- 	  if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
- 	    $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
--	    $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
-+	    $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
- 	    $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
- 	  else \
--	    $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config; \
-+	    $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config; \
- 	    $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \
- 	  fi; \
- 	done
diff --git a/fusioninventory-agent-7ae7c838b.patch b/fusioninventory-agent-7ae7c838b.patch
deleted file mode 100644
index cafe66c..0000000
--- a/fusioninventory-agent-7ae7c838b.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7ae7c838b156ba1b6bf89ab60ba9c8df04532dd0 Mon Sep 17 00:00:00 2001
-From: Guillaume Bougard <gbougard@teclib.com>
-Date: Sat, 13 Apr 2019 18:47:36 +0200
-Subject: [PATCH] fix: Add few minor fixes
-
-* build: fix fusioninventory-remoteinventory was not installed
-* inventory: fix error message while starting fusioninventory-inventory script
----
- Makefile.PL                                 | 1 +
- lib/FusionInventory/Agent/Task/Inventory.pm | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index 38e6eebdca..71aae700c9 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -104,6 +104,7 @@ install_script 'bin/fusioninventory-wakeonlan';
- install_script 'bin/fusioninventory-netdiscovery';
- install_script 'bin/fusioninventory-netinventory';
- install_script 'bin/fusioninventory-esx';
-+install_script 'bin/fusioninventory-remoteinventory';
- 
- resources
-     homepage    => "http://www.fusioninventory.org",
-diff --git a/lib/FusionInventory/Agent/Task/Inventory.pm b/lib/FusionInventory/Agent/Task/Inventory.pm
-index 84a3cafbda..8fb2cd8806 100644
---- a/lib/FusionInventory/Agent/Task/Inventory.pm
-+++ b/lib/FusionInventory/Agent/Task/Inventory.pm
-@@ -59,7 +59,7 @@ sub run {
-         tag      => $tag
-     );
- 
--    $self->{logger}->info("New inventory from $self->{deviceid} for $self->{target}->{id}".
-+    $self->{logger}->info("New inventory from ".$inventory->getDeviceId()." for $self->{target}->{id}".
-         ( (defined($tag) && length($tag)) ? " (tag=$tag)" : "" ));
- 
-     # Set inventory as remote if running remote inventory like from wmi task
diff --git a/fusioninventory-agent-d4f29af.patch b/fusioninventory-agent-d4f29af.patch
deleted file mode 100644
index 8282318..0000000
--- a/fusioninventory-agent-d4f29af.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d4f29affa9c9b8e80ea53171570c6d70eab28027 Mon Sep 17 00:00:00 2001
-From: Guillaume Bougard <gbougard@teclib.com>
-Date: Tue, 7 May 2019 14:33:09 +0200
-Subject: [PATCH] fix: Keep HTTP Server SSL plugin sessions opened
-
----
- lib/FusionInventory/Agent/HTTP/Server/SSL.pm | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/FusionInventory/Agent/HTTP/Server/SSL.pm b/lib/FusionInventory/Agent/HTTP/Server/SSL.pm
-index f6238104a5..32442ec2cc 100644
---- a/lib/FusionInventory/Agent/HTTP/Server/SSL.pm
-+++ b/lib/FusionInventory/Agent/HTTP/Server/SSL.pm
-@@ -139,6 +139,9 @@ sub new {
-         return;
-     }
- 
-+    # Disable Timeout to leave SSL session opened until we get data
-+    $client->timeout(0);
-+
-     $plugin->debug("HTTPD started new SSL session");
- 
-     bless $client, $class;
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 7220138..0c53a09 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -8,15 +8,11 @@ Summary:     FusionInventory agent
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.5
-Release:     5%{?dist}
+Version:     2.5.1
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
-Patch0:      fusioninventory-agent-7ae7c838b.patch
-Patch1:      fix-install-httpd-plugins-configs.patch
-Patch2:      fix-httpd-plugins-configs-folder.patch
-Patch3:      fusioninventory-agent-d4f29af.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -139,12 +135,6 @@ fusioninventory cron task
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-
 sed \
     -e "s/logger = .*/logger = syslog/" \
     -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \
@@ -290,6 +280,10 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Mon Jul 08 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5.1-1
+- Last upstream release
+- Remove patches applied upstream
+
 * Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.5-5
 - Perl 5.30 rebuild
 
diff --git a/sources b/sources
index 9479a53..3592c0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.5.tar.gz) = 37f0545df716e482fffd018a56b9c7482d7fce64fd0fa277c481a553a2108e7588f34077fb4775bb6352668efc96b3525fe97b1d6331d637401e8db8c0c91333
+SHA512 (FusionInventory-Agent-2.5.1.tar.gz) = c8c44801acdd574d5b4a2173f5f7b0b6275abc2ac4925c64313a1dde3a717d796e7f5d9a35e9b02b966f08cb985e3ae064d8797de0c30fede8b131bc9bb64955

From 745c4a74db6429c7d4ef1153eb6829b0c6b6457d Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Mon, 15 Jul 2019 07:42:04 +0200
Subject: [PATCH 082/106] Add upstream fix on http server, add missing
 configuration files

---
 ...stall-all-httpd-plugins-default-configs.patch | 16 ++++++++++++++++
 fusioninventory-agent.spec                       |  9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 fix-install-all-httpd-plugins-default-configs.patch

diff --git a/fix-install-all-httpd-plugins-default-configs.patch b/fix-install-all-httpd-plugins-default-configs.patch
new file mode 100644
index 0000000..3e079c4
--- /dev/null
+++ b/fix-install-all-httpd-plugins-default-configs.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile.PL b/Makefile.PL
+index 6c62baa1f..551bf89f6 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -240,9 +240,9 @@ sub install {
+ config_install : pure_install
+        $(MKPATH) $(DESTDIR)$(SYSCONFDIR)
+        $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
+-       for config in agent.cfg inventory-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg ; \
++       for config in agent.cfg $(shell cd etc; echo *-plugin.cfg ); \
+        do \
+-         if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
++         if $(TEST_F) $(DESTDIR)$(SYSCONFDIR)/$$config; then \
+            $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+            $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+            $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 0c53a09..06b2595 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,10 +9,11 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5.1
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
+Patch0:      fix-install-all-httpd-plugins-default-configs.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -220,6 +221,8 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 %config(noreplace) %{_sysconfdir}/fusioninventory/inventory-server-plugin.cfg
 %config(noreplace) %{_sysconfdir}/fusioninventory/server-test-plugin.cfg
 %config(noreplace) %{_sysconfdir}/fusioninventory/ssl-server-plugin.cfg
+%config(noreplace) %{_sysconfdir}/fusioninventory/proxy-server-plugin.cfg
+%config(noreplace) %{_sysconfdir}/fusioninventory/proxy2-server-plugin.cfg
 
 %{_unitdir}/%{name}.service
 %dir %{_sysconfdir}/systemd/system/%{name}.service.d
@@ -280,6 +283,10 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Mon Jul 15 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5.1-2
+- Add upstream HTTP server patch
+- add missing configuration files
+
 * Mon Jul 08 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5.1-1
 - Last upstream release
 - Remove patches applied upstream

From 72759a0b8de558cd062d9023da4cc79c6e89b346 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 01:12:01 +0000
Subject: [PATCH 083/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 06b2595..38ed34b 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5.1
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -283,6 +283,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Mon Jul 15 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5.1-2
 - Add upstream HTTP server patch
 - add missing configuration files

From dba7d0eddf97b182a498345cccd3e36b40805660 Mon Sep 17 00:00:00 2001
From: Marianne Lombard <marianne.lombard@inria.fr>
Date: Mon, 12 Aug 2019 12:45:22 +0200
Subject: [PATCH 084/106] fixing space / tabulation issue in patch

---
 ...ll-all-httpd-plugins-default-configs.patch | 20 +++++++++----------
 fusioninventory-agent.spec                    |  7 ++++++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/fix-install-all-httpd-plugins-default-configs.patch b/fix-install-all-httpd-plugins-default-configs.patch
index 3e079c4..45604d9 100644
--- a/fix-install-all-httpd-plugins-default-configs.patch
+++ b/fix-install-all-httpd-plugins-default-configs.patch
@@ -4,13 +4,13 @@ index 6c62baa1f..551bf89f6 100644
 +++ b/Makefile.PL
 @@ -240,9 +240,9 @@ sub install {
  config_install : pure_install
-        $(MKPATH) $(DESTDIR)$(SYSCONFDIR)
-        $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
--       for config in agent.cfg inventory-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg ; \
-+       for config in agent.cfg $(shell cd etc; echo *-plugin.cfg ); \
-        do \
--         if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
-+         if $(TEST_F) $(DESTDIR)$(SYSCONFDIR)/$$config; then \
-            $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
-            $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
-            $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+ 	$(MKPATH) $(DESTDIR)$(SYSCONFDIR)
+ 	$(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
+-	for config in agent.cfg inventory-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg ; \
++	for config in agent.cfg $(shell cd etc; echo *-plugin.cfg ); \
+ 	do \
+-	  if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
++	  if $(TEST_F) $(DESTDIR)$(SYSCONFDIR)/$$config; then \
+ 	    $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+ 	    $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+ 	    $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 38ed34b..3ac5067 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5.1
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -135,6 +135,7 @@ fusioninventory cron task
 
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
+%patch0 -p1
 
 sed \
     -e "s/logger = .*/logger = syslog/" \
@@ -283,6 +284,10 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Mon Aug 12 2019 Marianne Lombard <jehane@fedoraproject.org> - 2.5.1-4
+- Fixing patch (thanks to E. Seyman - eseyman AT fedoraproject DOT org - help) and applying it
+- Fix issue #1735227 : FTBFS
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From fe0c1cca9b7895c4aa5ea514a65406e566e685a8 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Tue, 17 Dec 2019 08:33:38 +0100
Subject: [PATCH 085/106] New upstream release

---
 .gitignore                                       |  1 +
 ...stall-all-httpd-plugins-default-configs.patch | 16 ----------------
 fusioninventory-agent.spec                       | 10 ++++++----
 sources                                          |  2 +-
 4 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 fix-install-all-httpd-plugins-default-configs.patch

diff --git a/.gitignore b/.gitignore
index 8607f58..e8e9515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /FusionInventory-Agent-2.4.3.tar.gz
 /FusionInventory-Agent-2.5.tar.gz
 /FusionInventory-Agent-2.5.1.tar.gz
+/FusionInventory-Agent-2.5.2.tar.gz
diff --git a/fix-install-all-httpd-plugins-default-configs.patch b/fix-install-all-httpd-plugins-default-configs.patch
deleted file mode 100644
index 45604d9..0000000
--- a/fix-install-all-httpd-plugins-default-configs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile.PL b/Makefile.PL
-index 6c62baa1f..551bf89f6 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -240,9 +240,9 @@ sub install {
- config_install : pure_install
- 	$(MKPATH) $(DESTDIR)$(SYSCONFDIR)
- 	$(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
--	for config in agent.cfg inventory-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg ; \
-+	for config in agent.cfg $(shell cd etc; echo *-plugin.cfg ); \
- 	do \
--	  if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
-+	  if $(TEST_F) $(DESTDIR)$(SYSCONFDIR)/$$config; then \
- 	    $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
- 	    $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
- 	    $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 3ac5067..3289f1a 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -8,12 +8,11 @@ Summary:     FusionInventory agent
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.5.1
-Release:     4%{?dist}
+Version:     2.5.2
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
-Patch0:      fix-install-all-httpd-plugins-default-configs.patch
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl-generators
@@ -135,7 +134,6 @@ fusioninventory cron task
 
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
-%patch0 -p1
 
 sed \
     -e "s/logger = .*/logger = syslog/" \
@@ -284,6 +282,10 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Tue Dec 17 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5.2-1
+- Last upstream release
+- Drop patch applied upstream
+
 * Mon Aug 12 2019 Marianne Lombard <jehane@fedoraproject.org> - 2.5.1-4
 - Fixing patch (thanks to E. Seyman - eseyman AT fedoraproject DOT org - help) and applying it
 - Fix issue #1735227 : FTBFS
diff --git a/sources b/sources
index 3592c0b..c30ad82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.5.1.tar.gz) = c8c44801acdd574d5b4a2173f5f7b0b6275abc2ac4925c64313a1dde3a717d796e7f5d9a35e9b02b966f08cb985e3ae064d8797de0c30fede8b131bc9bb64955
+SHA512 (FusionInventory-Agent-2.5.2.tar.gz) = ddfcd5c811a118d06a07b21028781d211908afaca2276eeea25fdea0e08a880d5c38f3eeb27bda10cda5a7cee5befbb74071e78c908d9f14223d365ea2aa7757

From 189c2bb86c1f4b6d9905af8c21822b9bf47b3282 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 19:10:45 +0000
Subject: [PATCH 086/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 3289f1a..671f619 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5.2
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -282,6 +282,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Dec 17 2019 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 2.5.2-1
 - Last upstream release
 - Drop patch applied upstream

From 93a4306728b0139c9e1365b2cdc549692193c083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 12 Mar 2020 12:38:10 +0100
Subject: [PATCH 087/106] Specify all dependencies and unbundle Module::Install

---
 fusioninventory-agent.spec | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 671f619..75d31ce 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,14 +9,29 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5.2
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: coreutils
+BuildRequires: findutils
+BuildRequires: make
 BuildRequires: perl-generators
-BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl-interpreter
+BuildRequires: perl(Config)
+BuildRequires: perl(English)
+BuildRequires: perl(inc::Module::Install)
+BuildRequires: perl(Module::AutoInstall)
+BuildRequires: perl(Module::Install::Include)
+BuildRequires: perl(Module::Install::Makefile)
+BuildRequires: perl(Module::Install::Metadata)
+BuildRequires: perl(Module::Install::Scripts)
+BuildRequires: perl(Module::Install::WriteAll)
+BuildRequires: perl(strict)
+BuildRequires: perl(warnings)
+BuildRequires: sed
 BuildRequires: systemd
 
 Requires:  perl-FusionInventory-Agent = %{version}-%{release}
@@ -135,6 +150,10 @@ fusioninventory cron task
 %prep
 %setup -q -n FusionInventory-Agent-%{version}
 
+# Remove bundled modules
+rm -rf ./inc
+sed -e '/^inc\//d' -i MANIFEST
+
 sed \
     -e "s/logger = .*/logger = syslog/" \
     -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \
@@ -282,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu Mar 12 2020 Petr Pisar <ppisar@redhat.com> - 2.5.2-3
+- Specify all dependencies and unbundle Module::Install
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From a042272d6d90aa3663f4dd2d1b5345af0da1b6fc Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Tue, 23 Jun 2020 10:17:38 +0200
Subject: [PATCH 088/106] Perl 5.32 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 75d31ce..8fb2f77 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5.2
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.5.2-4
+- Perl 5.32 rebuild
+
 * Thu Mar 12 2020 Petr Pisar <ppisar@redhat.com> - 2.5.2-3
 - Specify all dependencies and unbundle Module::Install
 

From 24feff36291960291e8dfb16fc6892eda6e7fc4e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 17:58:09 +0000
Subject: [PATCH 089/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 8fb2f77..f45611b 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5.2
-Release:     4%{?dist}
+Release:     5%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.5.2-4
 - Perl 5.32 rebuild
 

From 6460b5987981cf487973b1d6918302713feae550 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 06:03:32 +0000
Subject: [PATCH 090/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index f45611b..218802e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.5.2
-Release:     5%{?dist}
+Release:     6%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From ad05370a3b6692fede1b73bdd2ff941bb7be92d3 Mon Sep 17 00:00:00 2001
From: Marianne Lombard <marianne.lombard@inria.fr>
Date: Fri, 29 Jan 2021 12:07:15 +0100
Subject: [PATCH 091/106] Bump release to 2.6

---
 .gitignore                 | 1 +
 fusioninventory-agent.spec | 7 +++++--
 sources                    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8e9515..2b7f668 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /FusionInventory-Agent-2.5.tar.gz
 /FusionInventory-Agent-2.5.1.tar.gz
 /FusionInventory-Agent-2.5.2.tar.gz
+/FusionInventory-Agent-2.6.tar.gz
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 218802e..f9dad07 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -8,8 +8,8 @@ Summary:     FusionInventory agent
 License:     GPLv2+
 URL:         http://fusioninventory.org/
 
-Version:     2.5.2
-Release:     6%{?dist}
+Version:     2.6
+Release:     1%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Fri Jan 29 2021 Marianne Lombard <jehane@fedoraproject.org> - 2.6-1
+- Bump release to 2.6
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index c30ad82..76629c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (FusionInventory-Agent-2.5.2.tar.gz) = ddfcd5c811a118d06a07b21028781d211908afaca2276eeea25fdea0e08a880d5c38f3eeb27bda10cda5a7cee5befbb74071e78c908d9f14223d365ea2aa7757
+SHA512 (FusionInventory-Agent-2.6.tar.gz) = b400e8bbf1be117c110622e6f1e2e2eee744c4e79bf3686c9e4c9126f7d4cb7f2224149ab4e7ad9a686d0cdbcbe2aef1128766359270c7e9f00d78552f51aa45

From de66d0d6965ac29f60d01355ef6addfed5a96b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 2 Mar 2021 16:13:46 +0100
Subject: [PATCH 092/106] Rebuilt for updated systemd-rpm-macros

See https://pagure.io/fesco/issue/2583.
---
 fusioninventory-agent.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index f9dad07..f94309c 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,10 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.6-2
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
 * Fri Jan 29 2021 Marianne Lombard <jehane@fedoraproject.org> - 2.6-1
 - Bump release to 2.6
 

From 5e27f5eb73e6d1d89595ca1ea29c5edbbc14c608 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Fri, 21 May 2021 22:56:49 +0200
Subject: [PATCH 093/106] Perl 5.34 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index f94309c..fe06170 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.6-3
+- Perl 5.34 rebuild
+
 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.6-2
 - Rebuilt for updated systemd-rpm-macros
   See https://pagure.io/fesco/issue/2583.

From 5f786c0e482a3664408e732ac07645415833a056 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 23:29:43 +0000
Subject: [PATCH 094/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index fe06170..0a2dd8e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.6-3
 - Perl 5.34 rebuild
 

From 9e6c150271f38a849bb5d7cf39b9838870dfd3f5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 03:33:56 +0000
Subject: [PATCH 095/106] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 0a2dd8e..482eb6e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     4%{?dist}
+Release:     5%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 88af0f06cab4515f84925e0bd545088e5e44be0f Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Wed, 1 Jun 2022 11:35:51 +0200
Subject: [PATCH 096/106] Perl 5.36 rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 482eb6e..e82db99 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     5%{?dist}
+Release:     6%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.6-6
+- Perl 5.36 rebuild
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 714c55ab02105244e2b84747e8a1223660cc54d1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 03:46:49 +0000
Subject: [PATCH 097/106] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index e82db99..cace1f2 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     6%{?dist}
+Release:     7%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -301,6 +301,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.6-6
 - Perl 5.36 rebuild
 

From 687049deb49a2394403c5d504991fd782243cf0a Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Fri, 13 Jan 2023 09:35:06 +0100
Subject: [PATCH 098/106] Remove perl(MODULE_COMPAT), it will be replaced by
 generators

---
 fusioninventory-agent.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index cace1f2..0a28ee3 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -14,7 +14,6 @@ Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{vers
 Source1:     %{name}.cron
 Source10:    %{name}.service
 
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: coreutils
 BuildRequires: findutils
 BuildRequires: make
@@ -77,7 +76,6 @@ You can add additional packages for optional tasks:
 %package -n perl-FusionInventory-Agent
 Summary:        Libraries for Fusioninventory agent
 BuildArch:      noarch
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(LWP)
 Requires:       perl(Net::CUPS)
 Requires:       perl(Net::SSLeay)

From 9c1fa7578b943338e1c2faae12f6e7ac08f9cd95 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 04:03:02 +0000
Subject: [PATCH 099/106] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 0a28ee3..92b9dbd 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     7%{?dist}
+Release:     8%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -299,6 +299,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 8fe8d7a4b7782da7b00edcadd4dc8f2b0e11eee9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 20:25:24 +0000
Subject: [PATCH 100/106] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 92b9dbd..8688d8b 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     8%{?dist}
+Release:     9%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -299,6 +299,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 55a2989d5c6ce21147244b3071f6cc7fa00bbd6a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 19:56:43 +0000
Subject: [PATCH 101/106] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 8688d8b..85c5697 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     9%{?dist}
+Release:     10%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -299,6 +299,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 0d561d42c3c85f3cad3f178eec7d10ec461a9cd8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 12:11:19 +0000
Subject: [PATCH 102/106] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 85c5697..05d211c 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     10%{?dist}
+Release:     11%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -299,6 +299,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From b77ee3bddbad61f0ad772cc41885bca01aa54d7c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 23:48:41 +0000
Subject: [PATCH 103/106] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 05d211c..99e777e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -9,7 +9,7 @@ License:     GPLv2+
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     11%{?dist}
+Release:     12%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -299,6 +299,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 7eca12a54725ba5b3747e909d5b81b2e3a6a5547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Thu, 25 Jul 2024 23:56:13 +0200
Subject: [PATCH 104/106] convert GPLv2+ license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 fusioninventory-agent.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 99e777e..44ae1f2 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -5,11 +5,12 @@
 
 Name:        fusioninventory-agent
 Summary:     FusionInventory agent
-License:     GPLv2+
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:     GPL-2.0-or-later
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     12%{?dist}
+Release:     13%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -299,6 +300,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 2.6-13
+- convert license to SPDX
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 128e0e2eec02f78108cc4dce0c3bbb944569de13 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 19:01:29 +0000
Subject: [PATCH 105/106] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 44ae1f2..8138379 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPL-2.0-or-later
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     13%{?dist}
+Release:     14%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -300,6 +300,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 2.6-13
 - convert license to SPDX
 

From 61c65f6c930cbc8dcfda04872025182ba82276cd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 20:53:29 +0000
Subject: [PATCH 106/106] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 fusioninventory-agent.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 8138379..8b94faf 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -10,7 +10,7 @@ License:     GPL-2.0-or-later
 URL:         http://fusioninventory.org/
 
 Version:     2.6
-Release:     14%{?dist}
+Release:     15%{?dist}
 Source0:     https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz
 Source1:     %{name}.cron
 Source10:    %{name}.service
@@ -300,6 +300,9 @@ install -m 644 -D  %{SOURCE10}   %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild