[rubygem-thin/f14] Patched thin_parser.so loading
Michal Fojtik
mfojtik at fedoraproject.org
Thu Jul 14 15:42:40 UTC 2011
commit 413f4caec9e5b805b80b429b58e3b8a88da9743b
Author: Michal Fojtik <mi at mifo.sk>
Date: Thu Jul 14 17:42:05 2011 +0200
Patched thin_parser.so loading
.gitignore | 1 +
rubygem-thin.spec | 22 +++++++++++++++++++---
sources | 1 +
3 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b796223..d159484 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
thin-1.2.5.gem
/thin-1.2.8.gem
/thin-1.2.11.gem
+/fix_thin_parser_loading.patch
diff --git a/rubygem-thin.spec b/rubygem-thin.spec
index fd3c9b1..e6011c5 100644
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@ -8,11 +8,12 @@
Summary: A thin and fast web server
Name: rubygem-%{gemname}
Version: 1.2.11
-Release: 1%{?dist}
+Release: 3%{?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: fix_thin_parser_loading.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(abi) = %{rubyabi}
Requires: rubygems
@@ -31,6 +32,7 @@ BuildRequires: rubygem(rspec-core)
BuildRequires: rubygem(eventmachine) >= 0.12.6
BuildRequires: rubygem(daemons) >= 1.0.9
BuildRequires: rubygem(rack) >= 1.0.0
+Prereq: /sbin/ldconfig
Provides: rubygem(%{gemname}) = %{version}
%description
@@ -57,6 +59,10 @@ gem install \
--install-dir ./%{gemdir} \
-V --force \
%{SOURCE0}
+pushd ./%{gemdir}/gems
+ls -lah
+%patch0
+popd
%build
@@ -66,7 +72,7 @@ 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
@@ -101,6 +107,10 @@ popd
%clean
rm -rf %{buildroot}
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
%files
%defattr(-, root, root, -)
%{_bindir}/%{gemname}
@@ -146,7 +156,13 @@ rm -rf %{buildroot}
%{geminstdir}/lib/thin/stats.html.erb
%changelog
-* Tue Mar 01 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.11-1
+* 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
diff --git a/sources b/sources
index f3c8b2b..642876e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
9040330417adda974c07006762b537f2 thin-1.2.11.gem
+b776b16cacf1c510a2d10999bf07d736 fix_thin_parser_loading.patch
More information about the scm-commits
mailing list