- updated - uses device in /var/lib/arpd now

[packages/arpd.git] / arpd.spec

diff --git a/arpd.spec b/arpd.spec
index de3d3fb7c3631d75c00e52c4eb9bff5e20839733..c59b7febc78d28ce7bb0f4a3eee2db67be827797 100644 (file)
--- a/arpd.spec
+++ b/arpd.spec
@@ -2,7 +2,7 @@ Summary:        User-space arp daemon
 Summary(pl):   Demon arpd
 Name:          arpd
 Version:       1.0.2
-Release:       4
+Release:       5
 License:       GPL
 Group:         Daemons
 Group(de):     Server
@@ -17,7 +17,7 @@ Patch4:               %{name}-uid.patch
 Prereq:                /sbin/chkconfig
 Prereq:                rc-scripts >= 0.2.0
 Prereq:                fileutils
-Requires:      dev >= 2.8.0-3
+BuildRequires: fakeroot
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,6 +29,8 @@ daemon your kernel needs to have ARPD and NETLINK support enabled. The
 standard kernels of PLD lack this support. It shouldn't be run without
 that!! This version can alocate 2048 entries.
 
+This is version which runs at UID=40.
+
 %description -l pl
 Demon ARP przekazuje zarz±dzanie tablic± ARP (Address Resolution
 Protocol) z kernel'a do przestrzeni u¿ytkownika. Jest to bardzo
@@ -39,6 +41,8 @@ support uaktywnione w j
 supportu ARPD!!. Demon nie powinien byæ startowany bez tego!! Ta
 wersja potrafi zaakceptowaæ 2048 pozycji.
 
+Ta wersja pracuje na UID=40.
+
 %prep
 %setup  -q -n %{name}-%{version}.orig
 %patch0 -p1
@@ -59,31 +63,44 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/arpd
 
 gzip -9nf CHANGES
 
+# making device with fakeroot:
+cd $RPM_BUILD_ROOT/var/lib/arpd
+mknod arpd c 36 8
+
 %pre
-USER=arpd; UID=40; HOMEDIR=/var/lib/arpd; COMMENT="arpd user"
-GROUP=daemon; %useradd
+if [ -n "`id -u arpd 2>/dev/null`" ]; then
+       if [ "`id -u arpd`" != "40" ]; then
+               echo "Warning: user arpd haven't uid=40. Correct this before installing arpd." 1>&2
+               exit 1
+       fi
+else
+       echo "Adding arpd user (UID=40)"
+       /usr/sbin/useradd -u 40 -r -d /var/lib/arpd -s /bin/false -c "arpd user" -g daemon arpd 1>&2
+fi
 
 %post
-if [ ! -L /dev/arpd ]; then
-       echo "Moving /dev/arpd to /var/lib/arpd/arpd and making symlink"
-       mv -f /dev/arpd /var/lib/arpd
-       chown arpd /var/lib/arpd/arpd
-       ln -s /var/lib/arpd/arpd dev/arpd
+/sbin/chkconfig --add arpd
+if [ -f /var/lock/subsys/arpd ]; then
+       /etc/rc.d/init.d/arpd restart 1>&2
+else
+       echo "Run \"/etc/rc.d/init.d/arpd start\" to start arpd daemon."
 fi
-echo "You need arpd kernel support. The standard kernels of PLD lack this support!!"
-DESC="arpd daemon"; %chkconfig_post
+
 
 %preun
-%chkconfig_preun
+/sbin/chkconfig --del arpd
 if [ "$1" = "0" ]; then
-       echo "Moving /var/lib/arpd/arpd to /dev/arpd and removing symlink"
-       rm -f /dev/arpd
-       mv -f /var/lib/arpd/arpd /dev/arpd
-       chown root:root /dev/arpd
+       if [ -f /var/lock/subsys/arpd ]; then
+               /etc/rc.d/init.d/arpd stop 1>&2
+       fi
+       /sbin/chkconfig --del arpd
 fi
 
 %postun
-USER=arpd; %userdel
+if [ "$1" = "0" ]; then
+       echo "Removing arpd user (UID=40)"
+       /usr/sbin/userdel arpd
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,4 +110,4 @@ rm -rf $RPM_BUILD_ROOT
 %doc *.gz README.html
 %attr(754,root,root) %{_sbindir}/arpd
 %attr(754,root,root) /etc/rc.d/init.d/arpd
-%dir %attr(750,arpd,root) /var/lib/arpd
+%dir %attr(750,arpd,root) /var/lib/arpd/*