[rubygem-htmlentities] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0

Vít Ondruch vondruch at fedoraproject.org
Tue Mar 5 11:47:16 UTC 2013


commit 74993f222a187da2395b809a97c4d87b801c3e5b
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Mar 5 12:29:50 2013 +0100

    Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0

 rubygem-htmlentities.spec |   89 ++++-----------------------------------------
 1 files changed, 7 insertions(+), 82 deletions(-)
---
diff --git a/rubygem-htmlentities.spec b/rubygem-htmlentities.spec
index 4acc657..59ce6d5 100644
--- a/rubygem-htmlentities.spec
+++ b/rubygem-htmlentities.spec
@@ -1,11 +1,4 @@
 # Generated from htmlentities-4.0.0.gem by gem2rpm -*- rpm-spec -*-
-%if 0%{?fedora} >= 17
-%global	rubyabi		1.9.1
-%else
-%global	rubyabi		1.8
-%global	ruby_sitelib            %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%endif
-
 %global	gem_name		htmlentities
 
 # Some functions removed on 4.2.4. Please don't upgrade this rpm
@@ -14,23 +7,19 @@
 Summary:	A module for encoding and decoding (X)HTML entities
 Name:		rubygem-%{gem_name}
 Version:	4.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://htmlentities.rubyforge.org/
 Source0:	http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
-BuildRequires:	ruby(abi) = %{rubyabi}
+BuildRequires:	ruby(release)
 BuildRequires:	rubygems-devel
 BuildRequires:	rubygem(test-unit)
-Requires:	ruby(abi) = %{rubyabi}
+Requires:	ruby(release)
 Requires:	ruby(rubygems)
 BuildArch:	noarch
 Provides:	rubygem(%{gem_name}) = %{version}-%{release}
-%if 0%{?fedora} >= 17
-Obsoletes:	ruby-%{gem_name} <= %{version}-%{release}
-Provides:	ruby-%{gem_name} = %{version}-%{release}
-%endif
 
 %description
 HTMLEntities is a simple library to facilitate encoding and 
@@ -60,14 +49,7 @@ This package provides non-Gem support for %{gem_name}.
 # First install rubygems under %%_builddir to execute some
 # tests
 %setup -q -c -T
-
-mkdir -p ./%{gem_instdir}
-gem install \
-	-V \
-	--local --install-dir ./%{gem_dir} \
-	--force \
-	--rdoc \
-	%{SOURCE0}
+%gem_install -n %{SOURCE0}
 
 %build
 
@@ -79,60 +61,6 @@ cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
 # Cleanups
 rm -f %{buildroot}%{gem_instdir}/setup.rb
 
-# Create symlinks for ruby-%%{gem_name}
-# Copied from rubygem-gettext.spec
-
-create_symlink_rec(){
-
-ORIGBASEDIR=$1
-TARGETBASEDIR=$2
-
-## First calculate relative path of ORIGBASEDIR 
-## from TARGETBASEDIR
-TMPDIR=$TARGETBASEDIR
-BACKDIR=
-DOWNDIR=
-num=0
-nnum=0
-while true
-do
-	num=$((num+1))
-	TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||')
-	DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||")
-	if [ x$DOWNDIR != x$ORIGBASEDIR ]
-	then
-		nnum=0
-		while [ $nnum -lt $num ]
-		do
-			BACKDIR="../$BACKDIR"
-			nnum=$((nnum+1))
-		done
-		break
-	fi
-done
-
-RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' )
-
-## Next actually create symlink
-pushd %{buildroot}/$ORIGBASEDIR
-find . -type f | while read f
-do
-	DIRNAME=$(dirname $f)
-	BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g')
-	%{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME
-	LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
-		%{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \
-		%{__sed} -e 's|/\./|/|' )
-	%{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
-done
-popd
-
-}
-
-%if 0%{?fedora} < 17
-create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
-%endif
-
 %check
 pushd ./%{gem_instdir}/
 for f in test/*.rb
@@ -148,12 +76,6 @@ done
 %{gem_cache}
 %{gem_spec}
 
-%if %{?fedora} < 17
-%files	-n ruby-%{gem_name}
-%{ruby_sitelib}/%{gem_name}.rb
-%{ruby_sitelib}/%{gem_name}/
-%endif
-
 %files	doc
 %{gem_instdir}/perf/
 %{gem_instdir}/test/
@@ -161,6 +83,9 @@ done
 
 
 %changelog
+* Tue Mar 05 2013 Vít Ondruch <vondruch at redhat.com> - 4.3.1-6
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list