rpms/moomps/devel moomps.spec,1.20,1.21

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/moomps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28345

Modified Files:
	moomps.spec 
Log Message:
do not use /srv


Index: moomps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- moomps.spec	11 Aug 2008 15:35:18 -0000	1.20
+++ moomps.spec	9 Jan 2009 16:36:13 -0000	1.21
@@ -1,6 +1,6 @@
 Name: moomps
 Version: 5.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPLv2
@@ -30,16 +30,16 @@
 %setup -q
 
 %build
-make LIBDIR=%_libdir TCLLIBDIR=%_libdir
+make LIBDIR=%{_libdir} TCLLIBDIR=%{_libdir} DATADIR=%{_datadir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir TCLLIBDIR=%_libdir install
+make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} TCLLIBDIR=%{_libdir} DATADIR=%{_datadir} install
 
 %pre
 # if not present, add moomps user (even when upgrading):
 if ! %_sbindir/usermod -l moomps moomps 2>/dev/null; then
-    %_sbindir/fedora-useradd 23 -r -d /srv/moomps\
+    %_sbindir/fedora-useradd 23 -r -d /usr/share/moomps\
         -c 'service companion to moodss' -s '/sbin/nologin' moomps
 fi
 
@@ -53,8 +53,8 @@
 %post
 # fix moodss modules path (useful on x86_64 architecture):
 sed\
-    -e 's,lappend auto_path /usr/lib/moodss,lappend auto_path %_libdir/moodss,'\
-    -i %_sbindir/moomps
+    -e 's,lappend auto_path /usr/lib/moodss,lappend auto_path %{_libdir}/moodss,'\
+    -i %{_sbindir}/moomps
 if [ $1 -eq 1 ]; then                                               # installing
     chkconfig --add moomps
 fi
@@ -71,17 +71,20 @@
 %files
 %defattr(-,root,root,-)
 %doc documentation/COPYRIGHT documentation/moomps*.htm
-%_mandir/man1/moomps.*
-%_sbindir/moomps
-%_initrddir/moomps
-%dir %attr(0755,moomps,root) %_sysconfdir/moomps
-/srv/moomps
-%dir %attr(0755,moomps,root) /srv/moomps
+%{_mandir}/man1/moomps.*
+%{_sbindir}/moomps
+%{_initrddir}/moomps
+%dir %attr(0755,moomps,root) %{_sysconfdir}/moomps
+%{_datadir}/moomps
+%dir %attr(0755,moomps,root) %{_datadir}/moomps
 # secure rc file as it may contain a database password:
-%config(noreplace) %attr(0600,moomps,root) %_sysconfdir/moomps/rc
+%config(noreplace) %attr(0600,moomps,root) %{_sysconfdir}/moomps/rc
 
 
 %changelog
+* Fri Jan  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 5.8-5
+- make /usr/share/moomps the homedir instead of /srv
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.8-4
 - fix license tag