diff --git a/.gitignore b/.gitignore index 466c2ee..741d89f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ -/htmlentities-*.gem -/htmlentities-*-tests.tar.gz +htmlentities-4.2.0.gem +/htmlentities-4.2.2.gem +/htmlentities-4.2.3.gem +/htmlentities-4.2.4.gem +/htmlentities-4.3.0.gem +/htmlentities-4.3.1.gem diff --git a/htmlentities-create-missing-files.sh b/htmlentities-create-missing-files.sh deleted file mode 100644 index 7433411..0000000 --- a/htmlentities-create-missing-files.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -if [ $# -lt 1 ] -then - echo "$0 " - exit 1 -fi - -set -x -set -e - -VERSION=$1 - -REPOURL=https://github.com/threedaymonk/ -REPONAME=htmlentities - -TARBALLNAME=${REPONAME}-${VERSION}-tests.tar.gz - -CURRDIR=$(pwd) -TMPDIRPATH=$(mktemp -d /var/tmp/${REPONAME}-tar-XXXXXX) -pushd $TMPDIRPATH - -git clone ${REPOURL}/${REPONAME}.git -ln -sf ${REPONAME} ${REPONAME}-${VERSION} -cd ${REPONAME} - -git checkout -b fedora-${VERSION} v${VERSION} -cd .. -tar czf $TARBALLNAME ${REPONAME}-${VERSION}/spec -mv $TARBALLNAME $CURRDIR - -popd -rm -rf $TMPDIRPATH - - diff --git a/rubygem-htmlentities.spec b/rubygem-htmlentities.spec index 65701a8..fa3d605 100644 --- a/rubygem-htmlentities.spec +++ b/rubygem-htmlentities.spec @@ -1,186 +1,148 @@ # Generated from htmlentities-4.0.0.gem by gem2rpm -*- rpm-spec -*- -%global gem_name htmlentities -%global test_version 4.4.1 +%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") + +%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%global gemname htmlentities +%global geminstdir %{gemdir}/gems/%{gemname}-%{version} + +%global rubyabi 1.8 # Some functions removed on 4.2.4. Please don't upgrade this rpm # to 4.3.0+ on F-14- Summary: A module for encoding and decoding (X)HTML entities -Name: rubygem-%{gem_name} -Version: 4.4.2 +Name: rubygem-%{gemname} +Version: 4.3.1 Release: 1%{?dist} +Group: Development/Languages License: MIT -URL: https://github.com/threedaymonk/htmlentities -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: %{gem_name}-%{test_version}-tests.tar.gz -# Source1 is created by bash %%SOURCE2 %%test_version -Source2: htmlentities-create-missing-files.sh +URL: http://htmlentities.rubyforge.org/ +Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem -Requires: ruby(release) -BuildRequires: ruby(release) - -BuildRequires: rubygems-devel -BuildRequires: rubygem(rspec) +BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby(rubygems) +Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) BuildArch: noarch -Provides: rubygem(%{gem_name}) = %{version}-%{release} +Provides: rubygem(%{gemname}) = %{version}-%{release} %description HTMLEntities is a simple library to facilitate encoding and decoding of named (ý and so on) or numerical ({ or Ī) entities in HTML and XHTML documents. -%package doc -Summary: Documentation for %{name} -# Directory ownership issue +%package -n ruby-%{gemname} +Summary: Non-Gem support for %{gemname} +Group: Development/Languages Requires: %{name} = %{version}-%{release} -Requires: ruby(rubygems) +Provides: ruby(%{gemname}) = %{version}-%{release} -%description doc -This package contains documentation for %{name}. - -%package -n ruby-%{gem_name} -Summary: Non-Gem support for %{gem_name} -Requires: %{name} = %{version}-%{release} -Provides: ruby(%{gem_name}) = %{version}-%{release} - -%description -n ruby-%{gem_name} -This package provides non-Gem support for %{gem_name}. +%description -n ruby-%{gemname} +This package provides non-Gem support for %{gemname}. %prep -%setup -q -n %{gem_name}-%{version} -a 1 +# First install rubygems under %%_builddir to execute some +# tests +%setup -q -c -T -mv ../%{gem_name}-%{version}.gemspec . +mkdir -p ./%{geminstdir} +gem install \ + -V \ + --local --install-dir ./%{gemdir} \ + --force \ + --rdoc \ + %{SOURCE0} %build -gem build %{gem_name}-%{version}.gemspec -%gem_install %install -mkdir -p %{buildroot}%{gem_dir} -cp -a .%{gem_dir}/* \ - %{buildroot}%{gem_dir}/ +rm -rf %{buildroot} +mkdir -p %{buildroot}%{gemdir} +cp -a ./%{gemdir}/* %{buildroot}%{gemdir}/ + +# Cleanups +rm -f %{buildroot}%{geminstdir}/setup.rb + +# Create symlinks for ruby-%%{gemname} +# 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 + +} + +create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} -rm -f %{buildroot}%{gem_cache} %check -cp -a %{gem_name}-%{test_version}/spec ./%{gem_instdir} -pushd ./%{gem_instdir}/ - -rspec spec +pushd ./%{geminstdir}/ +for f in test/*.rb +do + ruby -Ilib $f +done %files -%license %{gem_instdir}/COPYING.txt -%dir %{gem_instdir} -%doc %{gem_instdir}/History.txt +%defattr(-,root,root,-) +%doc %{gemdir}/doc/%{gemname}-%{version}/ -%{gem_libdir}/ -%{gem_spec} +%dir %{geminstdir} +%doc %{geminstdir}/[A-Z]* +%{geminstdir}/lib/ +%doc %{geminstdir}/perf/ +%doc %{geminstdir}/test/ -%files doc -%{gem_docdir}/ +%{gemdir}/cache/%{gemname}-%{version}.gem +%{gemdir}/specifications/%{gemname}-%{version}.gemspec + +%files -n ruby-%{gemname} +%defattr(-,root,root,-) +%{ruby_sitelib}/%{gemname}.rb +%{ruby_sitelib}/%{gemname}/ %changelog -* Sun Nov 23 2025 Mamoru TASAKA - 4.4.2-1 -- 4.4.2 - -* Fri Jul 25 2025 Fedora Release Engineering - 4.3.4-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 4.3.4-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 4.3.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jan 26 2024 Fedora Release Engineering - 4.3.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 4.3.4-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 4.3.4-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 4.3.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 4.3.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 4.3.4-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 4.3.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 4.3.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 4.3.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 4.3.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 4.3.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 4.3.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 4.3.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 4.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.3.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 4.3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 4.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jul 6 2015 Mamoru TASAKA - 4.3.4-1 -- 4.3.4 - -* Thu Jun 18 2015 Fedora Release Engineering - 4.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Dec 27 2014 Mamoru TASAKA - 4.3.3-1 -- 4.3.3 - -* Mon Jun 9 2014 Mamoru TASAKA - 4.3.2-2 -- Rebuild - -* Fri Jun 6 2014 Mamoru TASAKA - 4.3.2-1 -- Update to 4.3.2 - -* Sun Aug 04 2013 Fedora Release Engineering - 4.3.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Mar 7 2013 Mamoru TASAKA - 4.3.1-7 -- Clean up - -* Tue Mar 05 2013 Vít Ondruch - 4.3.1-6 -- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 - -* Thu Feb 14 2013 Fedora Release Engineering - 4.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 4.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Feb 5 2012 Mamoru Tasaka - 4.3.1-3 -- F-17: rebuild against ruby19 - -* Sat Jan 14 2012 Fedora Release Engineering - 4.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - * Sun Dec 4 2011 Mamoru Tasaka - 4.3.1-1 - 4.3.1 diff --git a/sources b/sources index e7d66c7..e5e84ce 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (htmlentities-4.4.2.gem) = c9a9a44eb5fc6a9a0c03ce560600952178901dab74d1eab57b977cf073c3388850b948688b4c78f3513125a88e2dd8f2f103efd3d0057f4bc72d74eab0d74760 -SHA512 (htmlentities-4.4.1-tests.tar.gz) = 82813d0b7284539504d4f2bc486d9404e8b164407229491239b7e5063b6af7de6b2a772303e85884ef10b1226df6238e2d0aff1b7ed5a09b1970fb093df7da41 +53a9218c02ef3671d6fc9fe843ebd360 htmlentities-4.3.1.gem