[perl-SNMP-Info/el5: 14/14] Merge branch 'master' into el5

[gouldwp]

commit cd97d6a0e87cf28bcf6da35d98d2ff3a5974aadc
Merge: be0cc36 faf17c6
Author: Walter Gould <gouldwp at fedoraproject.org>
Date:   Sat Oct 15 15:46:20 2011 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-SNMP-Info.spec
    	sources

 .gitignore          |    4 ++++
 perl-SNMP-Info.spec |   17 +++++++++++++++++
 sources             |    4 ++++
 3 files changed, 25 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index a3e6482,9da84ff..f6aeb07
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  SNMP-Info-2.01.tar.gz
++<<<<<<< HEAD
++=======
+ /SNMP-Info-2.06.tar.gz
++>>>>>>> master
diff --cc perl-SNMP-Info.spec
index e13f7c7,a8d45d8..c2f9c1c
--- a/perl-SNMP-Info.spec
+++ b/perl-SNMP-Info.spec
@@@ -1,11 -1,11 +1,19 @@@
  Name:           perl-SNMP-Info
++<<<<<<< HEAD
 +Version:        2.01 
++=======
+ Version:        2.06 
++>>>>>>> master
  Release:        1%{?dist}
  Summary:        Object Oriented Perl5 Interface to Network devices and MIBs through SNMP
  License:        BSD
  Group:          Development/Libraries
  URL:            http://search.cpan.org/dist/SNMP-Info/
++<<<<<<< HEAD
 +Source0:        http://search.cpan.org/CPAN/authors/id/M/MA/MAXB/SNMP-Info-%{version}.tar.gz
++=======
+ Source0:        http://search.cpan.org/CPAN/authors/id/O/OL/OLIVER/SNMP-Info-%{version}.tar.gz
++>>>>>>> master
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch:      noarch
  BuildRequires:  perl(ExtUtils::MakeMaker)
@@@ -19,6 -19,7 +27,10 @@@ through SNMP
  
  %prep
  %setup -q -n SNMP-Info-%{version}
++<<<<<<< HEAD
++=======
+ /usr/bin/iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
++>>>>>>> master
  /usr/bin/iconv -f iso8859-1 -t utf-8 README > README.conv && /bin/mv -f README.conv README
  /usr/bin/iconv -f iso8859-1 -t utf-8 Info.pm > Info.pm.conv && /bin/mv -f Info.pm.conv Info.pm
  
@@@ -49,5 -50,7 +61,10 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man3/*
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Thu Oct 06 2011 <walt at gouldfamily.org> 2.06-1
+ - upgrade to 2.06
++>>>>>>> master
  * Thu Jun 18 2009 <walt at gouldfamily.org> 2.01-1
  - upgrade to 2.01
diff --cc sources
index 9c5576e,6700607..8410348
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +d58af8e67f9dba1d7a8971358a256fc3  SNMP-Info-2.01.tar.gz
++=======
+ b66e5744697dc0ca7157df2e3eddb8ee  SNMP-Info-2.06.tar.gz
++>>>>>>> master