- modifications in daemon start

[packages/dibbler.git] / dibbler.spec

diff --git a/dibbler.spec b/dibbler.spec
index b206a78092d2b720d385672f98b1cb34b70fa3ca..9cae47e61ba39ad20aff6425b912d931d01ce6b6 100644 (file)
--- a/dibbler.spec
+++ b/dibbler.spec
@@ -10,11 +10,11 @@ Source0:    http://klub.com.pl/dhcpv6/%{name}-%{version}-src.tar.gz
 Patch0:                %{name}-Makefile.patch
 URL:           http://klub.com.pl/dhcpv6/
 #BuildRequires:        bison++ >= 1.21.9
-BuildRequires: chkconfig
 BuildRequires: flex
 BuildRequires: libstdc++-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
+Requires(post,preun):  /sbin/chkconfig
 #Provides:     dhcpd?
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,21 +55,19 @@ Group:              Networking/Daemons
 DHCPv6 protocol client.
 
 %description client -l pl
-Klient protokolu DHCPv6
+Klient protoko³u DHCPv6.
 
 %prep
 %setup -q -n %{name}
 %patch0 -p0
 
 %build
-%{__make} \
+%{__make} server client \
        ARCH=LINUX \
        CFLAGS="%{rpmcflags}" \
        CPP="%{__cpp}" \
        CXX="%{__cxx}" \
-       CC="%{__cc}" \
-       server \
-       client
+       CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -79,45 +77,50 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
 install dibbler-{client,server} $RPM_BUILD_ROOT%{_sbindir}
 install *.conf $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
 install doc/man/* $RPM_BUILD_ROOT%{_mandir}/man8
+ln -sf %{_sharedstatedir}/%{name}/server.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/server.conf
+ln -sf %{_sharedstatedir}/%{name}/client.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/client.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-ln -s %{_sharedstatedir}/%{name}/server.conf %{_sysconfdir}/%{name}/server.conf
-/sbin/chkconfig -add dibbler
+/sbin/ldconfig
+/sbin/chkconfig --add dibbler
+#if [ -f /var/lock/subsys/dibbler ]; then
+#        /etc/rc.d/init.d/dibbler restart 1>&2
+#else
+        echo "Run \"/etc/rc.d/init.d/dibbler start\" to start dibbler DHCP daemon."
+#fi
+
 
 %preun
-if [ "$1" = "0" ];then
-        if [ -f /var/lock/subsys/dhcpd ]; then
-                /etc/rc.d/init.d/dhcpd stop >&2
-        fi
-        /sbin/chkconfig --del dhcpd
-fi
-
-%post client
-if [ -d %{_sharedstatedir}/%{name} ]; then
-install -d %{_sharedstatedir}/%{name}
-ln -s %{_sharedstatedir}/%{name}/client.conf %{_sysconfdir}/%{name}/client.conf
-fi
+#if [ "$1" = "0" ];then
+#      if [ -f /var/lock/subsys/dhcpd ]; then
+#              /etc/rc.d/init.d/dhcpd stop >&2
+#      fi
+#      /sbin/chkconfig --del dhcpd
+#fi
 
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG FUN LICENSE GUIDELINES RELNOTES TODO VERSION WILD-IDEAS 
 %doc server.conf server-stateless.conf doc/man/dibbler-server.8
-%attr(755,root,root) 
-%{_sbindir}/dibbler-server
+%attr(755,root,root) %{_sbindir}/dibbler-server
 %dir %{_sharedstatedir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/%{name}/server.conf
+%dir %{_sysconfdir}/%{name}
+%{_sysconfdir}/%{name}/server.conf
 %{_mandir}/man8/*.8*
 
 %files client
 %defattr(644,root,root,755)
 %doc CHANGELOG FUN LICENSE GUIDELINES RELNOTES TODO VERSION WILD-IDEAS
 %doc client.conf client-stateless.conf doc/man/dibbler-client.8
-%{_sbindir}/dibbler-client
+%attr(755,root,root) %{_sbindir}/dibbler-client
 %dir %{_sharedstatedir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/%{name}/client.conf
+%dir %{_sysconfdir}/%{name}
+%{_sysconfdir}/%{name}/client.conf
 %{_mandir}/man8/*.8*
 
 #%files doc