Author: glen Date: Wed Jul 14 10:06:52 2010 GMT Module: packages Tag: HEAD ---- Log message: - adapter and remove duplicate deps
---- Files affected: packages/ocs-inventory-ng-client: ocs-inventory-ng-client.spec (1.15 -> 1.16) ---- 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.15 packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec:1.16 --- packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec:1.15 Wed Jul 14 11:58:26 2010 +++ packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec Wed Jul 14 12:06:45 2010 @@ -1,5 +1,5 @@ # $Revision$, $Date$ -#TODO: +# TODO: # - init script, and choice daemon/cron in /etc/sysconfig/ocsinventory-agent (example in debian) Summary: OCS-ng Inventory agent for PLD systems @@ -11,19 +11,18 @@ Group: Networking/Daemons Source0: http://launchpad.net/ocsinventory-unix-agent/stable/ocsinventory-unix-agent-1.1.2/+download/Ocsinventory-Agent-%{version}.tar.gz # Source0-md5: c1e8e863d234e7f034a15636a38bfd96 -Source1: %{name}.logrotate +Source1: %{name}.logrotate Source2: %{name}.cron -Source3: %{name}.sysconfig +Source3: %{name}.sysconfig URL: http://www.ocsinventory-ng.org/ -BuildRequires: perl-devel >= 1:5.6 BuildRequires: perl-ExtUtils-MakeMaker -Requires: perl-Net-SSLeay -Requires: perl-Digest-MD5 -Requires: perl-XML-Simple >= 2.12 +BuildRequires: perl-devel >= 1:5.6 Requires: dmidecode -Requires: perl-Net-IP >= 1.21 +Requires: perl-Digest-MD5 Requires: perl-IO-Compress -Requires: perl-XML-Simple +Requires: perl-Net-IP >= 1.21 +Requires: perl-Net-SSLeay +Requires: perl-XML-Simple >= 2.12 Suggests: dmidecode Suggests: nmap Suggests: pciutils @@ -42,7 +41,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$,,' -# remove 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 @@ -58,7 +57,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -ln -s /usr/sbin/ocsinventory-client.pl $RPM_BUILD_ROOT/bin/ocsinv +ln -s %{_sbindir}/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}/cron.daily/ocsinventory-agent @@ -72,12 +71,12 @@ %files %defattr(644,root,root,755) -%doc README +%doc 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(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/ocsinventory-agent +%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.daily/ocsinventory-agent +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ocsinventory-agent #%{_sysconfdir}/init.d/ocsinventory-agent %attr(755,root,root) %{_bindir}/* %attr(755,root,root) /bin/ocsinv @@ -90,8 +89,8 @@ %dir %{perl_vendorlib}/Ocsinventory/Agent %{perl_vendorlib}/Ocsinventory/Agent/* %dir %{_var}/log/ocsinventory-agent -%{_mandir}/man1/*.gz -%{_mandir}/man3/*.gz +%{_mandir}/man1/* +%{_mandir}/man3/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -99,6 +98,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2010/07/14 10:06:45 glen +- adapter and remove duplicate deps + Revision 1.15 2010/07/14 09:58:26 wolvverine - up to 1.1.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ocs-inventory-ng-client/ocs-inventory-ng-client.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
