dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-sqlgrey-1.7.4.tar.bz2

.gitignore

@@ -0,0 +1 @@
+sqlgrey-1.7.5.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: sqlgrey
-# $Id$
-NAME := sqlgrey
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-b84931d638c3527e2dabc26ad6754bc0  sqlgrey-1.7.4.tar.bz2
+53d6c3f318af8ffdd176361242268309  sqlgrey-1.7.5.tar.bz2

sqlgrey.spec

@@ -1,6 +1,6 @@
 Name:           sqlgrey
-Version:        1.7.4
+Version:        1.7.5
-Release:        5%{?dist}
+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 || :
+if ! id sqlgrey &>/dev/null ; then
-/usr/sbin/fedora-useradd  26 -r -s /sbin/nologin -d /var/lib/sqlgrey -M \
+    /usr/sbin/groupadd -r sqlgrey || :
-        -c 'SQLgrey Server' -g sqlgrey sqlgrey &>/dev/null || :
+    /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 <steve@kspei.com> 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 <steve@kspei.com> 1.7.4-5
 - Add missing echos to init script