[rubygem-snmp] Fix #715639 FTBFS

Michael Stahnke stahnma at fedoraproject.org
Sun Jan 8 08:27:01 UTC 2012


commit 81569026eb2ccb610a342bce36c0e55849d20fd6
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Sat Jan 7 20:02:02 2012 -0600

    Fix #715639 FTBFS
    
    Signed-off-by: Michael Stahnke <stahnma at puppetlabs.com>

 rakefile.patch    |   38 ++++++++++++++++++++++++++++++++++++++
 rubygem-snmp.spec |   22 +++++++++++-----------
 2 files changed, 49 insertions(+), 11 deletions(-)
---
diff --git a/rakefile.patch b/rakefile.patch
new file mode 100644
index 0000000..29a96c0
--- /dev/null
+++ b/rakefile.patch
@@ -0,0 +1,38 @@
+From 6811e7d9dfe6c28c7746a883a138d6a12cd1b4e8 Mon Sep 17 00:00:00 2001
+From: Michael Stahnke <stahnma at puppetlabs.com>
+Date: Sat, 7 Jan 2012 19:54:41 -0600
+Subject: [PATCH] WIP
+
+---
+ Rakefile |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index d741f07..9015636 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -17,10 +17,10 @@ CLEAN.include 'web/site'
+ 
+ spec = Gem::Specification.load "snmp.gemspec"
+ 
+-Gem::PackageTask.new(spec) do |package|
+-    package.need_zip = false
+-    package.need_tar = false
+-end
++#Gem::PackageTask.new(spec) do |package|
++#    package.need_zip = false
++#    package.need_tar = false
++#end
+ 
+ # rdoc, clobber_rdoc, rerdoc targets
+ Rake::RDocTask.new do |doc|
+@@ -53,4 +53,4 @@ namespace :web do
+   task :publish => :gen do
+     sh "scp -r web/site/* davehal at rubyforge.org:/var/www/gforge-projects/snmplib"
+   end
+-end
+\ No newline at end of file
++end
+-- 
+1.7.7.3
+
diff --git a/rubygem-snmp.spec b/rubygem-snmp.spec
index 9fe0ad4..ba49a2d 100644
--- a/rubygem-snmp.spec
+++ b/rubygem-snmp.spec
@@ -10,10 +10,12 @@ Group: Development/Languages
 License: GPLv2 or Ruby
 URL: http://snmplib.rubyforge.org
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0: rakefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: ruby(abi) = 1.8
 BuildRequires: rubygems 
+BuildRequires: ruby-devel
 # Following needed only for test/check
 BuildRequires: rubygem(rake), rubygem(test-spec)
 BuildArch: noarch
@@ -32,6 +34,10 @@ gem install -V \
   --force --rdoc \
   %{SOURCE0}
 
+pushd $(pwd)/%{gemdir}/gems/snmp-%{version}/
+patch -p1 < %{PATCH0}
+popd
+
 # Adding proper name spacing to test directory, otherwise 
 # tests have issues between class Integer and SNMP::Integer
 sed -i 's/Integer/SNMP::Integer/g' ./%{geminstdir}/test/*.rb
@@ -43,35 +49,29 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
 
-sed -i 's/\r//' %{buildroot}%{gemdir}/gems/snmp-%{version}/README
-iconv -f ISO-8859-1 -t UTF-8  %{buildroot}%{gemdir}/gems/snmp-%{version}/README > readme.utf8 && \
-mv -f readme.utf8 %{buildroot}%{gemdir}/gems/snmp-%{version}/README
-
 %clean
 rm -rf %{buildroot}
 
 %check
-
 pushd %{buildroot}%{geminstdir}
 rake test
-popd 
+popd
 
 %files
 %defattr(-, root, root, -)
-%dir %{geminstdir} 
+%dir %{geminstdir}
 %{geminstdir}/lib
 %{geminstdir}/data
 %doc %{geminstdir}/Rakefile
-%doc %{geminstdir}/setup.rb
-%doc %{gemdir}/doc/%{gemname}-%{version} 
+%doc %{gemdir}/doc/%{gemname}-%{version}
 %doc %{geminstdir}/examples
 %doc %{geminstdir}/test
-%doc %{geminstdir}/README
+%doc %{geminstdir}/README.rdoc
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
-* Thu Dec 29 2011 <stahnma at fedoraproject.org> - 1.1.0-1
+* Sun Jan 08 2012 <stahnma at fedoraproject.org> - 1.1.0-1
 - Fix FTBFS bug  715639
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>


More information about the scm-commits mailing list