From c8ecc84a6d462a3dc819a7a32fde3d6d0e192c74 Mon Sep 17 00:00:00 2001
From: Matt Hicks <mhicks@redhat.com>
Date: Mon, 21 May 2012 15:11:34 -0400
Subject: [PATCH 1/4] Merge branches 'f17' and 'f16' into f16


From 88ff4350bedb23bc149ead76aeba6202828f8bae Mon Sep 17 00:00:00 2001
From: Matt Hicks <mhicks@redhat.com>
Date: Mon, 21 May 2012 16:59:47 -0400
Subject: [PATCH 2/4] Merge branches 'f16' and 'el6' into el6


From 431237302d62cd9c08f0577ba2f29dbf03819629 Mon Sep 17 00:00:00 2001
From: Matt Hicks <mhicks@redhat.com>
Date: Mon, 21 May 2012 18:27:27 -0400
Subject: [PATCH 3/4] Removing conditionals

---
 rubygem-redcarpet.spec | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/rubygem-redcarpet.spec b/rubygem-redcarpet.spec
index 7d08d64..d0fe04e 100644
--- a/rubygem-redcarpet.spec
+++ b/rubygem-redcarpet.spec
@@ -1,44 +1,32 @@
 %global gem_name redcarpet
-%global rubyabi 1.9.1
-%global gem_extinstdir %{gem_extdir}/lib
+%global rubyabi 1.8
 
-%if 0%{?el6}
 %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem
 %global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}
 %global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}
 %global gem_libdir %{gem_instdir}/lib
 %global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
-%endif
 
-%if 0%{?el6}%{?fc16}
-%global rubyabi 1.8
 %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 %global gem_extinstdir %{ruby_sitearch}
-%endif
 
 
 Summary: A fast, safe and extensible Markdown to (X)HTML parser
 Name: rubygem-%{gem_name}
 Version: 2.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Development/Languages
 License: ISC
 URL: http://github.com/tanoku/redcarpet
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 Requires: ruby(abi) = %{rubyabi}
 
-%if 0%{?el6}
 BuildRequires: rubygems
-%else
-BuildRequires: rubygems-devel
-%endif
-
 BuildRequires: ruby-devel
 BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(rake)
 BuildRequires: rubygem(nokogiri)
-BuildRequires: rubygem(rdoc)
 
 Provides: rubygem(%{gem_name}) = %{version}
 
@@ -117,6 +105,9 @@ popd
 
 
 %changelog
+* Mon May 21 2012 Matt Hicks <mhicks@redhat.com> - 2.1.1-4
+- Removing conditionals
+
 * Mon May 21 2012 Matt Hicks <mhicks@redhat.com> - 2.1.1-3
 - Adding newer rdoc build requires to fix rpmdiff issue
 

From 3ac4104899a45470d87325b1175ec001e26efc3b Mon Sep 17 00:00:00 2001
From: Matt Hicks <mhicks@redhat.com>
Date: Thu, 24 May 2012 08:44:02 -0400
Subject: [PATCH 4/4] Making docs arch specific to work around rpmdiff issue

---
 rubygem-redcarpet.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rubygem-redcarpet.spec b/rubygem-redcarpet.spec
index d0fe04e..94e6b86 100644
--- a/rubygem-redcarpet.spec
+++ b/rubygem-redcarpet.spec
@@ -15,7 +15,7 @@
 Summary: A fast, safe and extensible Markdown to (X)HTML parser
 Name: rubygem-%{gem_name}
 Version: 2.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Languages
 License: ISC
 URL: http://github.com/tanoku/redcarpet
@@ -40,7 +40,6 @@ A fast, safe and extensible Markdown to (X)HTML parser
 Summary: Documentation for %{name}
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
 
 %description doc
 Documentation for %{name}
@@ -105,6 +104,9 @@ popd
 
 
 %changelog
+* Mon May 21 2012 Matt Hicks <mhicks@redhat.com> - 2.1.1-5
+- Making architecture specific to workaround rpmdiff issue
+
 * Mon May 21 2012 Matt Hicks <mhicks@redhat.com> - 2.1.1-4
 - Removing conditionals