[rubygem-passenger/el6: 19/19] merging with master

[tdawson]

commit f7a5bad8e861ab4b648e31bf1465783e92b0fb85
Author: Troy Dawson <tdawson at redhat.com>
Date:   Thu Jul 18 10:30:15 2013 -0500

    merging with master

 rubygem-passenger.spec |   32 --------------------------------
 1 files changed, 0 insertions(+), 32 deletions(-)
---
diff --git a/rubygem-passenger.spec b/rubygem-passenger.spec
index fa98a98..83e0e31 100644
--- a/rubygem-passenger.spec
+++ b/rubygem-passenger.spec
@@ -14,11 +14,7 @@
 Summary: Passenger Ruby web application server
 Name: rubygem-%{gem_name}
 Version: 3.0.21
-<<<<<<< HEAD
-Release: 3%{?dist}
-=======
 Release: 4%{?dist}
->>>>>>> master
 Group: System Environment/Daemons
 # Passenger code uses MIT license.
 # Bundled(Boost) uses Boost Software License
@@ -65,18 +61,12 @@ Patch104:       passenger_fixdeps.patch
 # https://github.com/FooBarWidget/passenger/pull/71
 Patch105:       rubygem-passenger-3.0.19-requires-fix-ruby2.patch
 
-<<<<<<< HEAD
-# removes -Werror in upstream build scripts.  -Werror conflicts with
-# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
-#Patch200:       nginx-auto-cc-gcc.patch
-=======
 # Fix for CVE-2013-4136
 # https://bugzilla.redhat.com/show_bug.cgi?id=985634
 # Note: This is a combination of both
 # https://github.com/phusion/passenger/commit/5483b3292cc2af1c83033eaaadec20dba4dcfd9b
 # https://github.com/phusion/passenger/commit/9dda49f4a3ebe9bafc48da1bd45799f30ce19566
 Patch106:       rubygem-passenger-3.0.21-CVE-2013-4136-tmp-directory.patch
->>>>>>> master
 
 Requires: rubygems
 # XXX: Needed to run passenger standalone
@@ -86,11 +76,7 @@ Requires: rubygem(rake)
 %if 0%{?fedora} >= 19
 Requires: ruby(release)
 %else
-<<<<<<< HEAD
 Requires: ruby(abi) >= 1.8
-=======
-Requires: ruby(abi) = 1.9.1
->>>>>>> master
 %endif
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
@@ -212,10 +198,7 @@ rebuilding this package.
 %if 0%{?fedora} >= 19
 %patch105 -p1 -b .requires
 %endif
-<<<<<<< HEAD
-=======
 %patch106 -p1 -b .tmpdir
->>>>>>> master
 
 # Don't use bundled libev
 %{__rm} -rf ext/libev
@@ -364,12 +347,9 @@ rake test --trace ||:
 %endif
 %exclude %{gem_instdir}/configure
 %exclude %{gem_instdir}/debian/
-<<<<<<< HEAD
 %if 0%{?fedora}
 %exclude %{gem_instdir}/.yardoc
 %endif
-=======
->>>>>>> master
 %exclude %{gem_cache}
 
 %files doc
@@ -399,12 +379,6 @@ rake test --trace ||:
 %{gem_extdir}/lib
 
 %changelog
-<<<<<<< HEAD
-* Fri Jun 21 2013 Troy Dawson <tdawson at redhat.com> - 3.0.21-3
-- Remove Rakefile (only used for building) (#976843)
-- Putting the agents back to where they originally were
-
-=======
 * Thu Jul 18 2013 Troy Dawson <tdawson at redhat.com> - 3.0.21-4
 - Fix for CVE-2013-4136 (#985634)
 
@@ -414,7 +388,6 @@ rake test --trace ||:
 * Fri Jun 21 2013 Troy Dawson <tdawson at redhat.com> - 3.0.21-2
 - Remove Rakefile (only used for building) (#976843)
 
->>>>>>> master
 * Thu May 30 2013 Troy Dawson <tdawson at redhat.com> - 3.0.21-1
 - Update to version 3.0.21
 - Fix for CVE-2013-2119
@@ -432,12 +405,7 @@ rake test --trace ||:
 * Sun Jan 20 2013 Orion Poplawski <orion at cora.nwra.com> - 3.0.19-1
 - Update to 3.0.19
 
-<<<<<<< HEAD
-* Wed Sep 19 2012 Orion Poplawski <orion at cora.nwra.com> - 3.0.17-2.1
-- Fix ruby(abi) for EL6
-=======
 * Wed Sep 19 2012 Orion Poplawski <orion at cora.nwra.com> - 3.0.17-3
->>>>>>> master
 - Drop dependency on rubygem(file-tail), no longer needed
 
 * Fri Sep 7 2012 Brett Lentz <blentz at redhat.com> - 3.0.17-2