Index: trunk/server/common/patches/moira-install-headers.patch
===================================================================
--- trunk/server/common/patches/moira-install-headers.patch	(revision 1489)
+++ 	(revision )
@@ -1,42 +1,0 @@
-Index: moira/include/Makefile.in
-===================================================================
---- moira.orig/include/Makefile.in	1999-07-12 12:21:05.000000000 -0400
-+++ moira/include/Makefile.in	2009-11-19 10:23:05.000000000 -0500
-@@ -7,6 +7,10 @@
- SRCTOP=@top_srcdir@
- BUILDTOP=../..
- 
-+prefix=@prefix@
-+includedir=@includedir@
-+INSTALL=@INSTALL@
-+
- all:
- 
- clean:
-@@ -17,3 +21,5 @@
- depend:
- 
- install:
-+	$(SRCTOP)/mkinstalldirs $(DESTDIR)$(includedir)/moira
-+	$(INSTALL) moira.h mrclient.h $(DESTDIR)$(includedir)/moira
-Index: moira/lib/Makefile.in
-===================================================================
---- moira.orig/lib/Makefile.in	2009-06-01 17:05:01.000000000 -0400
-+++ moira/lib/Makefile.in	2009-11-19 10:22:01.000000000 -0500
-@@ -25,6 +25,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
-+includedir=@includedir@
- 
- OBJS=	critical.lo fixhost.lo fixname.lo \
- 	hash.lo kname_unparse.lo kname_parse.lo krb_et.lo mr_access.lo mr_auth.lo \
-@@ -54,6 +55,8 @@
- 
- install: all
- 	$(LIBTOOL) --mode=install  $(INSTALL) libmoira.la $(DESTDIR)$(libdir)/libmoira.la
-+	$(SRCTOP)/mkinstalldirs $(DESTDIR)$(includedir)/moira
-+	$(INSTALL) mr_et.h krb_et.h ureg_err.h $(DESTDIR)$(includedir)/moira
- 
- libmoira.la: $(OBJS)
- 	$(LIBTOOL) --mode=link $(CC) $(ALL_LDFLAGS) -o $@ $(OBJS) -rpath $(libdir) -version-info 0:0:0
Index: trunk/server/fedora/specs/moira.spec
===================================================================
--- trunk/server/fedora/specs/moira.spec	(revision 1489)
+++ trunk/server/fedora/specs/moira.spec	(revision 1490)
@@ -2,10 +2,10 @@
 # release from http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
 %define upstreamversion 4.0.0
-%define snapshotversion svn20100104
+%define snapshotversion svn20100223
 Summary: moira libraries, clients, and friends
 Group: Applications/System
 Name: moira
 Version: %{upstreamversion}
-Release: 3.%{scriptsversion}.%{snapshotversion}
+Release: 4.%{scriptsversion}.%{snapshotversion}
 Vendor: The scripts.mit.edu Team (scripts@mit.edu)
 URL: http://scripts.mit.edu
@@ -15,5 +15,4 @@
 #TODO: might really need mit-zephyr-devel, something for autotools-dev
 BuildRequires: readline-devel, e2fsprogs-devel, ncurses-devel, krb5-devel, hesiod-devel
-Patch0: moira-install-headers.patch
 Patch1: moira-update-server.rc.patch
 Patch2: moira-fix-manpage-paths.patch
@@ -25,5 +24,4 @@
 %prep
 %setup -q -n debathena-%{name}-%{upstreamversion}+%{snapshotversion}
-%patch0 -p1
 %patch1
 %patch2 -p1
@@ -218,4 +216,8 @@
 
 %changelog
+* Thu Feb 25 2010 Mitchell Berger <mitchb@mit.edu> - 4.0.0-4.1489M.svn20100223
+- Update to new original upstream version (svn snapshot)
+- Drop install-headers patch which was incorporated upstream (from Debathena)
+
 * Tue Jan 05 2010 Mitchell Berger <mitchb@mit.edu> - 4.0.0-3.1405M.svn20100104
 - Update to new original upstream version (svn snapshot)