diff --git a/.cvsignore b/.cvsignore index b457d4b..87efd06 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ expat-1.95.8.tar.gz i386 *.rpm clog +expat-2.0.1.tar.gz diff --git a/expat.spec b/expat.spec index 4c4585b..721756e 100644 --- a/expat.spec +++ b/expat.spec @@ -1,12 +1,11 @@ -Summary: A library for parsing XML documents +Summary: An XML parser library Name: expat -Version: 1.95.8 -Release: 10 +Version: 2.0.1 +Release: 1 Group: System Environment/Libraries Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz -Patch0: expat-1.95.8-pedantic.patch URL: http://www.libexpat.org/ -License: BSD +License: MIT BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, libtool @@ -29,14 +28,13 @@ to develop XML applications with expat. %prep %setup -q -%patch0 -p1 -b .pedantic %build rm -rf autom4te*.cache cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1 libtoolize --copy --force --automake && aclocal && autoheader && autoconf export CFLAGS="$RPM_OPT_FLAGS -fPIC" -%configure +%configure --libdir=/%{_lib} make %{?_smp_mflags} %install @@ -44,11 +42,12 @@ rm -rf ${RPM_BUILD_ROOT} rm -f examples/*.dsp -%makeinstall man1dir=$RPM_BUILD_ROOT/%{_mandir}/man1 \ - libdir=$RPM_BUILD_ROOT/%{_lib} +make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir} -mv $RPM_BUILD_ROOT/%{_lib}/libexpat.{so,a,la} $RPM_BUILD_ROOT%{_libdir} +mv $RPM_BUILD_ROOT/%{_lib}/libexpat.{so,a} $RPM_BUILD_ROOT%{_libdir} + +rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.la lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*` ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so @@ -74,6 +73,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_includedir}/*.h %changelog +* Wed Aug 8 2007 Joe Orton 2.0.1-1 +- update to 2.0.1 +- fix the License tag +- drop the .la file + * Sun Feb 4 2007 Joe Orton 1.95.8-10 - remove trailing dot in Summary (#225742) - use preferred BuildRoot per packaging guidelines (#225742) diff --git a/sources b/sources index c16453a..9d051ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aff487543845a82fe262e6e2922b4c8e expat-1.95.8.tar.gz +ee8b492592568805593f81f8cdf2a04c expat-2.0.1.tar.gz