From cbc6a203685015ca932fb3e419b9dea20f290e0d Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Wed, 1 Feb 2012 10:29:24 +0100 Subject: Rebuilt for Ruby 1.9.3. --- rubygem-typhoeus-gcc-flags-fix.patch | 31 ---------------- rubygem-typhoeus.spec | 68 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 65 deletions(-) delete mode 100644 rubygem-typhoeus-gcc-flags-fix.patch diff --git a/rubygem-typhoeus-gcc-flags-fix.patch b/rubygem-typhoeus-gcc-flags-fix.patch deleted file mode 100644 index 4f56370..0000000 --- a/rubygem-typhoeus-gcc-flags-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -*** ext/typhoeus/extconf.rb 2010-10-04 13:39:02.983245045 +0200 ---- ext/typhoeus/extconf.rb.new 2010-10-13 15:07:43.289099195 +0200 -*************** -*** 25,31 **** - use_macports = !(defined?(RUBY_ENGINE) && RUBY_ENGINE != 'ruby') - $LIBPATH << "/opt/local/lib" if use_macports - -! $CFLAGS << " -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline" - - if Config::CONFIG['target_os'] == 'mingw32' - header = File.join(ROOT, 'cross', 'curl-7.19.4.win32', 'include') ---- 25,31 ---- - use_macports = !(defined?(RUBY_ENGINE) && RUBY_ENGINE != 'ruby') - $LIBPATH << "/opt/local/lib" if use_macports - -! $CFLAGS << " -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline" - - if Config::CONFIG['target_os'] == 'mingw32' - header = File.join(ROOT, 'cross', 'curl-7.19.4.win32', 'include') -*************** -*** 62,65 **** - ) - end - -! create_makefile("typhoeus/native") -\ No newline at end of file ---- 62,65 ---- - ) - end - -! create_makefile("typhoeus/native") diff --git a/rubygem-typhoeus.spec b/rubygem-typhoeus.spec index d2c14b3..a8ad7b6 100644 --- a/rubygem-typhoeus.spec +++ b/rubygem-typhoeus.spec @@ -1,23 +1,20 @@ -%global gemname typhoeus +%global gem_name typhoeus -%global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ') -%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%global geminstdir %{gemdir}/gems/%{gemname}-%{version} -%global rubyabi 1.8 +%global rubyabi 1.9.1 Summary: A library for interacting with web services at blinding speed -Name: rubygem-%{gemname} +Name: rubygem-%{gem_name} Version: 0.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: MIT URL: http://github.com/pauldix/typhoeus -Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem +Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: rubygem(mime-types) BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: ruby(rubygems) +BuildRequires: rubygems-devel # Use rspec-core until rspec are not migrated to RSpec 2.x BuildRequires: rubygem(rspec-core) BuildRequires: rubygem(json) @@ -25,7 +22,7 @@ BuildRequires: rubygem(mime-types) BuildRequires: rubygem(sinatra) BuildRequires: ruby-devel BuildRequires: libcurl-devel -Provides: rubygem(%{gemname}) = %{version} +Provides: rubygem(%{gem_name}) = %{version} %description Like a modern code version of the mythical beast with 100 serpent heads, @@ -42,11 +39,11 @@ Documentation for %{name} %prep %setup -q -c -T -mkdir -p ./%{gemdir} +mkdir -p ./%{gem_dir} export CONFIGURE_ARGS="--with-cflags='%{optflags}'" gem install \ --local \ - --install-dir ./%{gemdir} \ + --install-dir ./%{gem_dir} \ -V --force --rdoc \ %{SOURCE0} @@ -54,45 +51,48 @@ gem install \ %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{gemdir} -cp -a ./%{gemdir}/* %{buildroot}%{gemdir} +mkdir -p %{buildroot}%{gem_dir} +cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir} -mkdir -p %{buildroot}%{ruby_sitearch}/%{gemname} -mv -f %{buildroot}%{geminstdir}/lib/%{gemname}/*.so %{buildroot}%{ruby_sitearch}/%{gemname} +mkdir -p %{buildroot}%{ruby_vendorarchdir}/%{gem_name} +mv -f %{buildroot}%{gem_libdir}/%{gem_name}/*.so %{buildroot}%{ruby_vendorarchdir}/%{gem_name} # remove all shebang, set permission to 0644 (mtasaka) -for f in $(find %{buildroot}%{geminstdir} -name \*.rb) +for f in $(find %{buildroot}%{gem_instdir} -name \*.rb) do sed -i -e '/^#!/d' $f chmod 0644 $f done %check -pushd .%{geminstdir} +pushd .%{gem_instdir} rspec spec popd %files -%dir %{geminstdir} -%dir %{ruby_sitearch}/%{gemname} -%exclude %{geminstdir}/ext -%{geminstdir}/lib -%exclude %{geminstdir}/lib/typhoeus/.gitignore -%{ruby_sitearch}/%{gemname}/*.so -%doc %{geminstdir}/LICENSE -%exclude %{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec +%dir %{gem_instdir} +%dir %{ruby_vendorarchdir}/%{gem_name} +%exclude %{gem_instdir}/ext +%{gem_libdir} +%exclude %{gem_libdir}/typhoeus/.gitignore +%{ruby_vendorarchdir}/%{gem_name}/*.so +%doc %{gem_instdir}/LICENSE +%exclude %{gem_cache} +%{gem_spec} %files doc -%doc %{geminstdir}/CHANGELOG.markdown -%{geminstdir}/Rakefile -%{geminstdir}/Gemfile -%{geminstdir}/Gemfile.lock -%{geminstdir}/spec -%{geminstdir}/%{gemname}.gemspec -%doc %{gemdir}/doc/%{gemname}-%{version} +%doc %{gem_instdir}/CHANGELOG.markdown +%{gem_instdir}/Rakefile +%{gem_instdir}/Gemfile +%{gem_instdir}/Gemfile.lock +%{gem_instdir}/spec +%{gem_instdir}/%{gem_name}.gemspec +%doc %{gem_docdir} %changelog +* Wed Feb 01 2012 Vít Ondruch - 0.3.3-3 +- Rebuilt for Ruby 1.9.3. + * Sat Jan 14 2012 Fedora Release Engineering - 0.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -- cgit