Changeset 2025 for branches

Timestamp:

Nov 4, 2011, 2:37:15 PM (13 years ago)

Author:

ezyang

Message:

Patch rubygems to include threads, making old Rails 2 apps work again.

Location:

branches/fc15-dev/server

Files:

• common/patches/rubygems-rails-require-thread.patch (added)
• fedora/Makefile (modified) (2 diffs)
• fedora/specs/rubygems.spec.patch (added)
• fedora/specs/scripts-base.spec (modified) (1 diff)

branches/fc15-dev/server/fedora/Makefile

@@ -19 +19 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum    = krb5 krb5.i686 httpd openssh
+upstream_yum    = krb5 krb5.i686 httpd openssh rubygems
 hackage         = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
@@ -193 +193 @@
 php-deps        = bzip2-devel curl-devel gmp-devel libstdc++-devel sqlite-devel gcc-c++ libc-client-devel mysql-devel postgresql-devel unixODBC-devel libxml2-devel net-snmp-devel libxslt-devel libxml2-devel libXpm-devel libjpeg-devel t1lib-devel libmcrypt-devel mhash-devel libtidy-devel freetds-devel aspell-devel recode-devel
 haskell-deps    = cabal-install
+# ezyang: not 100% sure this is correct
+rubygems-deps   = ruby ruby-rdoc
 install-deps:
-        yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(moira-deps) $(zephyr-deps) $(openssh-deps) $(php-deps) $(haskell-deps)
+        yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(moira-deps) $(zephyr-deps) $(openssh-deps) $(php-deps) $(haskell-deps) $(rubygems-deps)
 # XXX: We need to figure out what's going on with compat-readline43
 #       rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm

branches/fc15-dev/server/fedora/specs/scripts-base.spec

@@ -22 +22 @@
 Requires: scripts-openssh-server
 Requires: scripts-static-cat
+Requires: scripts-rubygems
 Requires: sql-signup
 Requires: tokensys