[ocsinventory-agent] - Update to 2.1 - move perl library to perl-Ocsinventory-Agent - make main package arched for depend

Remi Collet remi at fedoraproject.org
Thu Feb 13 07:02:32 UTC 2014 

commit 68c6f573cf880ed72db283ac19f5e377b96350a8
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Feb 13 08:03:06 2014 +0100

    - Update to 2.1
    - move perl library to perl-Ocsinventory-Agent
    - make main package arched for dependency on dmidecode

 .gitignore                        |    1 +
 ocsinventory-agent-ifconfig.patch |  108 ---------------------------------
 ocsinventory-agent-upstream.patch |   12 ++++
 ocsinventory-agent.spec           |  118 ++++++++++++++++++++++++-------------
 sources                           |    2 +-
 5 files changed, 90 insertions(+), 151 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f82214..f4a830f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ Ocsinventory-Agent-1.1.2.tar.gz
 /Ocsinventory-Agent-1.1.2.1.tar.gz
 /Ocsinventory-Unix-Agent-2.0.4.tar.gz
 /Ocsinventory-Unix-Agent-2.0.5.tar.gz
+/Ocsinventory-Unix-Agent-2.1.tar.gz
diff --git a/ocsinventory-agent-upstream.patch b/ocsinventory-agent-upstream.patch
new file mode 100644
index 0000000..f619654
--- /dev/null
+++ b/ocsinventory-agent-upstream.patch
@@ -0,0 +1,12 @@
+=== modified file 'lib/Ocsinventory/Agent/Backend/OS/Linux/Archs/i386/CPU.pm'
+--- lib/Ocsinventory/Agent/Backend/OS/Linux/Archs/i386/CPU.pm	2013-11-26 22:37:40 +0000
++++ lib/Ocsinventory/Agent/Backend/OS/Linux/Archs/i386/CPU.pm	2014-02-07 16:27:36 +0000
+@@ -85,7 +85,6 @@
+ 
+     # The last one
+     $cpusocket{$current->{NBSOCKET}}=$current;
+-    print Dumper($current);
+ 
+     # Add the values to XML
+     $common->addCPU($current);
+
diff --git a/ocsinventory-agent.spec b/ocsinventory-agent.spec
index a203df2..0d913f8 100644
--- a/ocsinventory-agent.spec
+++ b/ocsinventory-agent.spec
@@ -1,14 +1,26 @@
+# spec file for ocsinventory-agent
+#
+# Copyright (c) 2007-2014 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Please, preserve the changelog entries
+#
+
 # Can, optionaly, be define at build time (see README.RPM)
 # - ocstag    : administrative tag
 # - ocsserver : OCS Inventory NG communication serveur
 
+# Avoid empty debuginfo package, arched only for dep
+%global debug_package %{nil}
+
 Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
-Version:   2.0.5
-Release:   8%{?dist}%{?ocstag:.%{ocstag}}
+Version:   2.1
+Release:   1%{?dist}%{?ocstag:.%{ocstag}}
 
-Source0:   http://launchpad.net/ocsinventory-unix-agent/stable-2.0/%{version}/+download/Ocsinventory-Unix-Agent-%{version}.tar.gz
+Source0:   http://launchpad.net/ocsinventory-unix-agent/stable-2.1/%{version}/+download/Ocsinventory-Unix-Agent-%{version}.tar.gz
 
 Source1:   %{name}.logrotate
 Source2:   %{name}.cron
@@ -16,43 +28,38 @@ Source2:   %{name}.cron
 Source11:   %{name}.README
 Source12:   %{name}.README.fr
 
-# Fix ifconfig output parsing on fedora >= 17 #853982
-# https://bugs.launchpad.net/bugs/1045356
-# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/trunk/revision/1112
-# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/trunk/revision/1123
-# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/trunk/revision/1133
-# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/trunk/revision/1134
-Patch0:     %{name}-ifconfig.patch
+# http://bazaar.launchpad.net/~ocsinventory-dev/ocsinventory-unix-agent/stable-2.1/revision/1181
+Patch0:    %{name}-upstream.patch
 
-Group:     Development/Libraries
+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)
-BuildRequires: perl(XML::Simple) perl(LWP) perl(Net::IP)
-BuildRequires: perl(Digest::MD5) perl(File::Temp)
+BuildRequires: perl(XML::Simple)
+BuildRequires: perl(LWP)
+BuildRequires: perl(Net::IP)
+BuildRequires: perl(Digest::MD5)
+BuildRequires: 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)
-Requires:  perl(Net::SSLeay) perl(Crypt::SSLeay) perl(Net::IP)
-Requires:  nmap monitor-edid which
-Requires:  perl(Proc::Daemon)
-Requires:  smartmontools
+Requires:  perl-Ocsinventory-Agent = %{version}-%{release}
 Requires:  crontabs
