SPECS: dhcp.spec - wrong, wrong, wrong; specflags_ are not the way...

Tue Dec 25 13:27:08 CET 2007

Author: qboosh                       Date: Tue Dec 25 12:27:08 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- wrong, wrong, wrong; specflags_ are not the way to build PIC objects;
  updated libdhcp4client.{make,patch} to build PIC properly (although library
  build is still a huge hack)
- restored lost make flags
- fixed duplicate files
- added missing ldconfig calls
- updated .init scripts with proper force-reload and try-restart support
- package license is MIT, two libdhcp4client headers by RH are GPLed

---- Files affected:
SPECS:
   dhcp.spec (1.151 -> 1.152) 

---- Diffs:

================================================================
Index: SPECS/dhcp.spec
diff -u SPECS/dhcp.spec:1.151 SPECS/dhcp.spec:1.152

--- SPECS/dhcp.spec:1.151	Tue Dec 18 17:42:14 2007
+++ SPECS/dhcp.spec	Tue Dec 25 13:27:03 2007
@@ -11,7 +11,7 @@
 Version:	3.1.0
 Release:	5
 Epoch:		4
-License:	distributable
+License:	MIT
 Group:		Networking/Daemons
 Source0:	ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
 # Source0-md5:	27d179a3c3fbef576566b456a1168246
@@ -47,9 +47,6 @@
 Provides:	dhcpd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_x86_64	-fPIC
-%define		specflags_alpha		-fPIC
-%define		specflags_amd64		%{specflags_x86_64}
 %define		schemadir	/usr/share/openldap/schema
 
 %description
@@ -170,6 +167,7 @@
 Summary:	Header files for development with the DHCP client library
 Summary(pl.UTF-8):	Pliki nagłówkowe do programowania z użyciem biblioteki klienckiej DHCP
 Group:		Development/Libraries
+License:	GPL v2+
 Requires:	libdhcp4client = %{epoch}:%{version}-%{release}
 
 %description -n libdhcp4client-devel
@@ -223,7 +221,7 @@
 		-D_PATH_DHCPD_DB=\\\"/var/lib/%{name}/dhcpd.leases\\\" \
 		-DEXTENDED_NEW_OPTION_INFO \
 		-D_PATH_DHCLIENT_DB=\\\"/var/lib/dhclient/dhclient.leases\\\" \
-	"
+	" \
 	LFLAGS="%{rpmldflags}" \
 	DEBUG="" \
 	VARDBS="/var/lib/%{name}"
