Index: trunk/server/fedora/specs/moira.spec
===================================================================
--- trunk/server/fedora/specs/moira.spec	(revision 1394)
+++ trunk/server/fedora/specs/moira.spec	(revision 1396)
@@ -1,19 +1,23 @@
-Summary: rpm packaging of libmoira
+# Make sure to update these to coincide with the most recent debathena-moira
+# release from http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
+%define debversion 4.0.0
+%define upstreamversion cvs20091116
+Summary: rpm packaging of moira libraries, clients, and friends.
 Group: Applications/System
 Name: moira
-Version: 0.%{scriptsversion}
-Release: 0
+Version: %{debversion}
+Release: 2.%{scriptsversion}.%{upstreamversion}
 Vendor: The scripts.mit.edu Team (scripts@mit.edu)
 URL: http://scripts.mit.edu
-License: GPL
-Source: %{name}.tar.gz
-Source1: debian/debathena-moira-update-server.init
+License: MIT
+Source: debathena-%{name}_%{debversion}+%{upstreamversion}.orig.tar.gz
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
 #TODO: might really need mit-zephyr-devel, something for autotools-dev
-BuildRequires: readline-devel, patch, e2fsprogs-devel, mit-zephyr, ncurses-devel, krb5-devel, hesiod-devel
-patch0: debian/patches/install-headers
+BuildRequires: readline-devel, e2fsprogs-devel, mit-zephyr, ncurses-devel, krb5-devel, hesiod-devel
+Patch0: moira-install-headers.patch
+Patch1: moira-update-server.rc.patch
 
 %description
-rpm packaging of libmoira
+rpm packaging of moira libraries, clients, and friends.
 
 Source package for the moira library and clients.  Clone of debathena-moira.
@@ -21,7 +25,7 @@
 
 %prep
-%setup -q -n %{name}
-cp -p /home/scripts-build/test/trunk/server/fedora/specs/mybuild/moira-update-server.init %{SOURCE1}
+%setup -q -n debathena-%{name}-%{debversion}+%{upstreamversion}
 %patch0 -p1
+%patch1
 
 %build
@@ -43,5 +47,5 @@
    %{buildroot}/%{_mandir}/man1/chfn.moira.1
 install -m 755 -d %{buildroot}/%{_initddir}
-install -m 755 %{SOURCE1} %{buildroot}/%{_initddir}/moira-update-server
+install -m 755 moira-update-server.init %{buildroot}/%{_initddir}/moira-update-server
 # Hack: These man files are installed but no package uses them
 rm %{buildroot}/%{_mandir}/man8/dcm.8
@@ -56,13 +60,9 @@
 rm -rf %{buildroot}
 
-%changelog
-* Fri Dec 26 2009  Greg Brockman <gdb@mit.edu>
-- prerelease
-
-# moira-clients
-%package moira-clients
+# clients
+%package clients
 Summary: Clients for the Moira database
 Group: Applications/System
-%description moira-clients
+%description clients
 Clients for the Moira database
 
@@ -73,5 +73,6 @@
 This package contains clients such as moira, stella, blanche, etc.
 
-%files moira-clients
+%files clients
+%defattr(755,root,root)
 %{_bindir}/addusr
 %{_bindir}/blanche
@@ -91,15 +92,16 @@
 %{_bindir}/usermaint
 %{_bindir}/update_test
+%defattr(-,root,root)
 %doc %{_mandir}/man1/*
 %doc %{_mandir}/man8/mrtest.8.gz
 
 
-# moira-update-server
-%package moira-update-server
+# update-server
+%package update-server
 Summary: Athena update_server
 Group: Applications/System
 Requires(post): chkconfig
 Requires(preun): chkconfig
-%description moira-update-server
+%description update-server
 Athena update_server
 
@@ -111,5 +113,5 @@
 servers that automatically receive information dumps from moira.
 
-%files moira-update-server
+%files update-server
 %defattr(-,root,root)
 %doc %{_mandir}/man8/update_server.8.gz
@@ -119,8 +121,9 @@
 %{_initddir}/moira-update-server
 
-%post moira-update-server
+%post update-server
 /sbin/chkconfig --add moira-update-server
+%{_initddir}/moira-update-server condrestart
 
-%preun moira-update-server
+%preun update-server
 if [ $1 = 0 ] ; then
     /sbin/service moira-update-server stop >/dev/null 2>&1
@@ -129,8 +132,8 @@
 
 # libmoira0
-%package libmoira0
+%package -n libmoira0
 Summary: The Moira library
 Group: System Environment/Libraries
-%description libmoira0
+%description -n libmoira0
 The Moira library
 
@@ -141,14 +144,18 @@
 This package contains the shared Moira library.
 
-%files libmoira0
+%post -n libmoira0 -p /sbin/ldconfig
+%postun -n libmoira0 -p /sbin/ldconfig
+
+%files -n libmoira0
+%defattr(-,root,root)
 %{_libdir}/libmoira.so.*
 
-# libmoira-dev
-%package libmoira-dev
+# libmoira-devel
+%package -n libmoira-devel
 Summary: Development files for Moira library
 Group: Development/Libraries
-Provides: libmoira-dev
+Provides: libmoira-devel
 Requires: libmoira0
-%description libmoira-dev
+%description -n libmoira-devel
 Development files for Moira library
 
@@ -159,5 +166,8 @@
 This package contains headers and static libraries for development.
 
-%files libmoira-dev
+%post -n libmoira-devel -p /sbin/ldconfig
+%postun -n libmoira-devel -p /sbin/ldconfig
+
+%files -n libmoira-devel
 %defattr(-,root,root)
 %{_includedir}/*
@@ -166,2 +176,6 @@
 %{_libdir}/libmoira.la
 %{_libdir}/libmoira.a
+
+%changelog
+* Sat Dec 26 2009 Greg Brockman <gdb@mit.edu> - 4.0.0-2.1380.cvs20091116
+- Initial packaging of Moira on Fedora