rpms/dhcpv6/devel dhcpv6.spec,1.55,1.56

[David Cantrell (dcantrel)]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcpv6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25458

Modified Files:
	dhcpv6.spec 
Log Message:
* Mon Jun 11 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
- Merge review (#225692)



Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- dhcpv6.spec	26 Apr 2007 18:28:57 -0000	1.55
+++ dhcpv6.spec	11 Jun 2007 18:55:00 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 42%{?dist}
+Release: 43%{?dist}
 License: GPL
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -19,9 +19,11 @@
 
 Patch99: %{name}-0.10-libdhcp6client.patch
 
-Prereq: /sbin/chkconfig, /sbin/service
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, bison, openssl-devel, autoconf, automake, libtool
+Requires(post): chkconfig
+Requires(preun): chkconfig initscripts
+Requires(postun): initscripts
 
 %description
 Implements the Dynamic Host Configuration Protocol (DHCP) for Internet
@@ -45,7 +47,7 @@
 
 %package -n libdhcp6client
 Summary: The DHCPv6 client in a library for invocation by other programs
-Group:  Development/Libraries
+Group:   Development/Libraries
 
 %description -n libdhcp6client
 Provides the client for the DHCPv6 protocol (RFC 3315) to support dynamic
@@ -53,12 +55,22 @@
 by other programs.
 
 %package -n libdhcp6client-devel
-Summary: Header files for development with the DHCPv6 client library
-Group:   Development/Libraries
+Summary:  Header files for development with the DHCPv6 client library
+Group:    Development/Libraries
+Requires: pkgconfig, %{name} = %{version}-%{release}
 
 %description -n libdhcp6client-devel
 Header files for development with the DHCPv6 client library.
 
+%package -n libdhcp6client-static
+Summary:  Static archive for libdhcp6client
+Group:    Development/Libraries
+Requires: libdhcp6client-devel = %{version}-%{release}
+
+%description -n libdhcp6client-static
+The libdhcp6client-static package contains the static archive for
+libdhcp6client.
+
 %prep
 %setup -q -n dhcp-%{version}
 %patch0 -p1 -b .rh
@@ -112,7 +124,7 @@
 fi
 
 %postun
-if [ "$1" -ge "1" ]; then
+if [ $1 = 1 ]; then
     service dhcp6s condrestart >/dev/null 2>&1
 fi
 exit 0
@@ -122,22 +134,21 @@
 %postun -n libdhcp6client -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%doc ReadMe docs/* dhcp6s.conf
 %attr(754,root,root) %{_sbindir}/dhcp6s
 %attr(754,root,root) %{_sbindir}/dhcp6r
-%attr(755,root,root) %config /etc/rc.d/init.d/dhcp6s
-%attr(755,root,root) %config /etc/rc.d/init.d/dhcp6r
-%config(noreplace) /etc/sysconfig/dhcp6s
-%config(noreplace) /etc/sysconfig/dhcp6r
+%attr(755,root,root) %config %{_initrddir}/dhcp6s
+%attr(755,root,root) %config %{_initrddir}/dhcp6r
+%config(noreplace) %{_sysconfdir}/dhcp6s
+%config(noreplace) %{_sysconfdir}/dhcp6r
 %{_mandir}/man8/dhcp6s.8.gz
 %{_mandir}/man5/dhcp6s.conf.5.gz
 %{_mandir}/man8/dhcp6r.8.gz
-%attr(750,root,root) %dir %{_localstatedir}/lib/dhcpv6
-
-%doc ReadMe docs/* dhcp6s.conf
+%attr(750,root,root) %dir %{_localstatedir}/lib/%{name}
 
 %files -n dhcpv6_client
 %defattr(-,root,root,-)
@@ -157,9 +168,15 @@
 %{_libdir}/pkgconfig/libdhcp6client.pc
 %defattr(-,root,root,-)
 %{_libdir}/libdhcp6client.so
+
+%files -n libdhcp6client-static
+%defattr(0644,root,root,0755)
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Mon Jun 11 2007 David Cantrell <dcantrell at redhat.com> - 0.10-43
+- Merge review (#225692)
+
 * Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 0.10-42
 - Init script fixes (#237973)
 
@@ -334,7 +351,7 @@
 - add chkconfig prereqs, postun script, etc.
 
 * Thu Sep  2 2004 Jason Vas Dias <jvdias at redhat.com> - 0.10-3/4
-- fixed missing %defattr for dhcpv6_client - bug 131638
+- fixed missing %%defattr for dhcpv6_client - bug 131638
 
 * Mon Aug 30 2004 Jason Vas Dias <jvdias at redhat.com> - 0.10-2
 - Split into two packages: dhcpv6-*, containing server only,