From d6ccf925d043130c92e5bd83349a9e59777df658ef84c0a02c70e743705b05c2 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 2 Apr 2009 15:23:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/expat?expand=0&rev=10 --- expat.changes | 6 ++++++ expat.spec | 30 +++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/expat.changes b/expat.changes index b8e952e..fd218c0 100644 --- a/expat.changes +++ b/expat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 19 04:55:08 CET 2009 - crrodriguez@suse.de + +- remove static libraries, shouldnt be needed anymore. +- run make check + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/expat.spec b/expat.spec index db2ca9f..d075abf 100644 --- a/expat.spec +++ b/expat.spec @@ -1,7 +1,7 @@ # # spec file for package expat (Version 2.0.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: expat Version: 2.0.1 -Release: 88 +Release: 89 Group: Development/Libraries/C and C++ License: X11/MIT Url: http://expat.sourceforge.net/ @@ -106,7 +106,7 @@ Authors: License: MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: XML Parser Toolkit Group: Development/Libraries/C and C++ -Requires: libexpat1 = %{version} +Requires: libexpat1 = %{version} glibc-devel %description -n libexpat-devel Expat is an XML 1.0 parser written in C. It aims to be fully @@ -143,30 +143,28 @@ cp %{S:1} . rm -f examples/*.dsp %build -%configure \ - --libdir=/%{_lib} -make +%configure --disable-static --with-pic --libdir=/%{_lib} +%{__make} %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install rm doc/xmlwf.1 mkdir -p $RPM_BUILD_ROOT%{_libdir} -# move .a file to /usr -mv $RPM_BUILD_ROOT/%{_lib}/libexpat.a $RPM_BUILD_ROOT%{_libdir}/libexpat.a # move .so symlink to /usr -rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.so -ln -sf /%{_lib}/libexpat.so.1 $RPM_BUILD_ROOT%{_libdir}/libexpat.so +%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so +%{__rm} -v %{buildroot}/%{_lib}/lib%{name}.so # remove .la file rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.la +%check +make check + %clean rm -rf $RPM_BUILD_ROOT -%post -n libexpat1 -/sbin/ldconfig +%post -n libexpat1 -p /sbin/ldconfig -%postun -n libexpat1 -/sbin/ldconfig +%postun -n libexpat1 -p /sbin/ldconfig %files %defattr(-, root, root) @@ -182,10 +180,12 @@ rm -rf $RPM_BUILD_ROOT %files -n libexpat-devel %defattr(-, root, root) %{_includedir}/* -%{_libdir}/libexpat.a %{_libdir}/libexpat.so %changelog +* Thu Feb 19 2009 crrodriguez@suse.de +- remove static libraries, shouldnt be needed anymore. +- run make check * Wed Dec 10 2008 olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293)