- use %service

[packages/arpd.git] / arpd.spec

diff --git a/arpd.spec b/arpd.spec
index af8f7bf7d59ffed249367b40b5759c7311c15e83..6464e129e5a91fb27246fc001c6b7b566324e8dc 100644 (file)
--- a/arpd.spec
+++ b/arpd.spec
@@ -2,11 +2,16 @@ Summary:      User-space arp daemon
 Summary(pl):   Demon arpd
 Name:          arpd
 Version:       1.0.2
-Release:       7
+Release:       11
 License:       GPL
 Group:         Daemons
-#Source0:      http://www.loran.com/~layes/arpd/%{name}-%{version}.tar.gz  (origin, but 404)
-Source0:       ftp://ftp.slackware.org:/pub/slackware/slackware-4.0/source/n/tcpip1/%{name}-%{version}.tar.gz
+# origin, but 404
+#Source0:      http://www.loran.com/~layes/arpd/%{name}-%{version}.tar.gz
+# working (copy of original package):
+#Source0:      http://www.funet.fi/pub/Linux/PEOPLE/Linus/net-source/base/%{name}-%{version}.tar.gz
+# but in CVS we probably have some renamed source from Debian (with .orig inside)
+Source0:       %{name}-%{version}.tar.gz
+# Source0-md5: 4b445f5698342c873068a86a18bc3d6a
 Source1:       %{name}-init
 Patch0:                %{name}-%{version}.debian-patch
 Patch1:                %{name}-%{version}.pld-patch
@@ -14,10 +19,11 @@ Patch2:             %{name}-makefile-patch
 Patch3:                %{name}-more_tables.patch
 Patch4:                %{name}-uid.patch
 #URL:          http://www.loran.com/~layes/arpd/
-Prereq:                /sbin/chkconfig
-Prereq:                rc-scripts >= 0.2.0
-Prereq:                fileutils
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(post,preun):  /sbin/chkconfig
 Requires:      dev >= 2.8.0-4
+Requires:      fileutils
+Requires:      rc-scripts >= 0.2.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,15 +46,18 @@ supportu ARPD. Demon nie powinien by
 potrafi zaakceptowaæ 4096 pozycji.
 
 %prep
-%setup  -q -n %{name}-%{version}.orig
+%setup -q -n %{name}-%{version}.orig
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3
+%patch3 -p0
 %patch4 -p1
 
 %build
-%{__make}
+%{__make} \
+       CC="%{__cc}" \
+       LDFLAGS="%{rpmldflags}" \
+       RPM_OPT_FLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,30 +66,21 @@ 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
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /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
+%service arpd restart "arpd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/arpd ]; then
-               /etc/rc.d/init.d/arpd stop 1>&2
-       fi
+       %service aprd stop
        /sbin/chkconfig --del arpd
 fi
 
-
 %files
 %defattr(644,root,root,755)
-%doc *.gz README.html
+%doc CHANGES README.html
 %attr(754,root,root) %{_sbindir}/arpd
 %attr(754,root,root) /etc/rc.d/init.d/arpd