[csw-devel] SF.net SVN: gar:[21657] csw/mgar/pkg/fusioninventory-agent/trunk

Tue Aug 6 14:08:31 CEST 2013

Revision: 21657
          http://gar.svn.sourceforge.net/gar/?rev=21657&view=rev
Author:   guillomovitch
Date:     2013-08-06 12:08:30 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
- update to 2.3.0
- split tasks in multiple packages
- rename to CSWfi-agent, because of package name length constraints

Modified Paths:
--------------
    csw/mgar/pkg/fusioninventory-agent/trunk/Makefile
    csw/mgar/pkg/fusioninventory-agent/trunk/checksums

Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile
===================================================================

--- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile	2013-08-06 11:59:44 UTC (rev 21656)
+++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile	2013-08-06 12:08:30 UTC (rev 21657)
@@ -2,19 +2,20 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = fusioninventory-agent
-VERSION = 2.2.7
+VERSION = 2.3.0
 GARTYPE = v2
 CATEGORIES = cpan
 
 DESCRIPTION = FusionInventory agent
 define BLURB
-  The FusionInventory agent is a generic management agent. It can perform a
-  certain number of tasks, according to its own execution plan, or on behalf of
-  a GLPI server with fusioninventory plugin, acting as a control point.
+  The fusioninventory agent is a generic agent, running on each managed node. It
+  can perform a certain number of tasks, either according to its own execution
+  plan, or as requested from a central control server, such as GLPI server with
+  fusioninventory plugin.
 endef
 
 MASTER_SITES = $(CPAN_MIRRORS)
-AUTHOR = FUSINV
+AUTHOR = GONERI
 MODDIST =
 DISTNAME = FusionInventory-Agent-$(VERSION)
 DISTFILES = $(DISTNAME).tar.gz
@@ -24,26 +25,74 @@
 UPSTREAM_MASTER_SITES = http://forge.fusioninventory.org/projects/fusioninventory-agent/files
 
 LICENSE = LICENSE
-
-PACKAGES = CSWfusioninventory-agent
 ARCHALL = 1
 
-RUNTIME_DEP_PKGS += CSWpm-file-which
-RUNTIME_DEP_PKGS += CSWpm-io-socket-ssl
-RUNTIME_DEP_PKGS += CSWpm-libwww-perl
-RUNTIME_DEP_PKGS += CSWpm-proc-daemon
-RUNTIME_DEP_PKGS += CSWpm-proc-pid-file
+PACKAGES  = CSWfi-agent
+SPKG_DESC_CSWfi-agent = The FusionInventory agent
+RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-file-which
+RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-io-socket-ssl
+RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-libwww-perl
+RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-proc-daemon
+RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-proc-pid-file
+RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-net-ip
+RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-text-template
+RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-universal-require
+RUNTIME_DEP_PKGS_CSWfi-agent += CSWpm-xml-treepp
+# no PKGFILES, to catch all other files
+OBSOLETED_BY_CSWfi-agent = CSWfusioninventory-agent
+CHECKPKG_OVERRIDES_CSWfi-agent += surplus-dependency|CSWperl
+
+PACKAGES += CSWfi-agent-task-inventory
+SPKG_DESC_CSWfi-agent-task-inventory = Local inventory support for FusionInventory agent
+RUNTIME_DEP_PKGS_CSWfi-agent-task-inventory = CSWfi-agent
 # not available in 5.9
 ifneq ($(shell /usr/bin/uname -r),5.9) 
-    RUNTIME_DEP_PKGS += CSWpm-net-cups
+    RUNTIME_DEP_PKGS_CSWfi-agent-task-inventory += CSWpm-net-cups
 endif
-RUNTIME_DEP_PKGS += CSWpm-net-ip
-RUNTIME_DEP_PKGS += CSWpm-text-template
-RUNTIME_DEP_PKGS += CSWpm-universal-require
-RUNTIME_DEP_PKGS += CSWpm-xml-treepp
-RUNTIME_DEP_PKGS += CSWmemconf
-PATCHFILES += 0001-don-t-install-a-private-memconf-copy.patch
+PKGFILES_CSWfi-agent-task-inventory  = $(bindir)/fusioninventory-inventory
+PKGFILES_CSWfi-agent-task-inventory += $(mandir)/man1/fusioninventory-inventory.1
+PKGFILES_CSWfi-agent-task-inventory += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.*
+CHECKPKG_OVERRIDES_CSWfi-agent-task-inventory += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWfi-agent-task-inventory += archall-with-arch-paths|/opt/csw/share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/BSD/Archs/i386.pm
+CHECKPKG_OVERRIDES_CSWfi-agent-task-inventory += archall-with-arch-paths|/opt/csw/share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Archs/i386.pm
 
