[rubygem-thin/f14/master] Version bump
Michal Fojtik
mfojtik at fedoraproject.org
Tue Mar 1 16:10:28 UTC 2011
commit 718f9dcdd604892dc46badb04200122c0ec22c91
Author: Michal Fojtik <mfojtik at redhat.com>
Date: Tue Mar 1 17:10:10 2011 +0100
Version bump
.gitignore | 1 +
rubygem-thin.spec | 83 ++++++++++++++++++++++++++++++++++++++--------------
sources | 1 +
3 files changed, 62 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0ac52b..1c5d325 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
thin-1.2.5.gem
+/thin-1.2.8.gem
diff --git a/rubygem-thin.spec b/rubygem-thin.spec
index af635cb..e06ab4b 100644
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@ -7,8 +7,8 @@
Summary: A thin and fast web server
Name: rubygem-%{gemname}
-Version: 1.2.7
-Release: 1%{?dist}
+Version: 1.2.8
+Release: 3%{?dist}
Group: Development/Languages
License: (GPLv2 or Ruby) and BSD and MIT
URL: http://code.macournoyer.com/thin/
@@ -19,10 +19,12 @@ Requires: rubygems
Requires: rubygem(rack) >= 1.0.0
Requires: rubygem(eventmachine) >= 0.12.6
Requires: rubygem(daemons) >= 1.0.9
+Requires: curl
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: ruby-devel
BuildRequires: ruby(rubygems)
-BuildRequires: rubygem(rake)
+BuildRequires: curl
+BuildRequires: libcurl-devel
BuildRequires: rubygem(rake-compiler)
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(eventmachine) >= 0.12.6
@@ -37,6 +39,14 @@ The Mongrel parser, the root of Mongrel speed and security,
Event Machine, a network I/O library with extremely high scalability and
Rack, a minimal interface between webservers and Ruby frameworks.
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires:%{name} = %{version}-%{release}
+
+%description doc
+Documentation for %{name}
+
%prep
%setup -q -c -T
mkdir -p ./%{gemdir}
@@ -62,7 +72,7 @@ for f in $(find %{buildroot}%{geminstdir} -name \*.rb); do
chmod 0644 $f
done
find %{buildroot}%{geminstdir} -type f -exec sed -i 's/^#!\/usr\/local\/bin\/ruby/#!\/usr\/bin\/ruby/g' {} \;
-rm -f %{buildroot}/spec/request/processing_spec.rb
+chmod +x %{buildroot}%{geminstdir}/lib/thin/controllers/service.sh.erb
rm -rf %{buildroot}%{geminstdir}/{ext,tmp}/
rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths}
@@ -72,7 +82,19 @@ rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths}
exit 0
%endif
pushd ./%{geminstdir}
-rake spec2 --trace
+SPECS=
+RUBYOPT="rubygems I%{buildroot}%{geminstdir}/lib Ispec Ibenchmark_unit" spec -b `echo "
+PERF_SPECS = Dir['spec/perf/*_spec.rb'] + [ 'spec/server/pipelining_spec.rb' ]
+WIN_SPECS = %w(
+spec/backends/unix_server_spec.rb
+spec/controllers/service_spec.rb
+spec/daemonizing_spec.rb
+spec/server/unix_socket_spec.rb
+spec/server/swiftiply_spec.rb
+)
+SPECS2 = %w(spec/server/threaded_spec.rb spec/server/tcp_spec.rb)
+puts Dir['spec/**/*_spec.rb'] - PERF_SPECS - WIN_SPECS - SPECS2
+" | ruby`
popd
%clean
@@ -93,26 +115,29 @@ rm -rf %{buildroot}
%{geminstdir}/lib/thin/controllers/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%doc %{geminstdir}/benchmark/
-%doc %{geminstdir}/tasks/
-%doc %{geminstdir}/example/
-%doc %{geminstdir}/CHANGELOG
-%doc %{geminstdir}/README
-%doc %{geminstdir}/Rakefile
+
+%files doc
+%defattr(-, root, root, -)
+%{gemdir}/doc/%{gemname}-%{version}
+%{geminstdir}/benchmark/
+%{geminstdir}/tasks/
+%{geminstdir}/example/
+%{geminstdir}/CHANGELOG
+%{geminstdir}/README
+%{geminstdir}/Rakefile
%dir %{geminstdir}/spec/
-%doc %{geminstdir}/spec/backends/
-%doc %{geminstdir}/spec/*.rb
-%doc %{geminstdir}/spec/configs/
-%doc %{geminstdir}/spec/controllers/
-%doc %{geminstdir}/spec/perf/
-%doc %{geminstdir}/spec/rack/
-%doc %{geminstdir}/spec/request/
-%doc %{geminstdir}/spec/server/
+%{geminstdir}/spec/backends/
+%{geminstdir}/spec/*.rb
+%{geminstdir}/spec/configs/
+%{geminstdir}/spec/controllers/
+%{geminstdir}/spec/perf/
+%{geminstdir}/spec/rack/
+%{geminstdir}/spec/request/
+%{geminstdir}/spec/server/
%dir %{geminstdir}/spec/rails_app/
-%doc %{geminstdir}/spec/rails_app/app/
-%doc %{geminstdir}/spec/rails_app/config/
-%doc %{geminstdir}/spec/rails_app/script/
-%doc %{gemdir}/doc/%{gemname}-%{version}
+%{geminstdir}/spec/rails_app/app/
+%{geminstdir}/spec/rails_app/config/
+%{geminstdir}/spec/rails_app/script/
# MIT
%doc %{geminstdir}/COPYING
%{geminstdir}/spec/rails_app/public/
@@ -120,6 +145,18 @@ rm -rf %{buildroot}
%{geminstdir}/lib/thin/stats.html.erb
%changelog
+* Tue Mar 01 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.8-3
+- Removed Rake dependency completely
+
+* Tue Mar 01 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.8-2
+- Fixed RSpec tests
+
+* Tue Mar 01 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.8-1
+- Updated to upstream version
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Wed Sep 08 2010 Michal Fojtik <mfojtik at redhat.com> - 1.2.7-1
- Updated to upstream version
diff --git a/sources b/sources
index fad3fb4..094eb16 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
f3bf0b123fd0737794d55f0e14eb28e1 thin-1.2.5.gem
5de19ab45c22a5b5da2c9452a33c0f26 thin-1.2.7.gem
+ae94bb34097edc0c42e3c8d4b569f32a thin-1.2.8.gem
More information about the scm-commits
mailing list