SPECS: dhcp.spec - back to 4.0.0 on HEAD, 4.1.0a1 moved to DEVEL -...

[glen]

Author: glen                         Date: Sun Apr 27 13:33:34 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- back to 4.0.0 on HEAD, 4.1.0a1 moved to DEVEL
- add static_libs bcond, fix stripping .a

---- Files affected:
SPECS:
   dhcp.spec (1.160 -> 1.161) 

---- Diffs:

================================================================
Index: SPECS/dhcp.spec
diff -u SPECS/dhcp.spec:1.160 SPECS/dhcp.spec:1.161
--- SPECS/dhcp.spec:1.160	Wed Mar 12 23:12:05 2008
+++ SPECS/dhcp.spec	Sun Apr 27 15:33:29 2008
@@ -2,20 +2,22 @@
 #
 # Conditional build:
 %bcond_without	ldap	# without support for ldap storage
+%bcond_without	static_libs	# don't build static library
 #
 Summary:	DHCP Server
 Summary(es.UTF-8):	Servidor DHCP
 Summary(pl.UTF-8):	Serwer DHCP
 Summary(pt_BR.UTF-8):	Servidor DHCP (Protocolo de configuração dinâmica de hosts)
 Name:		dhcp
-Version:	4.1.0a1
+# 4.1.0a1 is on DEVEL
+Version:	4.0.0
 # don't put int release until all patches are updated/ported(!)
 Release:	0.1
 Epoch:		4
 License:	MIT
 Group:		Networking/Daemons
 Source0:	ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-# Source0-md5:	b0c3e5125156c126333e6f028e1bf5d8
+# Source0-md5:	31d79b27ce4a94089a0b9ce7f72307fa
 Source1:	%{name}.init
 Source2:	%{name}6.init
 Source3:	%{name}-relay.init
@@ -227,6 +229,7 @@
 %{__automake}
 CFLAGS="%{rpmcflags} -fPIC"
 %configure \
+	%{!?with_static_libs:--disable-static} \
 	--enable-dhcpv6 \
 	--with-srv-lease-file="/var/lib/%{name}/dhcpd.leases" \
 	--with-cli-lease-file="/var/lib/dhclient/dhclient.leases"
@@ -269,6 +272,26 @@
 
 install libdhcp4client.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libdhcp4client.pc
 
+%if %{with static_libs}
+# HACK: strip doesn't like .a inside .a
+mkdir -p stripworkdir
+cd stripworkdir
+for a in $RPM_BUILD_ROOT%{_libdir}/*.a; do
+	archives=$(ar t $a | grep '\.a$' || :)
+	[ "$archives" ] || continue
+
+	# hope we don't have to recurse here
+	for ar in $archives; do
+		rm -f *.o *.a
+		ar x $a $ar
+		ar x $ar
+		ar d $a $ar
+		ar cr $a *.o
+	done
+done
+cd -
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -395,9 +418,11 @@
 %{_pkgconfigdir}/libdhcp4client.pc
 %{_libdir}/libdhcp4client.la
 
+%if %{with static_libs}
 %files -n libdhcp4client-static
 %defattr(644,root,root,755)
 %{_libdir}/libdhcp4client.a
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -405,8 +430,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.160  2008-03-12 22:12:05  arekm
-- 4.1.0a1, nfy
+Revision 1.161  2008-04-27 13:33:29  glen
+- back to 4.0.0 on HEAD, 4.1.0a1 moved to DEVEL
+- add static_libs bcond, fix stripping .a
 
 Revision 1.159  2008-02-03 19:37:48  arekm
 - touch v6 lease files
================================================================

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