[rubygem-passenger/el6] bz#999384

[wakko666]

commit ceb462d0f6c5f198b92102949fe517c459f0083e
Author: Brett Lentz <blentz at redhat.com>
Date:   Thu Nov 7 15:38:14 2013 -0500

    bz#999384

 rubygem-passenger.spec |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/rubygem-passenger.spec b/rubygem-passenger.spec
index 2fbd22d..ee8eaa3 100644
--- a/rubygem-passenger.spec
+++ b/rubygem-passenger.spec
@@ -1,11 +1,13 @@
 %global gem_name passenger
 # From rubygem-devel rpm macros, not present in EL6
-%{!?gem_dir:%global gem_dir %{_datadir}/rubygems}
+%if 0%{?rhel} < 7 || 0%{?fedora} < 16
+%{!?gem_dir:%global gem_dir %{_prefix}/lib/ruby/gems/1.8}
 %{!?gem_instdir:%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}}
 %{!?gem_cache:%global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem}
 %{!?gem_spec:%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec}
 %{!?gem_docdir:%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}}
 %{!?gem_extdir:%global gem_extdir %{_libdir}/gems/exts/%{gem_name}-%{version}}
+%endif
 
 %if 0%{?fedora} >= 19
 %global gem_extdir %{gem_extdir_mri}
@@ -14,7 +16,7 @@
 Summary: Passenger Ruby web application server
 Name: rubygem-%{gem_name}
 Version: 3.0.21
-Release: 5%{?dist}
+Release: 11%{?dist}
 Group: System Environment/Daemons
 # Passenger code uses MIT license.
 # Bundled(Boost) uses Boost Software License
@@ -70,7 +72,7 @@ Patch106:       rubygem-passenger-3.0.21-CVE-2013-4136-tmp-directory.patch
 
 Requires: rubygems
 # XXX: Needed to run passenger standalone
-# Requires: rubygem(daemon_controller) >= 1.0.0
+Requires: rubygem(daemon_controller) >= 1.0.0
 Requires: rubygem(rack)
 Requires: rubygem(rake)
 %if 0%{?fedora} >= 19
@@ -113,6 +115,7 @@ BuildRequires: source-highlight
 BuildRequires: zlib-devel
 
 Provides: rubygem(%{gem_name}) = %{version}-%{release}
+Provides: %{name}%{?_isa} = %{version}-%{release}
 Provides: bundled(boost) =  1.44
 
 %description
@@ -158,6 +161,7 @@ This package contains documentation files for Phusion Passenger™.
 %package native
 Summary: Phusion Passenger native extensions
 Group: System Environment/Daemons
+Provides: %{name}-native%{?_isa} = %{version}-%{release}
 Requires: rubygem(%{gem_name}) = %{version}-%{release}
 Requires: %{name}-native-libs%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -169,6 +173,7 @@ Phusion Passenger™ bindings.
 %package native-libs
 Summary: Phusion Passenger native extensions
 Group: System Environment/Daemons
+Provides: %{name}-native-libs%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: ruby
 License: Boost and BSD and BSD with advertising and MIT and zlib
@@ -243,7 +248,7 @@ export USE_VENDORED_LIBEV=false
 gem install -V \
             --local \
             --install-dir %{buildroot}%{gem_dir} \
-            --bindir %{buildroot}%{gem_instdir}/bin \
+            --bindir %{buildroot}%{_bindir} \
             --force \
             --rdoc \
             pkg/%{gem_name}-%{version}.gem
@@ -301,6 +306,8 @@ find %{buildroot}%{gem_instdir} -type f -size 0c -delete
 # Don't install the installation scripts and Rakefile. That's why we have packaging.
 %{__rm} %{buildroot}%{gem_instdir}/bin/%{gem_name}-install-apache2-module
 %{__rm} %{buildroot}%{gem_instdir}/bin/%{gem_name}-install-nginx-module
+%{__rm} %{buildroot}%{_bindir}/%{gem_name}-install-apache2-module
+%{__rm} %{buildroot}%{_bindir}/%{gem_name}-install-nginx-module
 %{__rm} %{buildroot}%{gem_instdir}/Rakefile
 
 %check
@@ -329,12 +336,14 @@ rake test --trace ||:
 %{gem_cache}
 %{gem_spec}
 %dir %{gem_instdir}
-%{gem_instdir}/bin
 %{gem_instdir}/helper-scripts
 %{gem_instdir}/lib
+%{gem_instdir}/bin
 %{gem_instdir}/resources
 %{_mandir}/man1/%{gem_name}-*
 %{_mandir}/man8/%{gem_name}-*
+%{_bindir}/%{gem_name}
+%{_bindir}/%{gem_name}-*
 %if 0%{?fedora} > 15
 %{_prefix}/lib/tmpfiles.d/%{name}.conf
 %dir /run/rubygem-passenger
@@ -375,9 +384,12 @@ rake test --trace ||:
 %{gem_extdir}/lib
 
 %changelog
-* Thu Aug 22 2013 Brett Lentz <blentz at redhat.com> - 3.0.21-5
+* Fri Oct 11 2013 Brett Lentz <blentz at redhat.com> - 3.0.21-11
 - bz#999384
 
+* Tue Jul 23 2013 Troy Dawson <tdawson at redhat.com> - 3.0.21-5
+- Release bump for OSO
+
 * Thu Jul 18 2013 Troy Dawson <tdawson at redhat.com> - 3.0.21-4
 - Fix for CVE-2013-4136 (#985634)