diff --git a/.cvsignore b/.cvsignore index 48b729a..b7d088e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sqlgrey-1.7.4.tar.bz2 +sqlgrey-1.7.5.tar.bz2 diff --git a/sources b/sources index acdc407..cea9ebb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b84931d638c3527e2dabc26ad6754bc0 sqlgrey-1.7.4.tar.bz2 +53d6c3f318af8ffdd176361242268309 sqlgrey-1.7.5.tar.bz2 diff --git a/sqlgrey.spec b/sqlgrey.spec index e32d2a4..4e67354 100644 --- a/sqlgrey.spec +++ b/sqlgrey.spec @@ -1,6 +1,6 @@ Name: sqlgrey -Version: 1.7.4 -Release: 5%{?dist} +Version: 1.7.5 +Release: 1%{?dist} Summary: Postfix grey-listing policy service Group: System Environment/Daemons License: GPL @@ -19,8 +19,6 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service -Requires(postun): fedora-usermgmt -Requires(pre): fedora-usermgmt %description SQLgrey is a Postfix grey-listing policy service with auto-white-listing @@ -67,9 +65,11 @@ rm -rf $RPM_BUILD_ROOT %attr(644,root,root) %config %{_sysconfdir}/sqlgrey/README %pre -/usr/sbin/fedora-groupadd 26 -r sqlgrey &>/dev/null || : -/usr/sbin/fedora-useradd 26 -r -s /sbin/nologin -d /var/lib/sqlgrey -M \ - -c 'SQLgrey Server' -g sqlgrey sqlgrey &>/dev/null || : +if ! id sqlgrey &>/dev/null ; then + /usr/sbin/groupadd -r sqlgrey || : + /usr/sbin/useradd -r -s /sbin/nologin -d /var/lib/sqlgrey -M \ + -c 'SQLgrey Server' -g sqlgrey sqlgrey || : +fi %post /sbin/chkconfig --add sqlgrey || : @@ -81,13 +81,12 @@ if [ "$1" -eq 0 ]; then /sbin/chkconfig --del sqlgrey || : fi -%postun -if [ "$1" -eq 0 ]; then - /usr/sbin/fedora-userdel sqlgrey &>/dev/null || : - /usr/sbin/fedora-groupdel sqlgrey &>/dev/null || : -fi - %changelog +* Mon Mar 12 2007 Steven Pritchard 1.7.5-1 +- Update to 1.7.5 +- Drop fedora-usermgmt requirement +- Don't remove the sqlgrey user on uninstall + * Thu Dec 14 2006 Steven Pritchard 1.7.4-5 - Add missing echos to init script