- proper syntax for new version

[packages/arpd.git] / arpd.spec

diff --git a/arpd.spec b/arpd.spec
index a166a11bc38630d8400baeb70a96739976bbe6c1..8bbd78e72bb30b59832eb49a4338657002167080 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:       3
+Release:       5
 License:       GPL
 Group:         Daemons
 Group(de):     Server
@@ -17,6 +17,8 @@ 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
@@ -28,6 +30,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
@@ -38,6 +42,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
@@ -51,13 +57,17 @@ wersja potrafi zaakceptowa
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{usr/sbin,etc/rc.d/init.d,/var/lib/arpd}
+install -d $RPM_BUILD_ROOT/{usr/sbin,etc/rc.d/init.d}
 
 install arpd $RPM_BUILD_ROOT%{_sbindir}/arpd
 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
 if [ -n "`id -u arpd 2>/dev/null`" ]; then
        if [ "`id -u arpd`" != "40" ]; then
@@ -66,32 +76,17 @@ if [ -n "`id -u arpd 2>/dev/null`" ]; then
        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
+       /usr/sbin/useradd -u 40 -r -d /no/home -s /bin/false -c "arpd user" -g daemon arpd 1>&2
 fi
 
 %post
 /sbin/chkconfig --add arpd
-if [ ! -e /dev/arpd ]; then
-       echo "Making /dev/arpd device"
-       mknod /dev/arpd c 36 8 
-       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
-else
-       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
-       fi
-fi
-echo "You need arpd kernel support. The standard kernels of PLD lack this support!!"
 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
+chown arpd:root /dev/arpd
 
 
 %preun
@@ -101,10 +96,6 @@ if [ "$1" = "0" ]; then
                /etc/rc.d/init.d/arpd stop 1>&2
        fi
        /sbin/chkconfig --del arpd
-       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
 fi
 
 %postun
@@ -121,4 +112,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/*