Changeset 2195 for branches/fc17-dev/server/fedora/specs/rubygems.spec.patch

Timestamp:

May 22, 2012, 10:52:35 PM (12 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

• . (modified) (1 prop)
• server/fedora/specs/rubygems.spec.patch (modified) (2 diffs)

branches/fc17-dev/server/fedora/specs/rubygems.spec.patch

@@ -1 @@
---- rubygems.spec.orig  2011-11-04 14:16:37.000000000 -0400
-+++ rubygems.spec       2011-11-04 14:32:02.000000000 -0400
+--- rubygems.spec.~1~   2012-04-20 14:46:27.000000000 -0400
++++ rubygems.spec       2012-05-03 14:12:52.421863447 -0400
 @@ -15,7 +15,7 @@
  Summary:       The Ruby standard for packaging ruby libraries
  Name:          rubygems
  Version:       1.7.2
--Release:       3%{?dist}
-+Release:       3%{?dist}.scripts.%{scriptsversion}
+-Release:       5%{?dist}
++Release:       5%{?dist}.scripts.%{scriptsversion}
  Group:         Development/Libraries
  # No GPL version is specified.
  License:       Ruby or GPL+
-@@ -40,6 +40,9 @@
- # ... and spec_file is not supported yet
- Patch7:                rubygems-1.7.2-escape-string-skip-test.patch
+@@ -42,6 +42,9 @@
+ # Insecure connection to SSL repository fix
+ Patch10:       rubygems-1.x.x-ssl-connection-don_t-revert.patch
  
 +Provides: scripts-rubygems = %{version}-%{release}
@@ -20 +20 @@
  Requires:      ruby >= 1.8.7
  Requires:      ruby-rdoc
-@@ -69,6 +72,8 @@
- %patch6 -p1 -b .esc
+@@ -83,6 +86,8 @@
  %patch7 -p1 -b .esc.skip
+ %patch10 -p1 -b .ssl
  
 +%patch1000 -p1 -b .thread