-# Optionnal : dmidecode on x86, /proc in ppc
-# Requires:  %{_sbindir}/dmidecode
-# Optionnal : ipdiscover or nmap, monitor-edid
-# Requires: ocsinventory-ipdiscover, nmap, monitor-edid, bridge-utils
+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}
 
-%{?perl_default_filter}
-
 
 %description
 Open Computer and Software Inventory Next Generation is an application
@@ -77,20 +84,38 @@ de commandes ou de fichiers sur les clients Windows ou Linux.
 %{name} fournit le client pour Linux (Agent Unix Unifié)
 
 
-%prep
-%setup -q -n Ocsinventory-Unix-Agent-%{version}
+%package -n perl-Ocsinventory-Agent
+Summary:   Libraries %{name}
+Group:     Development/Libraries
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+BuildArch: noarch
+%endif
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  perl(Crypt::SSLeay)
+Requires:  perl(HTTP::Request)
+Requires:  perl(Net::IP)
+Requires:  perl(Net::SSLeay)
+Requires:  perl(Proc::Daemon)
+Requires:  net-tools
+Requires:  pciutils
+Requires:  nmap
+Requires:  monitor-edid
+Requires:  which
+Requires:  smartmontools
+Conflicts: %{name} < %{version}
 
-%patch0 -p0
+%description  -n perl-Ocsinventory-Agent
+Perl libraries for %{name}
 
-# avoid rpmlint warning
-sed -i -e 's/\r//' lib/Ocsinventory/Agent/Modules/Download.pm
 
-chmod -x lib/Ocsinventory/Agent/Modules/Snmp.pm \
-         lib/Ocsinventory/Agent/Modules/Download.pm \
-         lib/Ocsinventory/Agent/Hooks.pm \
-         lib/Ocsinventory/Agent/Modules/Example.pm
+%{?perl_default_filter}
 
 
+%prep
+%setup -q -n Ocsinventory-Unix-Agent-%{version}
+
+%patch0 -p0
+
 cat <<EOF >%{name}.conf
 # 
 # OCS Inventory "Unix Unified Agent" Configuration File
@@ -195,10 +220,6 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS Changes LICENSE README THANKS README.RPM
-%doc etc/ocsinventory-agent/softwares/example.sh
-%lang(fr) %doc README.RPM.fr
-%{perl_vendorlib}/Ocsinventory
 %{_sbindir}/%{name}
 %dir %{_localstatedir}/log/%{name}
 %dir %{_localstatedir}/lib/%{name}
@@ -210,10 +231,23 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_sysconfdir}/cron.hourly/%{name}
 %{_mandir}/man1/%{name}*
+
+
+%files -n perl-Ocsinventory-Agent
+%defattr(-, root, root, -)
+%doc AUTHORS Changes LICENSE README THANKS README.RPM
+%doc etc/ocsinventory-agent/softwares/example.sh
+%lang(fr) %doc README.RPM.fr
+%{perl_vendorlib}/Ocsinventory
 %{_mandir}/man3/Ocs*
 
 
 %changelog
+* Thu Feb 13 2014 Remi Collet <remi at fedoraproject.org> - 2.1-1
+- Update to 2.1
+- move perl library to perl-Ocsinventory-Agent
+- make main package arched for dependency on dmidecode
+
 * Fri Aug 02 2013 Petr Pisar <ppisar at redhat.com> - 2.0.5-8
 - Perl 5.18 rebuild
 
@@ -300,7 +334,7 @@ rm -rf %{buildroot}
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.9.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Oct 20 2008 Remi Collet <Fedora at famillecollet.com> 0.0.9.2-2
+* Mon Oct 20 2008 Remi Collet <Fedora at famillecollet.com> 0.0.9.2-2
 - fix FTBFS (#465073)
 
 * Sun Apr 20 2008 Remi Collet <Fedora at famillecollet.com> 0.0.9.2-1
@@ -350,7 +384,7 @@ rm -rf %{buildroot}
 * Sat Jan 26 2008 Remi Collet <Fedora at famillecollet.com> 0.0.7-1
 - update to 0.0.7
 
-* Sat Dec 28 2007 Remi Collet <Fedora at famillecollet.com> 0.0.6.2-1
+* Fri Dec 28 2007 Remi Collet <Fedora at famillecollet.com> 0.0.6.2-1
 - update to 0.0.6.2
 
 * Mon Apr 16 2007 Remi Collet <Fedora at famillecollet.com> 0.0.6-1
diff --git a/sources b/sources
index 3a1ddf2..cdf12a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43fbceeb55c14b71238d4ae0a4124d25  Ocsinventory-Unix-Agent-2.0.5.tar.gz
+688345f738a5d5137a3374dc31e8e2d4  Ocsinventory-Unix-Agent-2.1.tar.gz

More information about the scm-commits mailing list