[rubygem-foreman_api] Update rubygem-foreman_api to 0.1.9-2

Miroslav Suchý msuchy at fedoraproject.org
Sat Dec 21 09:43:55 UTC 2013


commit b9a27a04a84f8147df05b02529dacf6292a6e14c
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Sat Dec 21 10:43:44 2013 +0100

    Update rubygem-foreman_api to 0.1.9-2

 rubygem-foreman_api.spec |   59 ++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 30 deletions(-)
---
diff --git a/rubygem-foreman_api.spec b/rubygem-foreman_api.spec
index a86239d..8d6cf6b 100644
--- a/rubygem-foreman_api.spec
+++ b/rubygem-foreman_api.spec
@@ -1,74 +1,73 @@
+%{?scl:%scl_package rubygem-%{gem_name}}
+%{!?scl:%global pkg_name %{name}}
+
 %global gem_name foreman_api
 
 %if 0%{?rhel} == 6 || 0%{?fedora} < 17
 %define rubyabi 1.8
-%else
-%define rubyabi 1.9.1
-%endif
-
-%if 0%{?rhel} == 6
-%global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}
-%global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem
-%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
-%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}
 %endif
 
 Summary: Ruby bindings for Forman's rest API
-Name: rubygem-%{gem_name}
+Name: %{?scl_prefix}rubygem-%{gem_name}
 Version: 0.1.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/theforeman/foreman_api
 Source0:  http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 %if 0%{?fedora} > 18
-Requires: ruby(release)
+Requires: %{?scl_prefix}ruby(release)
 %else
-Requires: ruby(abi) = %{rubyabi}
+Requires: %{?scl_prefix}ruby(abi) = %{rubyabi}
 %endif
-Requires: ruby(rubygems) 
-Requires: rubygem(json) 
-Requires: rubygem(rest-client) >= 1.6.1
-Requires: rubygem(oauth) 
+Requires: %{?scl_prefix}ruby(rubygems)
+Requires: %{?scl_prefix}rubygem(json)
+Requires: %{?scl_prefix}rubygem(rest-client) >= 1.6.1
+Requires: %{?scl_prefix}rubygem(oauth)
 %if 0%{?fedora} > 18
-BuildRequires: ruby(release)
+BuildRequires: %{?scl_prefix}ruby(release)
 %else
-BuildRequires: ruby(abi) = %{rubyabi}
-%endif
-BuildRequires: ruby(rubygems) 
-%if 0%{?fedora}
-BuildRequires: rubygems-devel
+BuildRequires: %{?scl_prefix}ruby(abi) = %{rubyabi}
 %endif
+BuildRequires: %{?scl_prefix}ruby(rubygems)
+BuildRequires: %{?scl_prefix}rubygems-devel
 
 BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
+Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version}
 
 %description
 Helps you to use Foreman's API calls from your app.
 
 %package doc
 BuildArch:  noarch
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{?scl_prefix}%{pkg_name} = %{version}-%{release}
 Summary:    Documentation for rubygem-%{gem_name}
 
 %description doc
 This package contains documentation for rubygem-%{gem_name}.
 
 %prep
+%{?scl:scl enable %{scl} "}
 gem unpack %{SOURCE0}
+%{?scl:"}
 %setup -q -D -T -n  %{gem_name}-%{version}
 
+%{?scl:scl enable %{scl} "}
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+%{?scl:"}
+%{?scl:scl enable %{scl} "}
 gem build %{gem_name}.gemspec
+%{?scl:"}
 
 %build
 %if 0%{?fedora} > 18
 %gem_install
 %else
 mkdir -p .%{gem_dir}
+%{?scl:scl enable %{scl} "}
 gem install --local --install-dir .%{gem_dir} \
             --force --no-rdoc --no-ri %{gem_name}-%{version}.gem
+%{?scl:"}
 %endif
 
 %install
@@ -81,7 +80,6 @@ mv %{buildroot}%{gem_instdir}/doc %{buildroot}%{gem_docdir}
 rm -f %{buildroot}%{gem_instdir}/%{gem_name}.gemspec
 rm -f %{buildroot}%{gem_instdir}/.yardopts
 rm -f %{buildroot}%{gem_instdir}/.gitignore
-sed -i '1d' %{buildroot}%{gem_instdir}/Rakefile
 
 %files
 %dir %{gem_instdir}
@@ -93,11 +91,12 @@ sed -i '1d' %{buildroot}%{gem_instdir}/Rakefile
 
 %files doc
 %doc %{gem_docdir}
-%{gem_instdir}/Gemfile
-%{gem_instdir}/Rakefile
-
 
 %changelog
+* Sat Dec 21 2013 Miroslav Suchý <msuchy at redhat.com> 0.1.9-2
+- add scl macros
+- clean up old unused code
+
 * Sat Dec 21 2013 Miroslav Suchý <msuchy at redhat.com> 0.1.9-1
 - rebase to foreman_api-0.1.9
 


More information about the scm-commits mailing list