summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2006-04-16 20:52:33 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit6aed960e90a8d6e2ac2daaa42fc933459a794712 (patch)
tree9d1e39e9beccb996595cca2a8e7c4164d6bbadad
parent4d0ab19ab806568c2082bb4dbcc09ab8bfb64fef (diff)
downloadbfilter-6aed960e90a8d6e2ac2daaa42fc933459a794712.zip
bfilter-6aed960e90a8d6e2ac2daaa42fc933459a794712.tar.gz
- use %service
Changed files: bfilter.spec -> 1.9
-rw-r--r--bfilter.spec16
1 files changed, 5 insertions, 11 deletions
diff --git a/bfilter.spec b/bfilter.spec
index 0de3979..212914a 100644
--- a/bfilter.spec
+++ b/bfilter.spec
@@ -13,13 +13,13 @@ Source0: http://dl.sourceforge.net/bfilter/%{name}-%{version}.tar.gz
# Source0-md5: 72ca85565bd4c556b06e3a264c0c24f1
Source1: %{name}.init
URL: http://bfilter.sf.net
+BuildRequires: broken-pre-scriptlet(fix:user/group)
BuildRequires: libsigc++12-devel
BuildRequires: libstdc++-devel
BuildRequires: pkgconfig
BuildRequires: popt-devel
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: zlib-devel
-BuildRequires: rpmbuild(macros) >= 1.202
-BuildRequires: broken-pre-scriptlet(fix user/group)
Requires(post): /usr/sbin/groupadd
Requires(post): /usr/sbin/useradd
Requires(post,preun): /sbin/chkconfig
@@ -61,21 +61,15 @@ rm -rf $RPM_BUILD_ROOT
# XXX: unify
# TODO register uid/gid in uid_gid.db.txt
%groupadd -r -g XXX -f %{name}
-%useradd -r -u XXX -s /bin/false -d / -M -g %{name} -c 'BFilter filtering proxy' %{name}
+%useradd -r -u XXX -s /bin/false -d / -M -g %{name} -c "BFilter filtering proxy" %{name}
%post
/sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
- /etc/rc.d/init.d/%{name} restart 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/%{name} start\" to start %{name}." 1>&2
-fi
+%service %{name} restart
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/%{name} ]; then
- /etc/rc.d/init.d/%{name} stop 1>&2
- fi
+ %service %{name} stop
/sbin/chkconfig --del %{name}
fi