SPECS: dhcpv6.spec - up to 1.0.3 - still lots to do (check autotoo...

[patrys]

Author: patrys                       Date: Fri Dec 14 00:40:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.0.3
- still lots to do (check autotool deps, rc-scripts)

---- Files affected:
SPECS:
   dhcpv6.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/dhcpv6.spec
diff -u SPECS/dhcpv6.spec:1.25 SPECS/dhcpv6.spec:1.26
--- SPECS/dhcpv6.spec:1.25	Fri Mar  9 19:11:00 2007
+++ SPECS/dhcpv6.spec	Fri Dec 14 01:40:39 2007
@@ -1,29 +1,21 @@
 # $Revision$, $Date$
 # TODO:
-# - test it
-# - pld has rc-scripts not initscripts
 # - obsoletes when renaming a package
 # - subpackage for relay daemon
 # - use %%service
 Summary:	DHCPv6 - DHCP server and client for IPv6
 Summary(pl.UTF-8):	DHCPv6 - serwer i klient DHCP dla IPv6
 Name:		dhcpv6
-Version:	0.10
-Release:	0.8
+Version:	1.0.3
+Release:	0.9
 Epoch:		1
 License:	GPL
 Group:		Networking/Daemons
-Source0:	http://dl.sourceforge.net/dhcpv6/dhcp-%{version}.tgz
-# Source0-md5:	72b802d6c89e15e5cf6b0aecf46613f2
+Source0:	http://dcantrel.fedorapeople.org/dhcpv6/%{name}-%{version}.tar.gz
+# Source0-md5:	7af9760efa2cb2796f75e9911c569054
 Source1:	dhcp6s.init
 Source2:	dhcp6c.init
-Source3:	libdhcp6client.pc
-Patch0:		%{name}-redhat.patch
-Patch1:		%{name}-relay.patch
-Patch2:		%{name}-man.patch
-Patch3:		%{name}-gethwid.patch
-Patch4:		%{name}-no-strlcat.patch
-Patch5:		%{name}-libdhcp6client.patch
+Patch0:		%{name}-configure.patch
 URL:		http://dhcpv6.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	bison
@@ -53,7 +45,7 @@
 Summary:	DHCPv6 client
 Summary(pl.UTF-8):	Klient DHCPv6
 Group:		Applications/Networking
-Requires:	initscripts >= 7.73
+Requires:	rc-scripts
 
 %description -n dhcpv6-client
 Provides the client for the DHCPv6 protocol (RFC 3315) to support
@@ -108,28 +100,17 @@
 Statyczna biblioteka kliencka DHCPv6.
 
 %prep
-%setup -q -n dhcp-%{version}
+%setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-# these things are part of glibc
-rm -f ifaddrs.c ifaddrs.h queue.h
-
-# we don't need these things
-rm -f strlcat.c
-
-sed 's/@DHCPV6_VERSION@/'%{version}'/' < %{SOURCE3} > libdhcp6client.pc
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__automake}
 %configure
 
 %{__make}
-%{__make} -C libdhcp6client
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -140,19 +121,6 @@
 	INSTALL_GROUP=$(id -g) \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} -C libdhcp6client install \
-	INSTALL_USER=$(id -u) \
-	INSTALL_GROUP=$(id -g) \
-	DESTDIR=$RPM_BUILD_ROOT \
-	LIBDIR="%{_libdir}" \
-	PKGCFGDIR="%{_pkgconfigdir}"
-
-install dhcp6c.conf dhcp6s.conf server6_addr.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install dhcp6c.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/dhcp6c
-install dhcp6r.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/dhcp6r
-install dhcp6s.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/dhcp6s
-
-install	dhcp6relay.8	$RPM_BUILD_ROOT%{_mandir}/man8
 install %{SOURCE1}	$RPM_BUILD_ROOT/etc/rc.d/init.d/dhcp6s
 install %{SOURCE2}	$RPM_BUILD_ROOT/etc/rc.d/init.d/dhcp6c
 
@@ -175,22 +143,22 @@
 
 %files
 %defattr(644,root,root,755)
-%doc ReadMe docs/*
+%doc AUTHORS README TODO docs/*
+%attr(755,root,root) %{_sbindir}/dhcp6r
 %attr(755,root,root) %{_sbindir}/dhcp6s
+%attr(754,root,root) /etc/rc.d/init.d/dhcp6r
 %attr(754,root,root) /etc/rc.d/init.d/dhcp6s
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcp6r
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcp6s
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcp6s.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/server6_addr.conf
 %attr(750,root,root) %dir %{_localstatedir}/lib/dhcpv6
+%{_mandir}/man8/dhcp6r.8*
 %{_mandir}/man8/dhcp6s.8*
-%{_mandir}/man8/dhcp6relay.8*
 %{_mandir}/man5/dhcp6s.conf.5*
 
 %files -n dhcpv6-client
 %defattr(644,root,root,755)
-%doc ReadMe dhcp6c.conf
-%attr(755,root,root) /sbin/dhcp6c
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcp6c
+%attr(755,root,root) /%{_sbindir}/dhcp6c
 %attr(754,root,root) /etc/rc.d/init.d/dhcp6c
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcp6c.conf
 %{_mandir}/man8/dhcp6c.8*
@@ -198,11 +166,12 @@
 
 %files -n libdhcp6client
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdhcp6client-%{version}.so.*
+%attr(755,root,root) %{_libdir}/libdhcp6client-*.so.*
 
 %files -n libdhcp6client-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdhcp6client.so
+%{_libdir}/libdhcp6client.la
 %{_includedir}/*
 %{_pkgconfigdir}/libdhcp6client.pc
 
@@ -216,7 +185,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.25  2007-03-09 18:11:00  qboosh
+Revision 1.26  2007-12-14 00:40:39  patrys
+- up to 1.0.3
+- still lots to do (check autotool deps, rc-scripts)
+
+Revision 1.25  2007/03/09 18:11:00  qboosh
 - pl for libdhcp6client*
 
 Revision 1.24  2007/03/05 07:48:43  darekr
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dhcpv6.spec?r1=1.25&r2=1.26&f=u