[rubygem-deltacloud-client/f17] Updated specfile to match with rawhide

Michal Fojtik mfojtik at fedoraproject.org
Thu Apr 19 10:22:03 UTC 2012


commit 90b18ceb8c80dee389db4e16678e33aec68dc8fd
Author: Michal Fojtik <mi at mifo.sk>
Date:   Thu Apr 19 12:21:48 2012 +0200

    Updated specfile to match with rawhide

 rubygem-deltacloud-client.spec |   65 +++++++++++++++++----------------------
 1 files changed, 28 insertions(+), 37 deletions(-)
---
diff --git a/rubygem-deltacloud-client.spec b/rubygem-deltacloud-client.spec
index 2f5a865..abf5cb7 100644
--- a/rubygem-deltacloud-client.spec
+++ b/rubygem-deltacloud-client.spec
@@ -1,16 +1,16 @@
 %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname deltacloud-client
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gem_name deltacloud-client
+%global geminstdir %{gemdir}/gems/%{gem_name}-%{version}
 %global rubyabi 1.9.1
 
 Summary: Deltacloud REST Client
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
 Version: 0.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: ASL 2.0
 URL: http://www.deltacloud.org
-Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem
+Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 Source1: deltacloud-client.gemspec
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
@@ -18,7 +18,7 @@ Requires: rubygem(rest-client) >= 1.4.0
 Requires: rubygem(nokogiri)
 BuildRequires: rubygems-devel
 BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 Deltacloud REST Client for API
@@ -33,58 +33,49 @@ Documentation for %{name}
 
 %prep
 %setup -q -c -T
-gem unpack -V --target=%{_builddir} %{SOURCE0}
-mv %{_builddir}/%{gemname}-%{version}/* %{_builddir}/%{name}-%{version}
+mkdir -p ./%{gem_dir}
 
 %build
+gem install --local --install-dir .%{gem_dir} -V --force %{SOURCE0}
+pushd .%{gem_instdir}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{geminstdir}
-mkdir -p %{buildroot}%{gemdir}
+mkdir -p %{buildroot}%{gem_dir}
 mkdir -p %{buildroot}%{_bindir}
-cat > %{buildroot}%{_bindir}/deltacloudc <<EOF
-#!/usr/bin/ruby
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem 'deltacloud-client', version
-load Gem.bin_path('deltacloud-client', 'deltacloudc', version)
-EOF
-chmod 0755 %{buildroot}%{_bindir}/deltacloudc
-cp -r %{_builddir}/%{name}-%{version}/* %{buildroot}%{geminstdir}/
-rdoc --quiet --op %{buildroot}%{_defaultdocdir}/%{name}
-mkdir -p %{buildroot}/%{gemdir}/specifications
-cp %{SOURCE1} %{buildroot}/%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod 0755
+cp -a .%{gem_dir}/* %{buildroot}/%{gem_dir}
+mkdir -p %{buildroot}/%{_bindir}
+mv %{buildroot}%{gem_dir}/bin/* %{buildroot}/%{_bindir}
+rmdir %{buildroot}%{gem_dir}/bin
+find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod 0755
+
+%check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-, root, root)
-%dir %{geminstdir}
-%{geminstdir}/bin
-%{geminstdir}/lib
+%defattr(-, root, root, -)
+%dir %{gem_instdir}
+%{gem_instdir}/bin
+%{gem_libdir}
 %{_bindir}/deltacloudc
-%doc %{geminstdir}/LICENSE
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%doc %{gem_instdir}/LICENSE
+%{gem_cache}
+%{gem_spec}
 
 %files doc
 %defattr(-, root, root)
-%{_defaultdocdir}/%{name}
 %{geminstdir}/specs
 %{geminstdir}/Rakefile
 %{geminstdir}/DISCLAIMER
 %{geminstdir}/NOTICE
+%{gem_docdir}
 
 %changelog
+* Wed Feb 10 2012 Michal Fojtik <mfojtik at redhat.com> - 0.5.0-3
+- Updated specfile to match with rawhide
+
 * Wed Feb 10 2012 Michal Fojtik <mfojtik at redhat.com> - 0.5.0-2
 - Version bump to official 0.5.0 release
 


More information about the scm-commits mailing list