[rubygem-thin/f15] Version bump

Michal Fojtik mfojtik at fedoraproject.org
Fri Jul 29 09:43:13 UTC 2011 

commit fd4f3822a14fb8fbc0f6204f663aaa5a82a2c0f1
Author: Michal Fojtik <mi at mifo.sk>
Date:   Fri Jul 29 11:42:55 2011 +0200

    Version bump

 .gitignore        |    2 +
 rubygem-thin.spec |  115 ++++++++++++++++++++++++++++++++++++++++++-----------
 sources           |    4 +-
 3 files changed, 95 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cadd9b1..60af062 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 thin-1.2.5.gem
 /thin-1.2.7.gem
+/native-load-path-1.2.11.patch
+/thin-1.2.11.gem
diff --git a/rubygem-thin.spec b/rubygem-thin.spec
index 9bd1530..99ee8bf 100644
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@ -7,24 +7,28 @@
 
 Summary: A thin and fast web server
 Name: rubygem-%{gemname}
-Version: 1.2.7
-Release: 2%{?dist}
+Version: 1.2.11
+Release: 8%{?dist}
 Group: Development/Languages
 License: (GPLv2 or Ruby) and BSD and MIT
 URL: http://code.macournoyer.com/thin/
 Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0: native-load-path-1.2.11.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ruby(abi) = %{rubyabi} 
 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(rspec-core)
 BuildRequires: rubygem(eventmachine) >= 0.12.6
 BuildRequires: rubygem(daemons) >= 1.0.9
 BuildRequires: rubygem(rack) >= 1.0.0
@@ -37,6 +41,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}
@@ -46,6 +58,9 @@ gem install \
 	--install-dir ./%{gemdir} \
 	-V --force \
 	%{SOURCE0}
+pushd ./%{geminstdir}/lib
+%patch0
+popd
 
 %build
 
@@ -55,14 +70,14 @@ mkdir -p %{buildroot}%{ruby_sitearch}/%{gemname}
 mkdir -p %{buildroot}%{gemdir}
 mkdir -p %{buildroot}%{_prefix} 
 cp -a ./%{gemdir}/* %{buildroot}%{gemdir}
-mv -f %{buildroot}%{geminstdir}/lib/*.so %{buildroot}%{ruby_sitearch}/
+mv %{buildroot}%{geminstdir}/lib/*.so %{buildroot}%{ruby_sitearch}/
 mv -f %{buildroot}%{gemdir}/bin %{buildroot}%{_prefix} 
 for f in $(find %{buildroot}%{geminstdir} -name \*.rb); do
   sed -i -e '/^#!/d' $f 
   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,12 +87,28 @@ 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
 rm -rf %{buildroot}
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-, root, root, -)
 %{_bindir}/%{gemname} 
@@ -93,26 +124,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 +154,39 @@ rm -rf %{buildroot}
 %{geminstdir}/lib/thin/stats.html.erb
 
 %changelog
+* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-7
+- Updated to patch for version 1.2.11
+
+* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-7
+- Fixed typo in prep section
+
+* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-6
+- Copied native extension loading patch from EL6 (thanks to David Lutterkort)
+
+* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-5
+- Fixed patch format
+
+* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-4
+- Removed deprecated Prereq
+
+* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-3
+- Added ldconfig to refresh cache after update
+
+* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-2
+- Added patch to fix loading of thin_parser.so
+
+* Thu Jul 14 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-1
+- Version bump
+
+* 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
 
diff --git a/sources b/sources
index fad3fb4..b560e03 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f3bf0b123fd0737794d55f0e14eb28e1  thin-1.2.5.gem
-5de19ab45c22a5b5da2c9452a33c0f26  thin-1.2.7.gem
+ef41f462c1833c80c6da898248554ce5  native-load-path-1.2.11.patch
+9040330417adda974c07006762b537f2  thin-1.2.11.gem

More information about the scm-commits mailing list