[ocsinventory-agent] more upstream patches
Remi Collet
remi at fedoraproject.org
Thu Feb 13 13:02:18 UTC 2014
commit efcb6b2e5d5f8b84301a300b0a33b0fcf1936e8a
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Feb 13 14:02:54 2014 +0100
more upstream patches
- add /var/lib/ocsinventory-agent/snmp and download folder
- move /etc/ocsinventory and /var/lib to subpackage
ocsinventory-agent-upstream.patch | 26 ++++++++++++++++++++++++
ocsinventory-agent.spec | 39 +++++++++++++++++++++---------------
2 files changed, 49 insertions(+), 16 deletions(-)
---
diff --git a/ocsinventory-agent-upstream.patch b/ocsinventory-agent-upstream.patch
index f619654..29760c4 100644
--- a/ocsinventory-agent-upstream.patch
+++ b/ocsinventory-agent-upstream.patch
@@ -10,3 +10,29 @@
# Add the values to XML
$common->addCPU($current);
+=== modified file 'lib/Ocsinventory/Agent/Hooks.pm'
+--- lib/Ocsinventory/Agent/Hooks.pm 2013-11-26 22:37:40 +0000
++++ lib/Ocsinventory/Agent/Hooks.pm 2014-02-11 15:07:08 +0000
+@@ -50,7 +50,7 @@
+ }
+
+ #Create objects for modules
+- foreach my $package (searchModules(\%Ocsivnentory::Agent::Modules::)){
++ foreach my $package (searchModules(\%Ocsinventory::Agent::Modules::)){
+ my $module = new $package($context);
+ my $name = $module->{structure}->{name};
+
+
+=== modified file 'snmp/mibs/local/6876.xml'
+--- snmp/mibs/local/6876.xml 2013-12-02 13:47:21 +0000
++++ snmp/mibs/local/6876.xml 2014-02-12 11:00:25 +0000
+@@ -85,7 +85,7 @@
+ </DESCRIPTION>
+ <MACADDR>
+ <VALUE>1.3.6.1.4.1.6876.2.4.1.7.VM.NET</VALUE>
+- </MACADDRESS>
++ </MACADDR>
+ <STATUS>
+ <VALUE>1.3.6.1.4.1.6876.2.4.1.6.VM.NET</VALUE>
+ <REPLACE>
+
diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec
index 0d913f8..50f5fe6 100644
--- a/ocsinventory-agent.spec
+++ b/ocsinventory-agent.spec
@@ -18,7 +18,7 @@ Name: ocsinventory-agent
Summary: Open Computer and Software Inventory Next Generation client
Version: 2.1
-Release: 1%{?dist}%{?ocstag:.%{ocstag}}
+Release: 2%{?dist}%{?ocstag:.%{ocstag}}
Source0: http://launchpad.net/ocsinventory-unix-agent/stable-2.1/%{version}/+download/Ocsinventory-Unix-Agent-%{version}.tar.gz
@@ -29,15 +29,14 @@ Source11: %{name}.README
Source12: %{name}.README.fr
# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/stable-2.1/revision/1181
+# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/stable-2.1/revision/1183
+# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/stable-2.1/revision/1186
Patch0: %{name}-upstream.patch
Group: Applications/System
License: GPLv2+
URL: http://www.ocsinventory-ng.org/
-%if 0%{?fedora} < 12 && 0%{?rhel} < 6
-BuildArch: noarch
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(Module::Install)
@@ -49,13 +48,9 @@ BuildRequires: perl(File::Temp)
Requires: perl-Ocsinventory-Agent = %{version}-%{release}
Requires: crontabs
-Requires: %{_sysconfdir}/logrotate.d
-Requires: %{_sysconfdir}/cron.hourly
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
%ifarch %{ix86} x86_64 ia64
Requires: dmidecode
%endif
-%endif
Obsoletes: ocsinventory-client < %{version}
Provides: ocsinventory-client = %{version}-%{release}
@@ -66,7 +61,7 @@ Open Computer and Software Inventory Next Generation is an application
designed to help a network or system administrator keep track of computer
configuration and software installed on the network.
-It also allows deploying softwares, commands or files on Windows and
+It also allows deploying software, commands or files on Windows and
Linux client computers.
%{name} provides the client for Linux (Unified Unix Agent).
@@ -102,6 +97,7 @@ Requires: nmap
Requires: monitor-edid
Requires: which
Requires: smartmontools
+Requires: %{_sysconfdir}/logrotate.d
Conflicts: %{name} < %{version}
%description -n perl-Ocsinventory-Agent
@@ -114,6 +110,7 @@ Perl libraries for %{name}
%prep
%setup -q -n Ocsinventory-Unix-Agent-%{version}
+sed -e 's/\r//' -i snmp/mibs/local/6876.xml
%patch0 -p0
cat <<EOF >%{name}.conf
@@ -192,6 +189,9 @@ mv %{buildroot}%{_bindir} %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_localstatedir}/{log,lib}/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/{logrotate.d,sysconfig,cron.hourly,ocsinventory/softwares}
+mkdir %{buildroot}%{_localstatedir}/lib/%{name}/download
+cp -pr snmp %{buildroot}%{_localstatedir}/lib/%{name}/snmp
+
install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
install -pm 644 %{name}.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name}
@@ -221,14 +221,7 @@ rm -rf %{buildroot}
%files
%defattr(-, root, root, -)
%{_sbindir}/%{name}
-%dir %{_localstatedir}/log/%{name}
-%dir %{_localstatedir}/lib/%{name}
-%dir %{_sysconfdir}/ocsinventory
-%dir %{_sysconfdir}/ocsinventory/softwares
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/ocsinventory/%{name}.cfg
-%config(noreplace) %{_sysconfdir}/ocsinventory/modules.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%{_sysconfdir}/cron.hourly/%{name}
%{_mandir}/man1/%{name}*
@@ -240,9 +233,23 @@ rm -rf %{buildroot}
%lang(fr) %doc README.RPM.fr
%{perl_vendorlib}/Ocsinventory
%{_mandir}/man3/Ocs*
+%dir %{_localstatedir}/log/%{name}
+%dir %{_localstatedir}/lib/%{name}
+%{_localstatedir}/lib/%{name}/download
+%{_localstatedir}/lib/%{name}/snmp
+%dir %{_sysconfdir}/ocsinventory
+%dir %{_sysconfdir}/ocsinventory/softwares
+%config(noreplace) %{_sysconfdir}/ocsinventory/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/ocsinventory/modules.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%changelog
+* Thu Feb 13 2014 Remi Collet <remi at fedoraproject.org> - 2.1-2
+- more upstream patches
+- add /var/lib/ocsinventory-agent/snmp and download folder
+- move /etc/ocsinventory and /var/lib to subpackage
+
* Thu Feb 13 2014 Remi Collet <remi at fedoraproject.org> - 2.1-1
- Update to 2.1
- move perl library to perl-Ocsinventory-Agent
More information about the scm-commits
mailing list