Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (10 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev

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

    r2066 r2195  
    1 --- rubygems.spec.orig  2011-11-04 14:16:37.000000000 -0400
    2 +++ rubygems.spec       2011-11-04 14:32:02.000000000 -0400
     1--- rubygems.spec.~1~   2012-04-20 14:46:27.000000000 -0400
     2+++ rubygems.spec       2012-05-03 14:12:52.421863447 -0400
    33@@ -15,7 +15,7 @@
    44 Summary:       The Ruby standard for packaging ruby libraries
    55 Name:          rubygems
    66 Version:       1.7.2
    7 -Release:       3%{?dist}
    8 +Release:       3%{?dist}.scripts.%{scriptsversion}
     7-Release:       5%{?dist}
     8+Release:       5%{?dist}.scripts.%{scriptsversion}
    99 Group:         Development/Libraries
    1010 # No GPL version is specified.
    1111 License:       Ruby or GPL+
    12 @@ -40,6 +40,9 @@
    13  # ... and spec_file is not supported yet
    14  Patch7:                rubygems-1.7.2-escape-string-skip-test.patch
     12@@ -42,6 +42,9 @@
     13 # Insecure connection to SSL repository fix
     14 Patch10:       rubygems-1.x.x-ssl-connection-don_t-revert.patch
    1515 
    1616+Provides: scripts-rubygems = %{version}-%{release}
     
    2020 Requires:      ruby >= 1.8.7
    2121 Requires:      ruby-rdoc
    22 @@ -69,6 +72,8 @@
    23  %patch6 -p1 -b .esc
     22@@ -83,6 +86,8 @@
    2423 %patch7 -p1 -b .esc.skip
     24 %patch10 -p1 -b .ssl
    2525 
    2626+%patch1000 -p1 -b .thread
Note: See TracChangeset for help on using the changeset viewer.