[rubygem-shotgun/f21] - Fix FTBFS in Rawhide (rhbz#1107240). - Add man pages.

Vít Ondruch vondruch at fedoraproject.org
Tue Jul 15 07:35:36 UTC 2014


commit 55099b54c105012febcb727050f90e3415542970
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Jul 15 09:35:04 2014 +0200

    - Fix FTBFS in Rawhide (rhbz#1107240).
    - Add man pages.

 rubygem-shotgun.spec |   45 +++++++++++++++++++++++++++++----------------
 1 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/rubygem-shotgun.spec b/rubygem-shotgun.spec
index fe9bf07..75d80f0 100644
--- a/rubygem-shotgun.spec
+++ b/rubygem-shotgun.spec
@@ -3,19 +3,15 @@
 Summary:        Automatic reloading version of the rackup command
 Name:           rubygem-%{gem_name}
 Version:        0.9
-Release:        7%{?dist}
+Release:        8%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://github.com/rtomayko/shotgun/
-Source0:        http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ruby(release)
-Requires:       ruby(rubygems)
+Source0:        https://rubygems.org/gems/%{gem_name}-%{version}.gem
 BuildRequires:  rubygems-devel
 BuildRequires:  rubygem(minitest)
 BuildRequires:  rubygem(rack)
 BuildArch:      noarch
-Provides:       rubygem(%{gem_name}) = %{version}
 
 %description
 This is an automatic reloading version of the rackup command that's shipped
@@ -58,36 +54,53 @@ cp -a ./%{_bindir}/* %{buildroot}%{_bindir}
 find %{buildroot}%{_bindir} -type f |xargs chmod a+x
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{_mandir}/man1
+cp -a %{buildroot}%{gem_instdir}/man/shotgun.1 %{buildroot}%{_mandir}/man1
+
 
 %check
-pushd %{buildroot}%{gem_instdir}
-testrb -Ilib test
+pushd .%{gem_instdir}
+# Run the tests using minitest 5.
+ruby -Ilib -rminitest/autorun - << \EOF
+  module Kernel
+    alias orig_require require
+    remove_method :require
+
+    def require path
+      orig_require path unless path == 'test/unit'
+    end
+  end
+
+  Test = Minitest
+
+  Dir.glob "./test/**/test_*.rb", &method(:require)
+EOF
 popd
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/shotgun
 %dir %{gem_instdir}
-%doc %{gem_instdir}/man
+%exclude %{gem_instdir}/man
 %{gem_instdir}/bin
 %{gem_libdir}
 %{gem_instdir}/shotgun.gemspec
 %doc %{gem_instdir}/README
 %doc %{gem_instdir}/COPYING
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
+%doc %{_mandir}/man1/*
 
 %files doc
-%defattr(-,root,root,-)
 %{gem_instdir}/test
-%{gem_instdir}/man
 %{gem_instdir}/Rakefile
-%{gem_docdir}
+%doc %{gem_docdir}
 
 
 %changelog
+* Tue Jul 15 2014 Vít Ondruch <vondruch at redhat.com> - 0.9-8
+- Fix FTBFS in Rawhide (rhbz#1107240).
+- Add man pages.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list