packages: ocs-inventory-ng-client/ocs-inventory-ng-client.spec - ready to u...

[wolvverine]

Author: wolvverine                   Date: Mon Oct 19 15:33:04 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ready to use from cron (prefered), TODO: use as demon

---- Files affected:
packages/ocs-inventory-ng-client:
   ocs-inventory-ng-client.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec
diff -u packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec:1.8 packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec:1.9
--- packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec:1.8	Mon Oct 12 15:22:58 2009
+++ packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec	Mon Oct 19 17:32:59 2009
@@ -1,20 +1,19 @@
 # $Revision$, $Date$
 #TODO:
-# - init script or cron, choice in %{_sysconfdir}/sysconfig/ocsinventory-agent (example in debian)
+# - init script, and choice daemon/cron in /etc/sysconfig/ocsinventory-agent (example in debian)
 
 Summary:	OCS-ng Inventory agent for PLD systems
 Summary(pl.UTF-8):	Agent OCS-ng Inventory dla systemów PLD
 Name:		ocs-inventory-ng-client
 Version:	1.02
-Release:	0.1
+Release:	1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/ocsinventory/OCSNG_UNIX_AGENT-%{version}.tar.gz
 # Source0-md5:	749501586e0c634680c13000b3b2851e
 Source1:        %{name}.logrotate
-Source2:	%{name}.conf
-Source3:	%{name}.cron
-Source4:        %{name}.sysconfig
+Source2:	%{name}.cron
+Source3:        %{name}.sysconfig
 URL:		http://www.ocsinventory-ng.org/
 BuildRequires:	perl-devel >= 1:5.6
 BuildRequires:	perl-ExtUtils-MakeMaker
@@ -40,7 +39,7 @@
 # undos the source
 find '(' -name '*.php' -o -name '*.inc' -o  -name '*.conf' -o  -name '*.htc' -o  -name '*.js' -o  -name '*.dtd' -o  -name '*.pm' -o  -name '*.css' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
-# script for migration from old or make new configuration files 
+# remove script for migration from old or make new configuration files 
 mv postinst.pl postinst.pl.old
 touch postinst.pl
 
@@ -53,16 +52,14 @@
 install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}/{sysconfig,logrotate.d,ocsinventory-agent,cron.daily}}
 install -d $RPM_BUILD_ROOT{%{_var}/{log/ocsinventory-agent,lib/ocsinventory-agent},%{_bindir},%{_sbindir},/bin}
 
-OCS_AGENT_ADMININFO_FILE="ocsinv.adm"
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 ln -s /usr/sbin/ocsinventory-client.pl $RPM_BUILD_ROOT/bin/ocsinv
+ln -s /etc/sysconfig/ocsinventory-agent $RPM_BUILD_ROOT%{_sysconfdir}/ocsinventory-agent/ocsinventory-agent
 install %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ocsinventory-agent
-install %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/ocsinventory-agent/ocsinventory-agent
-install %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/ocsinventory-agent
-install %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ocsinventory-agent
+install %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/ocsinventory-agent
+install %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ocsinventory-agent
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,11 +67,10 @@
 %files
 %defattr(644,root,root,755)
 %doc README 
-#Ocsinventory/README
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ocsinventory-agent
 %dir %{_sysconfdir}/ocsinventory-agent
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ocsinventory-agent/ocsinventory-agent
-%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size)  %{_sysconfdir}/cron.daily/ocsinventory-agent
+%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cron.daily/ocsinventory-agent
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/ocsinventory-agent
 #%{_sysconfdir}/init.d/ocsinventory-agent
 %attr(755,root,root) %{_bindir}/*
@@ -96,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/10/19 15:32:59  wolvverine
+- ready to use from cron (prefered), TODO: use as demon
+
 Revision 1.8  2009/10/12 13:22:58  wolvverine
 - not run postinst.pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec?r1=1.8&r2=1.9&f=u