[libmnl] libmnl: fix doc multilib conflict, and build static lib package
Hushan Jia
hushan at fedoraproject.org
Sun Aug 12 13:08:41 UTC 2012
commit 8017d4df58fc077c40d9f4868c13fab5bd28c0bd
Author: Hushan Jia <hushan.jia at gmail.com>
Date: Sun Aug 12 09:50:51 2012 +0800
libmnl: fix doc multilib conflict, and build static lib package
libmnl.spec | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/libmnl.spec b/libmnl.spec
index c5e967a..088fcac 100644
--- a/libmnl.spec
+++ b/libmnl.spec
@@ -1,6 +1,6 @@
Name: libmnl
Version: 1.0.3
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: A minimalistic Netlink library
Group: System Environment/Libraries
@@ -21,17 +21,25 @@ Summary: Development files for %{name}
Group: Development/Libraries
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}.
+%description static
+The %{name}-static package contains static libraries for devleoping applications that use %{name}.
+
%prep
%setup -q
%build
-%configure --disable-static
+%configure --enable-static
make CFLAGS="%{optflags}" %{?_smp_mflags}
@@ -40,6 +48,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
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}
%post -p /sbin/ldconfig
@@ -53,13 +62,21 @@ find examples -type d -name '.deps' -prune -exec rm -rf {} ';'
%files devel
%doc COPYING
-%doc examples
+%doc examples-%{_arch}
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so
+%files static
+%{_libdir}/*.a
%changelog
+* Sun Aug 12 2012 Hushan Jia <hushan.jia at gmail.com> - 1.0.3-4
+- use %doc for each arch to avoid multilib conflict (rhbz 831413)
+
+* Sat Aug 04 2012 Philip Prindeville <philipp at fedoraproject.org> - 1.0.3-3
+- Add .a to devel package (rhbz 845793)
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list