[libmnl/el5: 3/3] Merge branch 'master' into el5

[Hushan Jia]

commit 9b99a2aff206a30bc3cbf26cb951ed92ac452730
Merge: ece79e4 8017d4d
Author: Hushan Jia <hushan.jia at gmail.com>
Date:   Sun Aug 12 13:45:41 2012 +0800

    Merge branch 'master' into el5

 libmnl.spec |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)
---
diff --cc libmnl.spec
index c7c948a,088fcac..8565062
--- a/libmnl.spec
+++ b/libmnl.spec
@@@ -20,9 -19,13 +20,14 @@@ to avoid re-inventing the wheel
  %package        devel
  Summary:        Development files for %{name}
  Group:          Development/Libraries
 -Requires:       %{name}%{_isa} = %{version}-%{release}
 +Requires:       pkgconfig
 +Requires:       %{name}%{?_isa} = %{version}-%{release}
  
+ %package 	static
+ Summary: 	Static development files for %{name}
+ Group:          Development/Libraries
+ Requires: %{name} = %{version}-%{release}
+ 
  %description    devel
  The %{name}-devel package contains libraries and header files for
  developing applications that use %{name}.
@@@ -43,11 -48,9 +51,12 @@@ make install DESTDIR=$RPM_BUILD_ROO
  find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
  find examples '(' -name 'Makefile.am' -o -name 'Makefile.in' ')' -exec rm -f {} ';'
  find examples -type d -name '.deps' -prune -exec rm -rf {} ';'
+ mv examples examples-%{_arch}
  
  
 +%clean
 +rm -rf $RPM_BUILD_ROOT
 +
  %post -p /sbin/ldconfig
  
  %postun -p /sbin/ldconfig
@@@ -59,9 -61,8 +68,9 @@@
  %{_libdir}/*.so.*
  
  %files devel
 +%defattr(-,root,root,-)
  %doc COPYING
- %doc examples
+ %doc examples-%{_arch}
  %{_includedir}/*
  %{_libdir}/pkgconfig/*.pc
  %{_libdir}/*.so