X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dhcpcd.spec;h=f6b3bf7ea2aee205ba780f576ad489fd780ff9c4;hb=0da4cc36b86d276e01a4953d5555f1ba8fe7ed15;hp=1a220bb43e9ebfb221a47db05bbda74f0c68c751;hpb=69b5f9bc49b4501c42eee1a38981b8e609124efc;p=packages%2Fdhcpcd.git

diff --git a/dhcpcd.spec b/dhcpcd.spec
index 1a220bb..f6b3bf7 100644
--- a/dhcpcd.spec
+++ b/dhcpcd.spec
@@ -6,19 +6,17 @@ Summary(pl.UTF-8):	Klient (daemon) DHCP
 Summary(pt_BR.UTF-8):	Servidor DHCPC
 Summary(tr.UTF-8):	DHCPC sunucu süreçi (daemon)
 Name:		dhcpcd
-Version:	3.1.8
-Release:	4
-License:	GPL v2
+Version:	5.5.6
+Release:	1
+License:	BSD
 Group:		Networking/Daemons
-#Source0Download: http://developer.berlios.de/project/filelist.php?group_id=4229
-Source0:	http://download.berlios.de/dhcpcd/%{name}-%{version}.tar.bz2
-# Source0-md5:	6332c695e28100acbb84730e7ff7f6e9
-Patch0:		%{name}-ntp-path.patch
-Patch1:		%{name}-daemon_facility.patch
-URL:		http://developer.berlios.de/projects/dhcpcd/
+Source0:	http://roy.marples.name/downloads/dhcpcd/%{name}-%{version}.tar.bz2
+# Source0-md5:	a5c0e43b4e836cfc003437329f6b7982
+URL:		http://roy.marples.name/projects/dhcpcd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
+%define		_libexecdir	%{_libdir}/%{name}
 
 %description
 dhcpcd is an implementation of the DHCP client specified in
@@ -62,11 +60,11 @@ aussi de renouveler le « lease time » selon les RFC1541 ou
 draft-ietf-dhc-dhcp-09.
 
 %description -l pl.UTF-8
-dhcpd jest implementacja klienta DHCP, opisaną w
+dhcpd jest implementacją klienta DHCP, opisaną w
 draft-ietf-dhc-dhcp-09 (kiedy nie podaje się opcji -r) oraz RFC1544
 (kiedy podaje się opcję -r).
 
-Pobiera on informację o komputerze (adres IP, maska sieci, adres
+Pobiera on informacje o komputerze (adres IP, maska sieci, adres
 rozgłoszeniowy itd.) i konfiguruje interfejs sieciowy maszyny, na
 której jest uruchomiony. Próbuje również odświeżyć czas przestoju
 zgodnie z RFC1541 oraz draft-ietf-dhc-dhcp-09.
@@ -88,36 +86,33 @@ kira zamanını (lease time) yenilemeye çalışır.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-%{__make} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}" \
-	LDFLAGS="%{rpmcflags} %{rpmldflags}" \
-	mandir=%{_mandir} \
-	sbindir=%{_sbindir}
+%configure \
+	--dbdir=%{_sharedstatedir}/dhcpcd
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/var/lib/dhcpcd}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sharedstatedir}/dhcpcd}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	mandir=%{_mandir} \
-	sbindir=%{_sbindir}
+	DESTDIR=$RPM_BUILD_ROOT
 
-# do not put executable bit here when installing
-cp -a dhcpcd.sh $RPM_BUILD_ROOT%{_sysconfdir}/dhcpcd.sh
+touch $RPM_BUILD_ROOT%{_sysconfdir}/dhcpcd.{enter-hook,exit-hook}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcpcd.sh
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*-hook
 %attr(755,root,root) %{_sbindir}/dhcpcd
-%dir %{_var}/lib/dhcpcd
-%{_mandir}/man8/dhcpcd.8*
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/dhcpcd-hooks
+%attr(755,root,root) %{_libdir}/%{name}/dhcpcd-hooks/*
+%attr(755,root,root) %{_libdir}/%{name}/dhcpcd-run-hooks
+%dir %{_sharedstatedir}/dhcpcd
+%{_mandir}/man?/dhcpcd*.*