Author: glen Date: Sun Apr 16 21:10:27 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service
---- Files affected: SPECS: courier-sox.spec (1.12 -> 1.13) , courier.spec (1.130 -> 1.131) ---- Diffs: ================================================================ Index: SPECS/courier-sox.spec diff -u SPECS/courier-sox.spec:1.12 SPECS/courier-sox.spec:1.13 --- SPECS/courier-sox.spec:1.12 Thu Nov 3 21:15:43 2005 +++ SPECS/courier-sox.spec Sun Apr 16 23:10:22 2006 @@ -6,7 +6,6 @@ Release: 1 License: GPL Group: Networking/Daemons -#Source0: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2 Source0: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2 # Source0-md5: 32fde0bf5c755092722894006444dc9f Patch0: %{name}-build.patch @@ -15,8 +14,9 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: courier-authlib-devel -BuildRequires: libtool BuildRequires: libltdl-devel +BuildRequires: libtool +BuildRequires: rpmbuild(macros) >= 1.268 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _libexecdir %{_libdir}/courier-sox @@ -45,8 +45,8 @@ Summary: Socks 5 server Summary(pl): Serwer socks 5 Group: Networking/Utilities -Requires: %{name} = %{version}-%{release} Requires(post,preun): /sbin/chkconfig +Requires: %{name} = %{version}-%{release} %description server This package contains the Courier Socks 5 server. Install this package @@ -107,18 +107,11 @@ %post server /sbin/chkconfig --add courier-sox - -if [ -f /var/lock/subsys/courier-sox ]; then - /etc/rc.d/init.d/courier-sox restart >&2 -else - echo "Run \"/etc/rc.d/init.d/courier-sox start\" to start courier-sox" -fi +%service courier-sox restart %preun server if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/courier-sox ]; then - /etc/rc.d/init.d/courier-sox stop - fi + %service courier-sox stop /sbin/chkconfig --del courier-sox fi @@ -156,6 +149,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2006/04/16 21:10:22 glen +- use %service + Revision 1.12 2005/11/03 20:15:43 glen - unify sf url, and other things that adapter felt neccessary @@ -164,7 +160,7 @@ - changed source0 address Revision 1.10 2005/07/11 11:18:09 andree -- updated %%descripiton +- updated %descripiton Revision 1.9 2005/04/28 07:11:27 andree - refresh config.sub; rel. 3 @@ -179,7 +175,7 @@ - rel. 1 (builds&works) Revision 1.6 2005/04/16 01:01:39 andree -- %%post, %%files fixes +- %post, %files fixes Revision 1.5 2005/04/16 00:11:30 andree - splited server package ================================================================ Index: SPECS/courier.spec diff -u SPECS/courier.spec:1.130 SPECS/courier.spec:1.131 --- SPECS/courier.spec:1.130 Fri Feb 3 17:43:55 2006 +++ SPECS/courier.spec Sun Apr 16 23:10:22 2006 @@ -2,6 +2,7 @@ # TODO # - test and bump rel. to 1 # - doesn't -webadmin need webserver integration? +# - use rc-scripts here in %%post scriptlets # # Conditional build: %bcond_without fam # with fam support @@ -447,12 +448,9 @@ echo %post -/sbin/chkconfig --add courier - if [ "$1" = "1" ]; then - /bin/hostname -f > /etc/courier/me - # TODO: use %banner - cat <<EOF + [ -s /etc/courier/me ] || /bin/hostname -f > /etc/courier/me + %banner -e %{name} <<'EOF' Now courier will refuse to accept SMTP messages except to localhost add hosts to /etc/courier/esmtpacceptmailfor.dir/default @@ -469,23 +467,17 @@ EOF fi -if [ -e /var/lock/subsys/courier ]; then - %{_initrddir}/courier restart -else - echo - echo 'Type "%{_initrddir}/courier start" to start courier' - echo -fi +/sbin/chkconfig --add courier +%service courier restart %preun if [ "$1" = "0" ]; then - if [ -e /var/lock/subsys/courier ]; then - %{_initrddir}/courier stop - fi + %service courier stop /sbin/chkconfig --del courier fi %post imapd +# TODO: use rc-scripts here if [ -e %{_localstatedir}/tmp/imapd.pid ]; then %{_sbindir}/imapd stop %{_sbindir}/imapd start @@ -921,6 +913,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.131 2006/04/16 21:10:22 glen +- use %service + Revision 1.130 2006/02/03 16:43:55 baggins - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/courier-sox.spec?r1=1.12&r2=1.13&f=u http://cvs.pld-linux.org/SPECS/courier.spec?r1=1.130&r2=1.131&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
