packages: iproute2/iproute2.spec - you can't disable rpm macros with shell ...

[glen]

Author: glen                         Date: Wed Dec 15 21:29:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- you can't disable rpm macros with shell syntax, just turn bcond off
- updated summary and desc from fedora

---- Files affected:
packages/iproute2:
   iproute2.spec (1.195 -> 1.196) 

---- Diffs:

================================================================
Index: packages/iproute2/iproute2.spec
diff -u packages/iproute2/iproute2.spec:1.195 packages/iproute2/iproute2.spec:1.196
--- packages/iproute2/iproute2.spec:1.195	Wed Aug 25 15:19:29 2010
+++ packages/iproute2/iproute2.spec	Wed Dec 15 22:29:33 2010
@@ -1,17 +1,17 @@
 # $Revision$, $Date$
 #
 # TODO:
-#	- fix build @ uClibc
-#       - fix iface_descr patch
+# - fix build @ uClibc
+# - fix iface_descr patch
 #
 # Conditional build
 %bcond_without	doc		# don't build documentation
 %bcond_without	tc		# don't build tc program (it breaks static linkage)
 %bcond_without	atm		# don't required ATM.
 %bcond_with	uClibc		# do some hacks to build with uClibc
-#%bcond_with	iface_descr	# build with interface description support
-#
-Summary:	Utility to control Networking behavior in.X kernels
+%bcond_with	iface_descr	# build with interface description support
+
+Summary:    Advanced IP routing and network device configuration tools
 Summary(es.UTF-8):	Herramientas para encaminamiento avanzado y configuración de interfaces de red
 Summary(pl.UTF-8):	Narzędzie do kontrolowania Sieci w kernelach
 Summary(pt_BR.UTF-8):	Ferramentas para roteamento avançado e configuração de interfaces de rede
@@ -70,10 +70,9 @@
 %define		_sysconfdir	/etc/iproute2
 
 %description
-Linux maintains compatibility with the basic configuration utilities
-of the network (ifconfig, route) but a new utility is required to
-exploit the new characteristics and features of the kernel. This
-package includes the new utilities.
+The iproute package contains networking utilities (ip and rtmon, for
+example) which are designed to use the advanced networking
+capabilities of the Linux 2.4.x and 2.6.x kernel.
 
 %description -l es.UTF-8
 Linux mantiene compatibilidad con los utilitarios estándares de
@@ -119,7 +118,7 @@
 # extensions:
 %patch10 -p1
 %patch11 -p1
-#%{?with_iface_descr:%patch12 -p1}
+%{?with_iface_descr:%patch12 -p1}
 %patch13 -p0
 %patch14 -p1
 %patch15 -p1
@@ -147,8 +146,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},%{_mandir}/man{3,8},%{_libdir},%{_includedir},%{?with_tc:%{_libdir}/tc}}
 
-install ip/{ip,rtmon,routel} %{?with_tc:tc/tc} misc/{ifstat,lnstat,nstat,rtacct,ss} $RPM_BUILD_ROOT%{_sbindir}
-install etc/iproute2/rt_protos \
+install -p ip/{ip,rtmon,routel} %{?with_tc:tc/tc} misc/{ifstat,lnstat,nstat,rtacct,ss} $RPM_BUILD_ROOT%{_sbindir}
+cp -a etc/iproute2/rt_protos \
 	etc/iproute2/rt_realms \
 	etc/iproute2/rt_scopes \
 	etc/iproute2/rt_tables \
@@ -159,9 +158,9 @@
 echo ".so tc-pbfifo.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tc-pfifo.8
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man3
 
-install lib/libnetlink.a $RPM_BUILD_ROOT%{_libdir}
-install include/libnetlink.h $RPM_BUILD_ROOT%{_includedir}
-%{?with_tc:install tc/*.so $RPM_BUILD_ROOT%{_libdir}/tc}
+cp -a lib/libnetlink.a $RPM_BUILD_ROOT%{_libdir}
+cp -a include/libnetlink.h $RPM_BUILD_ROOT%{_includedir}
+%{?with_tc:install -p tc/*.so $RPM_BUILD_ROOT%{_libdir}/tc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -200,6 +199,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.196  2010/12/15 21:29:33  glen
+- you can't disable rpm macros with shell syntax, just turn bcond off
+- updated summary and desc from fedora
+
 Revision 1.195  2010/08/25 13:19:29  areq
 - ip_route_get.patch (fix ip r get)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iproute2/iproute2.spec?r1=1.195&r2=1.196&f=u