+PACKAGES += CSWfi-agent-task-wakeonlan
+SPKG_DESC_CSWfi-agent-task-wakeonlan = Wake-on-lan support for FusionInventory agent
+RUNTIME_DEP_PKGS_CSWfi-agent-task-wakeonlan = CSWfi-agent
+PKGFILES_CSWfi-agent-task-wakeonlan  = $(bindir)/fusioninventory-wakeonlan
+PKGFILES_CSWfi-agent-task-wakeonlan += $(mandir)/man1/fusioninventory-wakeonlan.1
+PKGFILES_CSWfi-agent-task-wakeonlan += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
+CHECKPKG_OVERRIDES_CSWfi-agent-task-wakeonlan += surplus-dependency|CSWperl
+
+PACKAGES += CSWfi-agent-task-esx
+SPKG_DESC_CSWfi-agent-task-esx = ESX inventory support for FusionInventory agent
+RUNTIME_DEP_PKGS_CSWfi-agent-task-esx = CSWfi-agent
+PKGFILES_CSWfi-agent-task-esx  = $(bindir)/fusioninventory-esx
+PKGFILES_CSWfi-agent-task-esx += $(mandir)/man1/fusioninventory-esx.1
+PKGFILES_CSWfi-agent-task-esx += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Task/ESX.pm
+PKGFILES_CSWfi-agent-task-esx += $(datadir)/fusioninventory/lib/FusionInventory/Agent/SOAP/.*
+CHECKPKG_OVERRIDES_CSWfi-agent-task-esx += surplus-dependency|CSWperl
+
+PACKAGES += CSWfi-agent-task-network
+SPKG_DESC_CSWfi-agent-task-network = Network discovery and inventory support for FusionInventory agent
+RUNTIME_DEP_PKGS_CSWfi-agent-task-network  = CSWfi-agent
+RUNTIME_DEP_PKGS_CSWfi-agent-task-network += CSWpm-net-snmp
+PKGFILES_CSWfi-agent-task-network  = $(bindir)/fusioninventory-netdiscovery
+PKGFILES_CSWfi-agent-task-network += $(bindir)/fusioninventory-netinventory
+PKGFILES_CSWfi-agent-task-network += $(mandir)/man1/fusioninventory-netdiscovery.1
+PKGFILES_CSWfi-agent-task-network += $(mandir)/man1/fusioninventory-netinventory.1
+PKGFILES_CSWfi-agent-task-network += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery.*
+PKGFILES_CSWfi-agent-task-network += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory.*
+PKGFILES_CSWfi-agent-task-network += $(datadir)/fusioninventory/lib/FusionInventory/Agent/SNMP.*
+PKGFILES_CSWfi-agent-task-network += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Tools/SNMP.pm
+CHECKPKG_OVERRIDES_CSWfi-agent-task-network += surplus-dependency|CSWperl
+
+PACKAGES += CSWfi-agent-task-deploy
+SPKG_DESC_CSWfi-agent-task-deploy = Software deployment support for FusionInventory agent
+RUNTIME_DEP_PKGS_CSWfi-agent-task-deploy = CSWfi-agent
+PKGFILES_CSWfi-agent-task-deploy  = $(datadir)/fusioninventory/lib/FusionInventory/Agent/Task/Deploy.*
+CHECKPKG_OVERRIDES_CSWfi-agent-task-deploy += surplus-dependency|CSWperl
+
 CONFIGURE_ARGS = PREFIX=/opt/csw SYSCONFDIR=/etc/opt/csw/fusioninventory LOCALSTATEDIR=/var/opt/csw/fusioninventory
 
 # skip tests
@@ -53,17 +102,14 @@
 INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH)
 
 # checkpkg overrides
-CHECKPKG_OVERRIDES += archall-with-arch-paths|/opt/csw/share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Input/BSD/Archs/i386.pm
-CHECKPKG_OVERRIDES += archall-with-arch-paths|/opt/csw/share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Input/Linux/Archs/i386.pm
-CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.pm
-CHECKPKG_OVERRIDES += surplus-dependency|CSWperl
+#CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory.pm
 
 DOCLIST = LICENSE Changes README THANKS
 
-CRONTABS = /etc/opt/csw/pkg/CSWfusioninventory-agent/crontabs/root
+CRONTABS = /etc/opt/csw/pkg/CSWfi-agent/crontabs/root
 
 post-install-modulated:
-	/opt/csw/gnu/install -D -m 644 $(WORKDIR)/fusioninventory-agent.cron $(DESTDIR)/etc/opt/csw/pkg/CSWfusioninventory-agent/crontabs/root
+	/opt/csw/gnu/install -D -m 644 $(WORKDIR)/fusioninventory-agent.cron $(DESTDIR)/etc/opt/csw/pkg/CSWfi-agent/crontabs/root
 	/opt/csw/gnu/install -D -m 644 $(WORKDIR)/fusioninventory-agent.default $(DESTDIR)/etc/opt/csw/default/fusioninventory-agent
 
 include gar/category.mk

Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums
===================================================================
--- csw/mgar/pkg/fusioninventory-agent/trunk/checksums	2013-08-06 11:59:44 UTC (rev 21656)
+++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums	2013-08-06 12:08:30 UTC (rev 21657)
@@ -1 +1 @@
-8d42cd33c65ec899a03bc510b83cc390  FusionInventory-Agent-2.2.7.tar.gz
+a4b17fe8d9cc7ceae673d81ea2917dc3  FusionInventory-Agent-2.3.0.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

