- Spec file cleanups (#225691)

- Put libdhcpctl.a and libomapi.a in dhcp-devel-static package
- Put libdhcp4client.a in libdhcp4client-devel-static package
This commit is contained in:
David Cantrell 2007-04-11 20:12:51 +00:00
parent 73f5b3e6fb
commit 788673c0d5

View File

@ -10,7 +10,7 @@
Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent
Name: dhcp
Version: 3.0.5
Release: 30%{?dist}
Release: 31%{?dist}
Epoch: 12
License: ISC
Group: System Environment/Daemons
@ -77,11 +77,7 @@ the ISC DHCP service and relay agent.
Summary: Provides the dhclient ISC DHCP client daemon and dhclient-script
Group: System Environment/Base
Requires: initscripts >= 6.75
%package devel
Summary: Development headers and libraries for interfacing to the DHCP server
Group: Development/Libraries
Requires: dhcp = %{epoch}:%{version}-%{release}, openldap-devel
Obsoletes: dhcpcd <= 1.3.22
%description -n dhclient
DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@ -94,8 +90,22 @@ To use DHCP on your network, install a DHCP service (or relay agent),
and on clients run a DHCP client daemon. The dhclient package
provides the ISC DHCP client daemon.
%package devel
Summary: Development headers and libraries for interfacing to the DHCP server
Group: Development/Libraries
Requires: dhcp = %{epoch}:%{version}-%{release}
%description devel
Libraries for interfacing with the ISC DHCP server.
Header files and API documentation for using the ISC DHCP libraries.
%package devel-static
Summary: Static archives of libdhcpctl and libomapi
Group: Development/Libraries
Requires: dhcp-devel = %{epoch}:%{version}-%{release}, openldap-devel
%description devel-static
The dhcp-devel-static package contains the static archive for
libdhcpctl and libomapi.
%package -n libdhcp4client
Summary: ISC DHCP IPv4 client in a library for invocation from other programs
@ -115,7 +125,16 @@ Requires: openldap-devel pkgconfig
%description -n libdhcp4client-devel
Header files for development with the Internet Software Consortium (ISC)
Dynamic Host Configuration Protocol (DHCP) Internet Protocol version 4 (IPv4)
client library .
client library.
%package -n libdhcp4client-devel-static
Summary: Static archive for libdhcp4client
Group: Development/Libraries
Requires: libdhcp4client-devel = %{epoch}:%{version}-%{release}
%description -n libdhcp4client-devel-static
The libdhcp4client-devel-static package contains the static archive for
libdhcp4client.
%prep
%setup -q
@ -382,26 +401,38 @@ fi
%files devel
%defattr(-,root,root,-)
%exclude %{_libdir}/libdhcp4client*
%exclude %{_includedir}/dhcp4client
%{_includedir}/*
%{_libdir}/*.a
%{_includedir}/dhcpctl.h
%{_includedir}/isc-dhcp
%{_includedir}/omapi
%attr(0644,root,root) %{_mandir}/man3/omshell.3.gz
%attr(0644,root,root) %{_mandir}/man3/dhcpctl.3.gz
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%files devel-static
%defattr(-,root,root,-)
%{_libdir}/libdhcpctl.a
%{_libdir}/libomapi
%files -n libdhcp4client
%defattr(0755,root,root,0755)
%{_libdir}/libdhcp4client-%{version}.so.*
%files -n libdhcp4client-devel
%defattr(0644,root,root,0755)
%{_includedir}/dhcp4client*
%{_includedir}/dhcp4client
%{_libdir}/pkgconfig/libdhcp4client.pc
%{_libdir}/libdhcp4client.a
%{_libdir}/libdhcp4client.so
%files -n libdhcp4client-devel-static
%defattr(0644,root,root,0755)
%{_libdir}/libdhcp4client.a
%changelog
* Thu Apr 12 2007 David Cantrell <dcantrell@redhat.com> - 12:3.0.5-31
- Spec file cleanups (#225691)
- Put libdhcpctl.a and libomapi.a in dhcp-devel-static package
- Put libdhcp4client.a in libdhcp4client-devel-static package
* Wed Apr 11 2007 David Cantrell <dcantrell@redhat.com> - 12:3.0.5-30
- Enable Xen patch again, kernel bits present (#231444)
@ -739,8 +770,9 @@ fi
- fix default 'boot file server' value (packet->siaddr):
In dhcp-3.0.2(-), this was defaulted to the server address;
now it defaults to 0.0.0.0 (a rather silly default!) and
must be specified with the 'next-server' option ( not the tftp-boot-server option ?!?)
which causes PXE boot clients to fail to load anything after the boot file.
must be specified with the 'next-server' option (not the tftp-boot-server
option ?!?) which causes PXE boot clients to fail to load anything after
the boot file.
* Fri Jul 08 2005 Jason Vas Dias <jvdias@redhat.com> 10:3.0.2-14.FC5
- Allow package to compile with glibc-headers-2.3.5-11 (tr.c's use of __u16)
@ -847,7 +879,7 @@ fi
* Mon Jan 03 2005 Jason Vas Dias <jvdias@redhat.com> 7:3.0.1-16
- fix bug 143704: dhclient -r does not work if lease held by
- dhclient run from ifup . dhclient will now look for the pid
- files created by ifup .
- files created by ifup.
* Wed Nov 17 2004 Jason Vas Dias <jvdias@redhat.com> 7:3.0.1-14
- NTP: fix bug 139715: merge in new ntp servers only rather than replace
@ -863,7 +895,7 @@ fi
* Wed Oct 06 2004 Jason Vas Dias <jvdias@redhat.com> 7:3.0.1-11
- dhcp-3.0.2b1 came out today. A diff of the 'ack_lease' function
- Dave Hankins and I patched exposed a missing '!' on an if clause
- that got dropped with the 'new-host' patch. Replacing the '!' .
- that got dropped with the 'new-host' patch. Replacing the '!'.
- Also found one missing host_dereference.
* Wed Oct 06 2004 Jason Vas Dias <jvdias@redhat.com> 7:3.0.1-10
@ -883,7 +915,7 @@ fi
- then after one of those hosts is denied booting, all
- hosts are denied booting, because of a pointer not being
- cleared in the lease record.
- An upstream patch was obtained which will be in dhcp-3.0.2 .
- An upstream patch was obtained which will be in dhcp-3.0.2.
* Mon Aug 16 2004 Jason Vas Dias <jvdias@redhat.com> 7:3.0.1-7
- Forward DNS update by client was disabled by a bug that I
@ -1133,7 +1165,8 @@ fi
- Include dhcrelay scripts from #49186
* Thu Dec 20 2001 Elliot Lee <sopwith@redhat.com> 3.0-2
- Update to 3.0, include devel files installed by it (as part of the main package).
- Update to 3.0, include devel files installed by it (as part of the main
package).
* Sun Aug 26 2001 Elliot Lee <sopwith@redhat.com> 2.0pl5-8
- Fix #26446