Index: branches/fc19-dev/server/fedora/Makefile
===================================================================
--- branches/fc19-dev/server/fedora/Makefile	(revision 2486)
+++ branches/fc19-dev/server/fedora/Makefile	(revision 2487)
@@ -22,5 +22,5 @@
 hackage		= cgi-3001.1.8.2 unix-handle-0.0.0
 upstream_hackage = ghc-cgi ghc-unix-handle
-upstream	= openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs athena-aclocal discuss
+upstream	= openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss
 oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat fuse-better-mousetrapfs scripts-munin-plugins
 allsrc		= $(upstream) $(oursrc)
@@ -38,7 +38,5 @@
 
 dload		= ${PWD}/.dload
-server_url	= "http://web.mit.edu/scripts/src"
-server_arch	= "fedora.stable"
-openafs_url     = "http://www.openafs.org/dl/openafs/1.6.5.1/openafs-1.6.5.1-1.src.rpm"
+openafs_url	= "https://www.openafs.org/dl/openafs/1.6.5.1/openafs-1.6.5.1-1.src.rpm"
 zephyr_url	= "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
 
@@ -67,9 +65,8 @@
 download_stamp:
 	mkdir -p $(dload)
-	#wget -qO- -nv $(server_url)/$(server_arch) | xargs make
 	cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
 	wget -P $(dload) $(openafs_url)
 	wget -P $(dload) $(zephyr_url)
-	cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
+	cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
 	cabal update
 	cabal fetch --no-dependencies $(hackage)
@@ -77,11 +74,11 @@
 	spectool -g -R $(specs)/python-zephyr.spec
 	spectool -g -R $(specs)/python-afs.spec
+	spectool -g -R $(specs)/python-moira.spec
+	spectool -g -R $(specs)/python-hesiod.spec
 	touch download_stamp
 
-	cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
-	cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
+	cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
+	cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
 	cp $(oursrcdir)/discuss/* $(tmp_src)
-%.src.rpm:
-	wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm
 
 copy-patches: mkdir-tree
@@ -190,8 +187,4 @@
 	fi
 
-# 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
-#	rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
-
 fedora:
 	make upstream