From c8ecc84a6d462a3dc819a7a32fde3d6d0e192c74 Mon Sep 17 00:00:00 2001 From: Matt Hicks Date: Mon, 21 May 2012 15:11:34 -0400 Subject: [PATCH 1/2] Merge branches 'f17' and 'f16' into f16 From 2f75ccaceebd7a9066e78a89b4a453bc58a3e5f6 Mon Sep 17 00:00:00 2001 From: Matt Hicks Date: Mon, 21 May 2012 18:32:48 -0400 Subject: [PATCH 2/2] Removing conditionals --- rubygem-redcarpet.spec | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/rubygem-redcarpet.spec b/rubygem-redcarpet.spec index 7d08d64..d7cc685 100644 --- a/rubygem-redcarpet.spec +++ b/rubygem-redcarpet.spec @@ -1,39 +1,19 @@ %global gem_name redcarpet -%global rubyabi 1.9.1 -%global gem_extinstdir %{gem_extdir}/lib - -%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) @@ -117,6 +97,9 @@ popd %changelog +* Mon May 21 2012 Matt Hicks - 2.1.1-4 +- Removing conditionals + * Mon May 21 2012 Matt Hicks - 2.1.1-3 - Adding newer rdoc build requires to fix rpmdiff issue