@@ -231,7 +229,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{rc.d/init.d,sysconfig},%{schemadir},%{_pkgconfigdir}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{schemadir},%{_pkgconfigdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -283,6 +281,15 @@
 	/sbin/chkconfig --del dhcpd
 fi
 
+%triggerpostun -- dhcp < 3.0
+if [ "`grep ddns-update-style /etc/dhcpd.conf`" = "" ]; then
+	umask 027
+	echo "ddns-update-style none;" > /etc/dhcpd.conf.tmp
+	echo "" >> /etc/dhcpd.conf.tmp
+	cat /etc/dhcpd.conf >>/etc/dhcpd.conf.tmp
+	mv -f /etc/dhcpd.conf.tmp /etc/dhcpd.conf
+fi
+
 %post -n openldap-schema-dhcp
 %openldap_schema_register %{schemadir}/dhcp.schema -d core
 %service -q ldap restart
@@ -311,23 +318,13 @@
 	/sbin/chkconfig --del dhcp-relay
 fi
 
-%triggerpostun -- dhcp < 3.0
-if [ "`grep ddns-update-style /etc/dhcpd.conf`" = "" ]; then
-	umask 027
-	echo "ddns-update-style none;" > /etc/dhcpd.conf.tmp
-	echo "" >> /etc/dhcpd.conf.tmp
-	cat /etc/dhcpd.conf >>/etc/dhcpd.conf.tmp
-	mv -f /etc/dhcpd.conf.tmp /etc/dhcpd.conf
-fi
+%post	-n libdhcp4client -p /sbin/ldconfig
+%postun	-n libdhcp4client -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc doc/* README RELNOTES server/dhcpd.conf LICENSE
-%doc contrib/ms2isc
+%doc doc/* README RELNOTES server/dhcpd.conf LICENSE contrib/ms2isc
 %{?with_ldap:%doc README.ldap Changelog-LDAP contrib/dhcpd-conf-to-ldap.pl}
-%{_mandir}/man1/*
-%{_mandir}/man5/dhcp*
-%{_mandir}/man8/dhcp*
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcpd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcpd.conf
 %attr(755,root,root) %{_bindir}/omshell
@@ -335,12 +332,18 @@
 %attr(754,root,root) /etc/rc.d/init.d/dhcpd
 %attr(750,root,root) %dir /var/lib/%{name}
 %ghost /var/lib/%{name}/dhcpd.leases
+%{_mandir}/man1/omshell.1*
+%{_mandir}/man5/dhcp-eval.5*
+%{_mandir}/man5/dhcp-options.5*
+%{_mandir}/man5/dhcpd.conf.5*
+%{_mandir}/man5/dhcpd.leases.5*
+%{_mandir}/man8/dhcpd.8*
 
 %if %{with ldap}
 %files -n openldap-schema-dhcp
 %defattr(644,root,root,755)
 %doc contrib/dhcpd-conf-to-ldap.pl
-%{schemadir}/*.schema
+%{schemadir}/dhcp.schema
 %endif
 
 %files client
@@ -349,31 +352,38 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhclient.conf
 %attr(755,root,root) /sbin/dhclient
 %attr(755,root,root) /sbin/dhclient-script
-%{_mandir}/man[58]/dhclient*
+%{_mandir}/man5/dhclient.conf.5*
+%{_mandir}/man5/dhclient.leases.5*
+%{_mandir}/man8/dhclient.8*
+%{_mandir}/man8/dhclient-script.8*
 %attr(750,root,root) %dir /var/lib/dhclient
 %ghost /var/lib/dhclient/dhclient.leases
 
 %files relay
 %defattr(644,root,root,755)
-%{_mandir}/man8/dhcrelay*
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcp-relay
 %attr(755,root,root) %{_sbindir}/dhcrelay
 %attr(754,root,root) /etc/rc.d/init.d/dhcp-relay
+%{_mandir}/man8/dhcrelay.8*
 
 %files devel
 %defattr(644,root,root,755)
-%{_mandir}/man3/*
-%{_libdir}/*.a
-%{_includedir}/*
+%{_libdir}/libdhcpctl.a
+%{_libdir}/libomapi.a
+%{_includedir}/dhcpctl.h
+%{_includedir}/isc-dhcp
+%{_includedir}/omapip
+%{_mandir}/man3/dhcpctl.3*
+%{_mandir}/man3/omapi.3*
 
 %files -n libdhcp4client
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdhcp4client-%{version}.so.*
+%attr(755,root,root) %{_libdir}/libdhcp4client-%{version}.so.0
 
 %files -n libdhcp4client-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdhcp4client.so
-%{_includedir}/*
+%{_includedir}/dhcp4client
 %{_pkgconfigdir}/libdhcp4client.pc
 
 %files -n libdhcp4client-static
@@ -386,6 +396,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2007-12-25 12:27:03  qboosh
+- wrong, wrong, wrong; specflags_ are not the way to build PIC objects;
+  updated libdhcp4client.{make,patch} to build PIC properly (although library
+  build is still a huge hack)
+- restored lost make flags
+- fixed duplicate files
+- added missing ldconfig calls
+- updated .init scripts with proper force-reload and try-restart support
+- package license is MIT, two libdhcp4client headers by RH are GPLed
+
 Revision 1.151  2007-12-18 16:42:14  glen
 - rel 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dhcp.spec?r1=1.151&r2=1.152&f=u

