[meego-commits] 9443: Changes to Trunk:Testing/iproute

[Anas Nashif]

Hi,
I have made the following changes to iproute in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #9443:

  submit:   home:nashif:branches:Trunk:Testing/iproute(r3)(cleanup) -> Trunk:Testing/iproute


Message:
    * Fri Nov 12 2010 Anas Nashif <nashif at linux.intel.com> - 2.6.31
- Do not do parallel builds, it fails on arm (bmc #9695)

State:   new          2010-11-12T03:28:07 nashif
Comment: None



changes files:
--------------
--- iproute.changes
+++ iproute.changes
@@ -0,0 +1,3 @@
+* Fri Nov 12 2010 Anas Nashif <nashif at linux.intel.com> - 2.6.31
+- Do not do parallel builds, it fails on arm (bmc #9695)
+

spec files:
-----------
--- iproute.spec
+++ iproute.spec
@@ -39,9 +39,11 @@
 %build
 export LIBDIR=/%{_libdir}
 export IPT_LIB_DIR=/%{_lib}/xtables
-
-make %{?_smp_mflags}
-#make -C doc
+%ifnarch %arm
+make %{?jobs:-j%jobs}
+%else
+make
+%endif
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -66,13 +68,6 @@
 cp -f etc/iproute2/* $RPM_BUILD_ROOT/%{_sysconfdir}/iproute2
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/*
 
-#copy the tex file from source for time when tex was broken
-#source1 was created from last functional version
-#tar -xvzf %{SOURCE1}
-#mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}
-#cd %{name}-doc-2.6.22
-#cp -pR *.ps ../doc
-
 #create example avpkt file
 cat <<EOF > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq/cbq-0000.example
 DEVICE=eth0,10Mbit,1Mbit
@@ -86,15 +81,11 @@
 AVPKT=3000
 EOF
 
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/iproute2
-%doc README README.decnet README.iproute2+tc README.distribution README.lnstat
 /sbin/*
-%{_mandir}/man8/*
+%doc %{_mandir}/man8/*
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
 %{_sbindir}/*
 %dir %{_datadir}/tc
@@ -102,6 +93,7 @@
 
 %files doc
 %defattr(-,root,root,-)
+%doc README README.decnet README.iproute2+tc README.distribution README.lnstat
 %doc examples
 %doc RELNOTES
 %dir %{_sysconfdir}/sysconfig/cbq

other changes:
--------------