packages: spamass-milter/spamass-milter.spec - use %service, adapter
glen
glen at pld-linux.org
Mon Aug 8 09:22:44 CEST 2011
Author: glen Date: Mon Aug 8 07:22:44 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- use %service, adapter
---- Files affected:
packages/spamass-milter:
spamass-milter.spec (1.11 -> 1.12)
---- Diffs:
================================================================
Index: packages/spamass-milter/spamass-milter.spec
diff -u packages/spamass-milter/spamass-milter.spec:1.11 packages/spamass-milter/spamass-milter.spec:1.12
--- packages/spamass-milter/spamass-milter.spec:1.11 Thu Jul 14 21:38:21 2011
+++ packages/spamass-milter/spamass-milter.spec Mon Aug 8 09:22:38 2011
@@ -5,7 +5,7 @@
Version: 0.3.2
Release: 1
License: GPL
-Group: System Environment/Daemons
+Group: Daemons
Source0: http://savannah.nongnu.org/download/spamass-milt/%{name}-%{version}.tar.gz
# Source0-md5: 964b011fe7d7eddfdb6d94f4767feab8
Source1: %{name}.init
@@ -17,12 +17,13 @@
Patch4: %{name}-group.patch
Patch5: %{name}-ipv6.patch
Patch6: %{name}-rejectmsg.patch
-URL: http://savannah.gnu.org/projects/spamass-milt/
+URL: https://savannah.nongnu.org/projects/spamass-milt/
BuildRequires: libmilter-devel
BuildRequires: libstdc++-devel
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: spamassassin
BuildRequires: spamassassin-spamc
-PreReq: rc-scripts
+Requires: rc-scripts
Requires(post,preun): /sbin/chkconfig
Requires: spamassassin
# Requires sendmail to have milter support, too.
@@ -61,26 +62,20 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/spamass-milter
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/spamass-milter
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/spamass-milter
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/spamass-milter
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/chkconfig --add spamass-milter
-if [ -f /var/lock/subsys/spamass-milter ]; then
- /etc/rc.d/init.d/spamass-milter restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/spamass-milter start\" to start spamass-milter daemon." >&2
-fi
+%service spamass-milter restart
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/spamass-milter ]; then
- /etc/rc.d/init.d/spamass-milter stop >&2
- fi
+ %service spamass-milter stop
/sbin/chkconfig --del spamass-milter
fi
@@ -98,6 +93,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2011/08/08 07:22:38 glen
+- use %service, adapter
+
Revision 1.11 2011/07/14 19:38:21 hawk
- patch for setting custom reject message
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spamass-milter/spamass-milter.spec?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list