diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec index 2697886..5231ca5 100644 --- a/ocsinventory-agent.spec +++ b/ocsinventory-agent.spec @@ -5,11 +5,9 @@ Name: ocsinventory-agent Summary: Open Computer and Software Inventory Next Generation client -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist}%{?ocstag:.%{ocstag}} -#Source0: http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz -#Source0: http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz Source0: http://launchpad.net/ocsinventory-unix-agent/1.1.x/ocsinventory-unix-agent-%{version}/+download/Ocsinventory-Agent-%{version}.tar.gz Source1: %{name}.logrotate @@ -27,15 +25,24 @@ URL: http://www.ocsinventory-ng.org/ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl(Module::Install) perl(XML::Simple) perl(LWP) perl(Net::IP) -BuildRequires: perl(Digest::MD5) perl(File::Temp) perl(XML::SAX) +%if 0%{?rhel} != 3 +BuildRequires: perl(Module::Install) perl(XML::SAX) +%endif +BuildRequires: perl(XML::Simple) perl(LWP) perl(Net::IP) +BuildRequires: perl(Digest::MD5) perl(File::Temp) + Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: net-tools, pciutils Requires: %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly -Requires: perl(HTTP::Request) perl(Proc::Daemon) -Requires: perl(Net::SSLeay) perl(Crypt::SSLeay) +Requires: perl(HTTP::Request) +Requires: perl(Net::SSLeay) perl(Crypt::SSLeay) perl(Net::IP) Requires: nmap monitor-edid which -%if 0%{?rhel} == 4 +%if 0%{?rhel} == 3 +Requires: perl(XML::Parser) +%else +Requires: perl(XML::SAX) perl(Proc::Daemon) +%endif +%if 0%{?rhel}%{?fedora} <= 4 Requires: kernel-utils %else Requires: smartmontools @@ -49,6 +56,10 @@ Provides: ocsinventory-client = 1.02 # use the following line when version is strictly above 1.01 # ocsinventory-client = %{version}-%{release} +%if 0%{?rhel} == 3 +%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib) +%endif + %description Open Computer and Software Inventory Next Generation is an application @@ -77,6 +88,7 @@ de commandes ou de fichiers sur les clients Windows ou Linux. %setup -q -n Ocsinventory-Agent-%{version} %patch1 -p1 +chmod -x lib/Ocsinventory/Agent/Backend/OS/MacOS/Hostname.pm cat <%{name}.conf # @@ -199,8 +211,13 @@ rm -rf %{buildroot} %changelog +* Sun Jan 03 2010 Remi Collet 1.1.2-1 +- update to 1.1.2 +- missing perl(Net::IP) requires + * Tue Dec 22 2009 Remi Collet 1.1.1-1 - update to 1.1.1 +- add Requires: which * Sat Nov 07 2009 Remi Collet 1.1-1 - update to 1.1 diff --git a/sources b/sources index 96a64f0..d886125 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c00acb51f559b237590ea7611523da0b Ocsinventory-Agent-1.1.1.tar.gz +c1e8e863d234e7f034a15636a38bfd96 Ocsinventory-Agent-1.1.2.tar.gz