From 4038fc43b10b2d24fb329fda4d3782bad935a3f8 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Oct 12 2015 15:55:24 +0000 Subject: Update to Bundler 1.10.6. Keep vendored libraries. --- diff --git a/.gitignore b/.gitignore index 717ba6a..ff6c630 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /bundler-1.7.4.gem /bundler-1.7.6.gem /bundler-1.7.8.gem +/bundler-1.10.6-specs.tgz +/bundler-1.10.6.gem diff --git a/rubygem-bundler.spec b/rubygem-bundler.spec index d91963e..98db2af 100644 --- a/rubygem-bundler.spec +++ b/rubygem-bundler.spec @@ -2,59 +2,49 @@ %{!?enable_test: %global enable_test 0} -# Macro for symlinking system RubyGems as a replacement for removed vendored libs -%global symlink_vendored_libs \ -for dependency in \\\ - net-http-persistent \\\ - thor \ -do \ - for fileordir in \\\ - %{gem_dir}/gems/$dependency-*/lib/* \ - do \ - ln -s -f $fileordir -t %{gem_libdir}/bundler/vendor/ \ - done \ -done - Summary: Library and utilities to manage a Ruby application's gem dependencies Name: rubygem-%{gem_name} -Version: 1.7.8 -Release: 3%{?dist} +Version: 1.10.6 +Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://gembundler.com Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem +# git clone https://github.com/bundler/bundler.git && cd bundler +# git checkout v1.10.6 && tar czvf bundler-1.10.6-specs.tgz spec/ +Source1: %{gem_name}-%{version}-specs.tgz Requires: ruby(release) Requires: ruby(rubygems) -# These dependencies are originally vendored, not specified in gemspec -# and therefore not auto-generated -Requires: rubygem(thor) -Requires: rubygem(net-http-persistent) BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby %if 0%{enable_test} > 0 BuildRequires: ruby-devel BuildRequires: rubygem(rspec) >= 3.0 -BuildRequires: rubygem(thor) -BuildRequires: rubygem(net-http-persistent) -#BuildRequires: rubygem(psych) -#BuildRequires: git snv sudo -BuildRequires: git sudo +BuildRequires: git %endif +# https://github.com/bundler/bundler/issues/3647 +Provides: bundled(rubygem(molinillo)) = 0.2.3 +Provides: bundled(rubygem-molinillo) = 0.2.3 +Provides: bundled(rubygem(net-http-persisntent)) = 2.9.3 +Provides: bundled(rubygem-net-http-persisntent) = 2.9.3 +Provides: bundled(rubygem(thor)) = 0.19.1 +Provides: bundled(rubygem-thor) = 0.19.1 BuildArch: noarch %description Bundler manages an application's dependencies through its entire life, across -many machines, systematically and repeatably +many machines, systematically and repeatably. + %package doc Summary: Documentation for %{name} Group: Documentation -Requires:%{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description doc -Documentation for %{name} - +Documentation for %{name}. %prep %setup -q -c -T @@ -63,10 +53,6 @@ Documentation for %{name} %build %install -# Remove bundled libraries -rm -rf .%{gem_libdir}/bundler/vendor -mkdir .%{gem_libdir}/bundler/vendor - mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ @@ -75,7 +61,7 @@ mkdir -p %{buildroot}/%{_bindir} cp -a .%{_bindir}/* \ %{buildroot}%{_bindir}/ -find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod 755 +find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x find %{buildroot}%{gem_instdir}/lib/bundler/templates/newgem/bin -type f | xargs chmod 755 chmod 755 %{buildroot}%{gem_instdir}/lib/bundler/templates/Executable* @@ -91,11 +77,12 @@ done # Test suite has to be disabled for official build, since it downloads various # gems, which are not in Fedora or they have different version etc. # Nevertheless, the test suite should run for local builds. -# TODO: investigate failures %if 0%{enable_test} > 0 %check pushd .%{gem_instdir} +tar xzvf %{SOURCE1} + # This test does not work, since ruby is configured with --with-ruby-version='' # https://github.com/bundler/bundler/issues/2365 sed -i '/"fetches gems again after changing the version of Ruby"/,/end$/{s/^/#/}' spec/install/gems/platform_spec.rb @@ -104,65 +91,43 @@ sed -i '/"fetches gems again after changing the version of Ruby"/,/end$/{s/^/#/} # https://github.com/carlhuda/bundler/issues/2022 git init -# Test with system net-http-persistent and thor. -for dependency in \ - net-http-persistent \ - thor -do - for fileordir in \ - %{gem_dir}/gems/$dependency-*/lib/* - do - ln -s -f $fileordir lib/bundler/vendor/$(basename "$fileordir") - done -done - rspec spec %endif -%post -# Create symlinks to system RubyGems as a replacement for vendored libs -# See rhbz#1163039 -%symlink_vendored_libs - -%triggerpostun -- rubygem-thor, rubygem-net-http-persistent -# We need to recreate the symlinks after the old package of vendored lib -# has been removed, not before -%symlink_vendored_libs - %files %dir %{gem_instdir} +%{_bindir}/bundle +%{_bindir}/bundler %exclude %{gem_instdir}/.* -%exclude %{gem_instdir}/man -%{gem_libdir} -%ghost %attr(644, root, root) %{gem_libdir}/bundler/vendor/net -%ghost %attr(644, root, root) %{gem_libdir}/bundler/vendor/thor -%ghost %attr(644, root, root) %{gem_libdir}/bundler/vendor/thor.rb %exclude %{gem_libdir}/bundler/ssl_certs/.document %exclude %{gem_libdir}/bundler/ssl_certs/*.pem -%doc %{gem_instdir}/LICENSE.md -%{gem_instdir}/.travis.yml -%{_bindir}/bundle -%{_bindir}/bundler +%license %{gem_instdir}/LICENSE.md %{gem_instdir}/bin +%{gem_libdir} +%exclude %{gem_instdir}/man %exclude %{gem_cache} %{gem_spec} %doc %{_mandir}/man1/* %doc %{_mandir}/man5/* %files doc +%doc %{gem_docdir} %doc %{gem_instdir}/CHANGELOG.md +%doc %{gem_instdir}/CODE_OF_CONDUCT.md %doc %{gem_instdir}/ISSUES.md %doc %{gem_instdir}/README.md -%doc %{gem_instdir}/UPGRADING.md %doc %{gem_instdir}/CONTRIBUTING.md %doc %{gem_instdir}/DEVELOPMENT.md %{gem_instdir}/Rakefile -%{gem_instdir}/spec %{gem_instdir}/%{gem_name}.gemspec -%doc %{gem_docdir} + %changelog +* Mon Oct 12 2015 Vít Ondruch - 1.10.6-1 +- Update to Bundler 1.10.6. +- Keep vendored libraries. + * Thu Jun 18 2015 Fedora Release Engineering - 1.7.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 0478244..0a348e6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -29652aed2651642af622d7da7607fe9a bundler-1.7.8.gem +74cee91c77402d8938e32ee0866c7700 bundler-1.10.6-specs.tgz +e637c15440d29a7fad933d0de5be351a bundler-1.10.6.gem