Index: /trunk/server/fedora/Makefile
===================================================================
--- /trunk/server/fedora/Makefile	(revision 1863)
+++ /trunk/server/fedora/Makefile	(revision 1864)
@@ -22,5 +22,5 @@
 hackage		= MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0
 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
-upstream	= openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker zephyr zephyr.i686 python-zephyr
+upstream	= openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker zephyr zephyr.i686 python-zephyr athena-aclocal
 oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat
 allsrc		= $(upstream) $(oursrc)
@@ -79,4 +79,5 @@
 	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.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
 	cabal update
 	cabal fetch $(hackage)
Index: /trunk/server/fedora/specs/athena-aclocal.spec
===================================================================
--- /trunk/server/fedora/specs/athena-aclocal.spec	(revision 1864)
+++ /trunk/server/fedora/specs/athena-aclocal.spec	(revision 1864)
@@ -0,0 +1,38 @@
+# Make sure to update this to coincide with the most recent debathena-aclocal
+# release from http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
+%define upstreamversion 1.1.2
+Name:		athena-aclocal
+Version:	%{upstreamversion}
+Release:	1.%{scriptsversion}%{?dist}
+Summary:	Common autoconf macros for Athena software
+Vendor:		The scripts.mit.edu Team (scripts@mit.edu)
+Group:		Development/Tools
+License:	MIT
+URL:		http://scripts.mit.edu/
+Source:		deb%{name}_%{upstreamversion}.tar.gz
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires:	automake
+
+%description
+This package contains autoconf macros used in the building of multiple
+pieces of Athena software.  It is a clone of Debathena's debathena-aclocal.
+
+%prep
+%setup -q -n deb%{name}-%{upstreamversion}
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_datadir}/aclocal
+cp aclocal/* %{buildroot}%{_datadir}/aclocal
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{_datadir}/aclocal/*.m4
+
+%changelog
+* Sun May 29 2011 Mitchell Berger <mitchb@mit.edu> - 1.1.2-1
+- Initial packaging of Athena aclocal macros on Fedora
+