Author: glen Date: Wed Dec 6 08:47:57 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- deps for useradd/userremove
- disable not yet used parts
---- Files affected:
SPECS:
dkfilter.spec (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SPECS/dkfilter.spec
diff -u SPECS/dkfilter.spec:1.8 SPECS/dkfilter.spec:1.9
--- SPECS/dkfilter.spec:1.8 Wed Dec 6 09:38:46 2006
+++ SPECS/dkfilter.spec Wed Dec 6 09:47:52 2006
@@ -20,10 +20,6 @@
Patch0: %{name}-perllib.patch
Patch1: %{name}-config_file.patch
URL: http://jason.long.name/dkfilter/
-Requires(post,preun): /sbin/chkconfig
-Requires(postun): /usr/sbin/userdel
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/useradd
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: perl-Crypt-OpenSSL-RSA
@@ -31,6 +27,15 @@
BuildRequires: perl-Net-Server >= 0.89
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpmbuild(macros) >= 1.202
+Requires(post,preun): /sbin/chkconfig
+%if 0
+Requires(postun): /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/useradd
+Provides: user(dkfilter)
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/%{name}
@@ -81,9 +86,11 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%if 0
%pre
-#what uid and gid shuld i use here ???
-#%%useradd -P %{name} -u 40 -s /bin/false -c "Dkfilter User" -g dkfilter
dkfilter
+# what uid and gid shuld i use here ???
+%useradd -u 40 -s /bin/false -c "Dkfilter User" -g dkfilter dkfilter
+%endif
%post
/sbin/chkconfig --add dkfilter
@@ -91,14 +98,16 @@
%preun
if [ "$1" = "0" ]; then
- %service dkfilter stop
- /sbin/chkconfig --del dkfilter
+ %service dkfilter stop
+ /sbin/chkconfig --del dkfilter
fi
+%if 0
%postun
if [ "$1" = "0" ]; then
- %userremove dkfilter
+ %userremove dkfilter
fi
+%endif
%files
%defattr(644,root,root,755)
@@ -126,6 +135,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2006/12/06 08:47:52 glen
+- deps for useradd/userremove
+- disable not yet used parts
+
Revision 1.8 2006/12/06 08:38:46 grzegorz
- added dkfilter-example-private.key
- start chkconfig & useradd (can anybody look at this?)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/dkfilter.spec?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
