- pldize

Changed files:
    hula.spec -> 1.2

diff --git a/hula.spec b/hula.spec
index 541ab1f3089c5e30ed48146afc68706cce94c56a..970ec9d44aaaa9a1a8c186d6a0e5fcc7685ea638 100644 (file)
--- a/hula.spec
+++ b/hula.spec
@@ -1,3 +1,5 @@
+# TODO
+# - register uid in PLD-doc/uid_gid.db.txt and use it
 Summary:       A calendar and mail server
 Name:          hula
 Version:       r1164
@@ -12,6 +14,12 @@ BuildRequires:       autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: openssl-devel
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(post,postun): /sbin/ldconfig
+Requires(postun):      /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/useradd
+Provides:      user(hula)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,45 +40,47 @@ add-ons for hula.
 %setup -q
 
 %build
-./autogen.sh --with-user=hula
+./autogen.sh \
+       --with-user=hula
 %configure
-%{__make} %{?_smp_mflags}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/hula
+
 # remove all .la files
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/connmgr/*.la \
+rm -f $RPM_BUILD_ROOT%{_libdir}/connmgr/*.la \
            $RPM_BUILD_ROOT%{_libdir}/hulamdb/*.la \
            $RPM_BUILD_ROOT%{_libdir}/*.la \
            $RPM_BUILD_ROOT%{_libdir}/modweb/*.la
 
 # remove empty or irrelevant doco
-for foo in ChangeLog INSTALL NEWS; do
-  /bin/rm -rf $RPM_BUILD_ROOT/$foo
-done
+rm -f $RPM_BUILD_ROOT/{ChangeLog,INSTALL,NEWS}
 
-install -D %{SOURCE1} -D $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/hula
+%pre
+# Create system user for hula
+# TODO: use specific uid
+%useradd -c "Hula" -s /sbin/nologin -r hula
 
 %post
 /sbin/ldconfig
-if [ $1 = 1 ]; then
-  /sbin/chkconfig --add hula
-fi
-
-%pre
-# Create system user for hula
-/usr/sbin/useradd -c "Hula" -s /sbin/nologin -r hula 2> /dev/null || :
+/sbin/chkconfig --add hula
 
 %preun
-if [ $1 -eq 0 ]; then
-  /sbin/service hula stop >/dev/null 2>&1 ||:
-  /sbin/chkconfig --del hula
+if [ "$1" -eq 0 ]; then
+       %service hula stop
+       /sbin/chkconfig --del hula
 fi
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+       %userremove lula
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT