[expat] ship .pc file, move library back to libdir (#808399)
jorton
jorton at fedoraproject.org
Fri Mar 30 11:03:52 UTC 2012
commit 12a1f9703bcee7b22cf6b9a7332cd2d6c6137a94
Author: Joe Orton <jorton at redhat.com>
Date: Fri Mar 30 12:03:26 2012 +0100
ship .pc file, move library back to libdir (#808399)
Resolves: rhbz#808399
expat.spec | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/expat.spec b/expat.spec
index 075b8a0..265e526 100644
--- a/expat.spec
+++ b/expat.spec
@@ -1,7 +1,7 @@
Summary: An XML parser library
Name: expat
Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Libraries
Source: http://downloads.sourceforge.net/expat/expat-%{version}.tar.gz
URL: http://www.libexpat.org/
@@ -33,7 +33,7 @@ to develop XML applications with expat.
rm -rf autom4te*.cache
libtoolize --copy --force --automake && aclocal && autoheader && autoconf
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-%configure --libdir=/%{_lib} --disable-static
+%configure --disable-static
make %{?_smp_mflags}
%install
@@ -44,14 +44,7 @@ chmod 644 README COPYING Changes doc/* examples/*
make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mv $RPM_BUILD_ROOT/%{_lib}/libexpat.so $RPM_BUILD_ROOT%{_libdir}
-
-rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.la \
- $RPM_BUILD_ROOT/%{_lib}/pkgconfig/*.pc
-
-lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*`
-ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%check
make check
@@ -66,16 +59,20 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-,root,root)
%doc README COPYING
%{_bindir}/*
-/%{_lib}/lib*.so.*
+%{_libdir}/lib*.so.*
%{_mandir}/*/*
%files devel
%defattr(-,root,root)
%doc Changes doc examples
%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
%{_includedir}/*.h
%changelog
+* Fri Mar 30 2012 Joe Orton <jorton at redhat.com> - 2.1.0-1
+- ship .pc file, move library back to libdir (#808399)
+
* Mon Mar 26 2012 Joe Orton <jorton at redhat.com> - 2.1.0-1
- update to 2.1.0 (#806602)
More information about the scm-commits
mailing list