Index: /trunk/server/common/patches/moira-fix-manpage-paths.patch =================================================================== --- /trunk/server/common/patches/moira-fix-manpage-paths.patch (revision 1406) +++ /trunk/server/common/patches/moira-fix-manpage-paths.patch (revision 1406) @@ -0,0 +1,40 @@ +Index: moira/man/update_server.8 +=================================================================== +--- moira.orig/man/update_server.8 2010-01-04 21:12:54.000000000 -0500 ++++ moira/man/update_server.8 2010-01-04 22:03:58.000000000 -0500 +@@ -14,7 +14,7 @@ + it is needed. + .SH OPTIONS + While there are no command line options, a configuration file +-.I /etc/athena/moira.conf ++.I /etc/moira.conf + may specify a number of options. This file may contain blank lines, + comments preceeded by hash marks, boolean options, or string options. + A boolean option is set by just putting the name of the option on a +@@ -48,7 +48,7 @@ + .B sms + in the local realm is assumed. + .SH FILES +-/etc/athena/moira.conf \- For configuration variables. +-/etc/athena/srvtab \- It must be able to get rcmd Kerberos tickets. ++/etc/moira.conf \- For configuration variables. ++/etc/srvtab \- It must be able to get rcmd Kerberos tickets. + .SH "SEE ALSO" + The Project Athena Technical Plan section on Moira. +Index: moira/man/moira.3 +=================================================================== +--- moira.orig/man/moira.3 2010-01-04 22:04:05.000000000 -0500 ++++ moira/man/moira.3 2010-01-04 22:04:20.000000000 -0500 +@@ -239,9 +239,9 @@ + except that it uses strcmp on the elements rather than comparing the + addresses directly. + .SH FILES +-/usr/athena/include/moira.h ++/usr/include/moira/moira.h + .br +-/usr/athena/include/mr_et.h ++/usr/include/moira/mr_et.h + .br + /tmp/tkt### + .SH "SEE ALSO" + Index: /trunk/server/common/patches/moira-install-headers.patch =================================================================== --- /trunk/server/common/patches/moira-install-headers.patch (revision 1405) +++ /trunk/server/common/patches/moira-install-headers.patch (revision 1406) @@ -19,5 +19,5 @@ install: + $(SRCTOP)/mkinstalldirs $(DESTDIR)$(includedir)/moira -+ $(INSTALL) moira.h $(DESTDIR)$(includedir)/moira ++ $(INSTALL) moira.h mrclient.h $(DESTDIR)$(includedir)/moira Index: moira/lib/Makefile.in =================================================================== Index: /trunk/server/fedora/specs/moira.spec =================================================================== --- /trunk/server/fedora/specs/moira.spec (revision 1405) +++ /trunk/server/fedora/specs/moira.spec (revision 1406) @@ -2,10 +2,10 @@ # release from http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/ %define upstreamversion 4.0.0 -%define snapshotversion cvs20091228 +%define snapshotversion svn20100104 Summary: moira libraries, clients, and friends Group: Applications/System Name: moira Version: %{upstreamversion} -Release: 2.%{scriptsversion}.%{snapshotversion} +Release: 3.%{scriptsversion}.%{snapshotversion} Vendor: The scripts.mit.edu Team (scripts@mit.edu) URL: http://scripts.mit.edu @@ -17,4 +17,5 @@ Patch0: moira-install-headers.patch Patch1: moira-update-server.rc.patch +Patch2: moira-fix-manpage-paths.patch %description @@ -26,4 +27,5 @@ %patch0 -p1 %patch1 +%patch2 -p1 %build @@ -31,4 +33,5 @@ # Can remove this once the maintainer of the relevant package symlinks # com_err.h in /usr/include. +# (See https://bugzilla.redhat.com/show_bug.cgi?id=550889) # TODO: --with-zephyr is currently borked %configure --without-krb4 --with-krb5 --with-hesiod --without-zephyr --without-oracle --without-afs --disable-rpath --with-com_err=/usr CFLAGS='-I /usr/include/et' @@ -115,5 +118,5 @@ %defattr(-,root,root) %doc %{_mandir}/man8/update_server.8.gz -%config(noreplace) %{_sysconfdir}/athena/moira.conf +%config(noreplace) %{_sysconfdir}/moira.conf %defattr(755,root,root) %{_sbindir}/update_server @@ -167,5 +170,6 @@ %files -n libmoira-devel %defattr(-,root,root) -%{_includedir}/* +%{_includedir}/moira +%exclude %{_includedir}/moira/mrclient.h %doc %{_mandir}/man3/* %{_libdir}/libmoira.so @@ -173,5 +177,49 @@ %{_libdir}/libmoira.a +# libmrclient0 +%package -n libmrclient0 +Summary: The Moira client library +Group: System Environment/Libraries +%description -n libmrclient0 +Moira is the Athena Service Management system. It serves as the +central repository for information about users, groups hosts, print +queues, and several other aspects of the Athena environment. + +This package contains the shared Moira client library. + +%post -n libmrclient0 -p /sbin/ldconfig +%postun -n libmrclient0 -p /sbin/ldconfig + +%files -n libmrclient0 +%defattr(-,root,root) +%{_libdir}/libmrclient.so.* + +# libmrclient-devel +%package -n libmrclient-devel +Summary: Development files for Moira client library +Group: Development/Libraries +Requires: libmrclient0 = %{version}-%{release}, libmoira-devel = %{version}-%{release} +%description -n libmrclient-devel +Moira is the Athena Service Management system. It serves as the +central repository for information about users, groups hosts, print +queues, and several other aspects of the Athena environment. + +This package contains headers and static libraries for development. + +%post -n libmrclient-devel -p /sbin/ldconfig +%postun -n libmrclient-devel -p /sbin/ldconfig + +%files -n libmrclient-devel +%defattr(-,root,root) +%{_includedir}/moira/mrclient.h +%{_libdir}/libmrclient.so +%{_libdir}/libmrclient.la +%{_libdir}/libmrclient.a + %changelog +* Tue Jan 05 2010 Mitchell Berger - 4.0.0-3.1405M.svn20100104 +- Update to new original upstream version (svn snapshot) +- Build and install libmrclient as a shared library (from Debathena) + * Mon Dec 28 2009 Mitchell Berger - 4.0.0-2.1402.cvs20091228 - Update to new upstream version, including eunice printer client