[rubygem-passenger] fully fix bz#999384
wakko666
wakko666 at fedoraproject.org
Mon Sep 23 14:24:05 UTC 2013
commit 8628ef3e4ea71395b7046c3865858eeb3ea4d892
Author: Brett Lentz <blentz at redhat.com>
Date: Fri Sep 20 15:11:10 2013 -0400
fully fix bz#999384
.gitignore | 1 +
rubygem-passenger.spec | 5 ++++-
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 02c8361..3547b5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/passenger-3.0.17.tar.gz
/release-3.0.19.tar.gz
/release-3.0.21.tar.gz
+/results_*
diff --git a/rubygem-passenger.spec b/rubygem-passenger.spec
index 26dafbb..de63924 100644
--- a/rubygem-passenger.spec
+++ b/rubygem-passenger.spec
@@ -244,7 +244,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
@@ -310,6 +310,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
@@ -342,6 +344,7 @@ rake test --trace ||:
%{gem_instdir}/helper-scripts
%{gem_instdir}/lib
%{gem_instdir}/resources
+%{_bindir}/%{gem_name}*
%{_mandir}/man1/%{gem_name}-*
%{_mandir}/man8/%{gem_name}-*
%if 0%{?fedora} > 15
More information about the scm-commits
mailing list