[rubygem-dynect_rest/el6: 11/14] Merge branch 'f18' into el6

[Russell Harrison]

commit 0cb915052de49e67ba7645ac8c3d34ac4f7f5c1b
Merge: 37eb7d7 02efba3
Author: Russell Harrison <rharrison at fedoraproject.org>
Date:   Wed Aug 28 08:19:15 2013 -0400

    Merge branch 'f18' into el6
    
    Conflicts:
    	.gitignore
    	rubygem-dynect_rest.spec

 dynect_rest-fix_redirect_handling.patch |   26 ++++++++++++++++++++++++++
 rubygem-dynect_rest.spec                |    8 ++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
---
diff --cc rubygem-dynect_rest.spec
index 2ca0e26,130cc50..664f389
--- a/rubygem-dynect_rest.spec
+++ b/rubygem-dynect_rest.spec
@@@ -1,17 -1,6 +1,17 @@@
--# Generated from dynect_rest-0.4.0.gem by gem2rpm -*- rpm-spec -*-
++# Macros for using the latest guidelines on EL 6
 +%if 0%{?rhel} <= 6 && 0%{?fedora} <= 16
 +%global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 +%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}
 +%global gem_libdir %{gem_instdir}/lib
 +%global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem
 +%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
 +%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}
 +%global gem_extdir %{_libdir}/gems/exts/%{gem_name}-%{version}
 +%global gem_extdir_mri %{_libdir}/gems/ruby/%{gem_name}-%{version}
 +%endif
 +
  %global gem_name dynect_rest
 -%global rubyabi 1.9.1
 +%global rubyabi 1.8
  
  Name:           rubygem-%{gem_name}
  Version:        0.4.3
@@@ -23,20 -12,18 +23,22 @@@ Group:          Development/Language
  License:        ASL 2.0
  URL:            http://github.com/adamhjk/dynect_rest
  Source0:        http://rubygems.org/gems/%{gem_name}-%{version}.gem
+ # https://github.com/adamhjk/dynect_rest/pull/25
+ Patch0:         dynect_rest-fix_redirect_handling.patch
  
  BuildArch:      noarch
 -%if 0%{?fedora} >= 19
 -Requires: ruby(release)
 -BuildRequires: ruby(release)
 -%else
 +%if 0%{?rhel} <= 6 && 0%{?fedora} <= 18
  Requires: ruby(abi) >= %{rubyabi}
  BuildRequires: ruby(abi) >= %{rubyabi}
 +%else
 +Requires: ruby(release)
 +BuildRequires: ruby(release)
  %endif
 +%if 0%{?rhel} <= 6 && 0%{?fedora} <= 16
 +BuildRequires:  rubygems
 +%else
  BuildRequires:  rubygems-devel
 +%endif
  BuildRequires:  ruby
  Requires:       ruby(rubygems)
  Requires:       ruby
@@@ -106,10 -94,22 +109,11 @@@ rm -f %{buildroot}%{gem_instdir}/.rspe
  %doc %{gem_instdir}/VERSION
  
  %changelog
 -* Tue Aug 27 2013 Russell Harrison <rharrison at fedoraproject.org> 0.4.3-6
 +* Tue Aug 27 2013 Russell Harrison <rharriso at redhat.com> 0.4.3-2
 +- Update spec to make maintaining multiple branches easier
+ - Patch to fix redirect handling during long API calls.
  
 -* Thu Mar 14 2013 Russell Harrison <rharrison at fedoraproject.org> 0.4.3-5
 -- Update for Ruby 2.0 in F19+
 -
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Tue May 29 2012 Russell Harrison <rharriso at redhat.com> 0.4.3-2
 -- Update spec to the new Ruby Packaging Guidelines
 -
 -* Thu Apr 13 2012 Russell Harrison <rharriso at redhat.com> 0.4.3-1
 +* Fri Apr 13 2012 Russell Harrison <rharriso at redhat.com> 0.4.3-1
  - Update to 0.4.3
  
  * Thu Mar 29 2012 Russell Harrison <rharriso at redhat.com> 0.4.1-1