From cc25e28bbc064aaf9089f96e446bb15755d88fb3 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Feb 03 2012 10:15:38 +0000 Subject: Rebuilt for Ruby 1.9.3. --- diff --git a/rubygem-newgem.spec b/rubygem-newgem.spec index 04bd970..505929a 100644 --- a/rubygem-newgem.spec +++ b/rubygem-newgem.spec @@ -1,17 +1,15 @@ -%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%global gemname newgem -%global geminstdir %{gemdir}/gems/%{gemname}-%{version} +%global gem_name newgem -%global rubyabi 1.8 +%global rubyabi 1.9.1 Summary: Bundle Ruby libraries into a RubyGem -Name: rubygem-%{gemname} +Name: rubygem-%{gem_name} Version: 1.5.3 -Release: 6%{?dist} +Release: 7%{?dist} Group: Development/Languages License: MIT or LGPLv2+ URL: http://newgem.rubyforge.org -Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem +Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem # Upstream wants a specific version of activesupport that's only required by # rubigen. Unclear why this is being done. # Filed at http://github.com/drnic/newgem/issues/issue/8 @@ -24,16 +22,17 @@ Requires: rubygem(hoe) Requires: rubygem(RedCloth) Requires: rubygem(syntax) Requires: rubygem(cucumber) -BuildRequires: ruby(rubygems) +BuildRequires: rubygems-devel +BuildRequires: ruby-devel BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: rubygem(rubigen) -BuildRequires: rubygem(hoe), +BuildRequires: rubygem(hoe) BuildRequires: rubygem(RedCloth) BuildRequires: rubygem(syntax) BuildRequires: rubygem(cucumber) -BuildRequires: rubygem(rake) +BuildRequires: rubygem(minitest) BuildArch: noarch -Provides: rubygem(%{gemname}) = %{version} +Provides: rubygem(%{gem_name}) = %{version} %description Within this gem, you get one thing - newgem - an executable to create your own @@ -46,54 +45,55 @@ one by default). %prep %setup -q -c -T -mkdir -p .%{gemdir} +mkdir -p .%{gem_dir} gem install -V \ --local \ - --install-dir $(pwd)/%{gemdir} \ + --install-dir $(pwd)/%{gem_dir} \ --force --rdoc \ %{SOURCE0} -pushd .%{gemdir} +pushd .%{gem_dir} %patch0 -p0 -test -f specifications/%{gemname}-%{version}.gemspec.orig && \ - rm specifications/%{gemname}-%{version}.gemspec.orig +test -f specifications/%{gem_name}-%{version}.gemspec.orig && \ + rm specifications/%{gem_name}-%{version}.gemspec.orig %build %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{gemdir} -cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ +mkdir -p %{buildroot}%{gem_dir} +cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ mkdir -p %{buildroot}/%{_bindir} -mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} -rmdir %{buildroot}%{gemdir}/bin -find %{buildroot}%{geminstdir}/bin -type f |xargs chmod a+x +mv %{buildroot}%{gem_dir}/bin/* %{buildroot}/%{_bindir} +rmdir %{buildroot}%{gem_dir}/bin +find %{buildroot}%{gem_instdir}/bin -type f |xargs chmod a+x # Kill crlf -sed -s 's/\r//g' -i %{buildroot}%{geminstdir}/README.rdoc \ - %{buildroot}%{geminstdir}/website/version.js \ - %{buildroot}%{geminstdir}/website/version-raw.txt \ - %{buildroot}%{geminstdir}/test/test_helper.rb +sed -s 's/\r//g' -i %{buildroot}%{gem_instdir}/README.rdoc \ + %{buildroot}%{gem_instdir}/website/version.js \ + %{buildroot}%{gem_instdir}/website/version-raw.txt \ + %{buildroot}%{gem_instdir}/test/test_helper.rb # Don't search environment - we leave the generators alone as someone may want # the env searching. -find %{buildroot}%{geminstdir}/{bin,script} -type f | \ +find %{buildroot}%{gem_instdir}/{bin,script} -type f | \ xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"' # Only one minor test fails, reported here # http://github.com/drnic/newgem/issues/#issue/7 # Disable the assert for now sed -i '/assert_directory_exists "tasks"/d' \ - %{buildroot}%{geminstdir}/test/test_newgem_generator.rb + %{buildroot}%{gem_instdir}/test/test_newgem_generator.rb %clean rm -rf %{buildroot} %check -pushd %{buildroot}%{geminstdir} -rake test +pushd %{buildroot}%{gem_instdir} +testrb test +popd # CAUTION: rpmlint currently generates 8 errors and 2 warnings on this package @@ -101,27 +101,30 @@ rake test %files %defattr(-,root,root,-) %{_bindir}/newgem -%dir %{geminstdir} -%{geminstdir}/*_generators -%{geminstdir}/bin -%{geminstdir}/config -%{geminstdir}/features -%{geminstdir}/lib -%{geminstdir}/script -%{geminstdir}/website -%{geminstdir}/Rakefile -%doc %{geminstdir}/TODO.markdown -%doc %{geminstdir}/test -%doc %{geminstdir}/History.txt -%doc %{geminstdir}/Manifest.txt -%doc %{geminstdir}/PostInstall.txt -%doc %{geminstdir}/README.rdoc -%doc %{gemdir}/doc/%{gemname}-%{version} -%{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec +%dir %{gem_instdir} +%{gem_instdir}/*_generators +%{gem_instdir}/bin +%{gem_instdir}/config +%{gem_instdir}/features +%{gem_libdir} +%{gem_instdir}/script +%{gem_instdir}/website +%{gem_instdir}/Rakefile +%doc %{gem_instdir}/TODO.markdown +%doc %{gem_instdir}/test +%doc %{gem_instdir}/History.txt +%doc %{gem_instdir}/Manifest.txt +%doc %{gem_instdir}/PostInstall.txt +%doc %{gem_instdir}/README.rdoc +%doc %{gem_docdir} +%{gem_cache} +%{gem_spec} %changelog +* Fri Feb 03 2012 Vít Ondruch - 1.5.3-7 +- Rebuilt for Ruby 1.9.3. + * Sat Jan 14 2012 Fedora Release Engineering - 1.5.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild