Index: branches/fc15-dev/server/fedora/Makefile
===================================================================
--- branches/fc15-dev/server/fedora/Makefile	(revision 2022)
+++ branches/fc15-dev/server/fedora/Makefile	(revision 2025)
@@ -19,5 +19,5 @@
 # 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,6 +193,8 @@
 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
Index: branches/fc15-dev/server/fedora/specs/rubygems.spec.patch
===================================================================
--- branches/fc15-dev/server/fedora/specs/rubygems.spec.patch	(revision 2025)
+++ branches/fc15-dev/server/fedora/specs/rubygems.spec.patch	(revision 2025)
@@ -0,0 +1,30 @@
+--- rubygems.spec.orig	2011-11-04 14:16:37.000000000 -0400
++++ rubygems.spec	2011-11-04 14:32:02.000000000 -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}
+ 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
+ 
++Provides: scripts-rubygems = %{version}-%{release}
++Patch1000: rubygems-rails-require-thread.patch
++
+ Requires:	ruby(abi) = 1.8
+ Requires:	ruby >= 1.8.7
+ Requires:	ruby-rdoc
+@@ -69,6 +72,8 @@
+ %patch6 -p1 -b .esc
+ %patch7 -p1 -b .esc.skip
+ 
++%patch1000 -p1 -b .thread
++
+ # Some of the library files start with #! which rpmlint doesn't like
+ # and doesn't make much sense
+ for f in `find lib -name \*.rb` ; do
Index: branches/fc15-dev/server/fedora/specs/scripts-base.spec
===================================================================
--- branches/fc15-dev/server/fedora/specs/scripts-base.spec	(revision 2022)
+++ branches/fc15-dev/server/fedora/specs/scripts-base.spec	(revision 2025)
@@ -22,4 +22,5 @@
 Requires: scripts-openssh-server
 Requires: scripts-static-cat
+Requires: scripts-rubygems
 Requires: sql-signup
 Requires: tokensys