From bb477b9100ad2b539d31b0e6aeeda07b481a3bd5 Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Apr 16 2014 14:07:38 +0000
Subject: Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1

Fix FTBFS if "-Werror=format-security" flag is used (rhbz#1037312).

---

diff --git a/rubygem-xmlparser-ftbfs-fix.patch b/rubygem-xmlparser-ftbfs-fix.patch
new file mode 100644
index 0000000..fff747e
--- /dev/null
+++ b/rubygem-xmlparser-ftbfs-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/ext/xmlparser.c b/ext/xmlparser.c
+index aa32d11..65a6540 100644
+--- a/ext/xmlparser.c
++++ b/ext/xmlparser.c
+@@ -1780,7 +1780,7 @@ XMLParser_parse(int argc, VALUE* argv, VALUE obj)
+       if (!ret) {
+ 	int err = XML_GetErrorCode(parser->parser);
+ 	const char* errStr = XML_ErrorString(err);
+-	rb_raise(eXMLParserError, (char*)errStr);
++	rb_raise(eXMLParserError, "%s", errStr);
+       }
+     } while (!NIL_P(buf));
+     return Qnil;
+@@ -1829,7 +1829,7 @@ XMLParser_parse(int argc, VALUE* argv, VALUE obj)
+   if (!ret) {
+     int err = XML_GetErrorCode(parser->parser);
+     const char* errStr = XML_ErrorString(err);
+-    rb_raise(eXMLParserError, (char*)errStr);
++    rb_raise(eXMLParserError, "%s", errStr);
+   }
+ 
+   return Qnil;
diff --git a/rubygem-xmlparser.spec b/rubygem-xmlparser.spec
index dc70253..cb5beba 100644
--- a/rubygem-xmlparser.spec
+++ b/rubygem-xmlparser.spec
@@ -3,7 +3,7 @@
 Summary: Ruby bindings to the Expat XML parsing library
 Name: rubygem-%{gem_name}
 Version: 0.7.2.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Development/Languages
 # src/lib/xml/xpath.rb is GPLv2+
 # src/ext/encoding.h and the functions of encoding map are GPLv2+ or Artistic
@@ -12,10 +12,12 @@ Group: Development/Languages
 License: GPLv2+ and ( Ruby or GPLv2+ or MIT ) and ( GPLv2+ or Artistic ) 
 URL: http://rubygems.org/gems/xmlparser
 Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
+# Handle 'format not a string literal and no format arguments' error.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1037312
+# Thanks to Gregor Herrmann for the patch.
+# https://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg297233.html
+Patch0: rubygem-xmlparser-ftbfs-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: ruby
-Requires: ruby(rubygems)
-Requires: ruby(release)
 BuildRequires: ruby
 BuildRequires: ruby(rubygems)
 BuildRequires: ruby(release)
@@ -24,16 +26,20 @@ BuildRequires: rubygems-devel
 BuildRequires: rubygem(rake)
 BuildRequires: rubygem(mkrf)
 BuildRequires: expat-devel
-Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 Ruby bindings to the Expat XML parsing library. 
 
 %prep
-%setup -q -c -T 
-cp %{SOURCE0} %{gem_name}-%{version}.gem
+gem unpack %{SOURCE0}
+%setup -q -D -T -n  %{gem_name}-%{version}
+
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+
+%patch0 -p1
 
 %build
+gem build %{gem_name}.gemspec
 %gem_install
 
 %install
@@ -45,16 +51,12 @@ cp -rp .%{gem_dir}/* %{buildroot}%{gem_dir}/
 rm -rf %{buildroot}%{gem_instdir}/ext
 
 # install externals
-mkdir -p %{buildroot}%{gem_extdir_mri}/lib
-mv %{buildroot}%{gem_instdir}/lib/*.so %{buildroot}%{gem_extdir_mri}/lib
-
-%clean
-rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gem_extdir_mri}/
+cp -a ./%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
 
 
 %files
-%defattr(-, root, root, -)
-%{gem_extdir_mri}/lib/xmlparser.so
+%{gem_extdir_mri}
 %dir %{gem_instdir}/
 %doc %{gem_instdir}/[A-Z]*
 %doc %{gem_docdir}
@@ -63,6 +65,10 @@ rm -rf %{buildroot}
 %{gem_spec}
 
 %changelog
+* Thu Apr 10 2014 Josef Stribny <jstribny@redhat.com> - 0.7.2.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1
+- Fix FTBFS if "-Werror=format-security" flag is used (rhbz#1037312).
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild