Author: glen Date: Mon Feb 20 20:59:54 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - fix broken quotes - avoid usermod users that don't exist - fixed possibly broken upgrade - rel 6, STBR
---- Files affected: SPECS: zmailer.spec (1.80 -> 1.81) ---- Diffs: ================================================================ Index: SPECS/zmailer.spec diff -u SPECS/zmailer.spec:1.80 SPECS/zmailer.spec:1.81 --- SPECS/zmailer.spec:1.80 Wed Jan 18 21:30:19 2006 +++ SPECS/zmailer.spec Mon Feb 20 21:59:49 2006 @@ -1,7 +1,4 @@ # $Revision$, $Date$ -# -# TODO: fix petidomo user reference -# # Conditional build: %bcond_without whoson # build without WHOSON support %bcond_without ldap # build without LDAP support @@ -11,9 +8,8 @@ Summary(pl): Bezpieczny MTA dla Wymagających Ekstremalnej Wydajności Name: zmailer Version: 2.99.56 -Release: 5 +Release: 6 License: GPL -Vendor: Matti Aarnio <[EMAIL PROTECTED]> Group: Networking/Daemons Source0: ftp://ftp.funet.fi/pub/unix/mail/zmailer/src/%{name}-%{version}.tar.gz # Source0-md5: c94cc0c2e2427a210a046a02ac4c2d50 @@ -25,6 +21,7 @@ Patch1: %{name}-ldap-lmap.patch Patch2: %{name}-glibc.patch Patch3: %{name}-sleepycatdb.patch +URL: http://www.zmailer.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: db-devel @@ -37,7 +34,6 @@ BuildRequires: perl-devel BuildRequires: rpmbuild(macros) >= 1.159 %{?with_whoson:BuildRequires: whoson-devel} -URL: http://www.zmailer.org/ Requires(post): fileutils Requires(post): grep Requires(post): net-tools @@ -132,7 +128,7 @@ # --prefix=%{_libdir}/zmailer \ # --with-zconfig=no -%{__make} all \ +%{__make} -j1 all \ COPTS="%{rpmcflags} -w" %install @@ -278,23 +274,24 @@ %{_libdir}/zmailer/policy-builder.sh -n %preun -if [ -e /var/lock/subsys/zmailer ]; then - /etc/rc.d/init.d/zmailer stop || : -fi - -rm -f /var/spool/postoffice/.pid.* - if [ "$1" = "0" ]; then + if [ -e /var/lock/subsys/zmailer ]; then + /etc/rc.d/init.d/zmailer stop || : + fi + + rm -f /var/spool/postoffice/.pid.* /sbin/chkconfig --del zmailer fi %pre %groupadd -g 47 zmailer -# FIXME: petidomo user undefined (anywhere) so may be not existent for u in root petidomo uucp daemon news; do + if [ -z "`/bin/id -u $u 2>/dev/null`" ]; then + continue + fi GROUPS=`/bin/id -n -G $u | sed 's/ /,/g'` - if [ -z `echo $GROUPS | grep '\(^\|,\)zmailer\($\|,\)'; then - /usr/sbin/usermod -G "${GROUPS},zmailer" $u 1>&2 ||: + if [ -z "`echo $GROUPS | grep '\(^\|,\)zmailer\($\|,\)'`" ]; then + /usr/sbin/usermod -G "${GROUPS},zmailer" $u 1>&2 || : fi done @@ -368,6 +365,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.81 2006/02/20 20:59:49 glen +- fix broken quotes +- avoid usermod users that don't exist +- fixed possibly broken upgrade +- rel 6, STBR + Revision 1.80 2006/01/18 20:30:19 ankry - FIXME updated ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/zmailer.spec?r1=1.80&r2=1.81&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
