diff --git a/.gitignore b/.gitignore index 6590e68..6e52cd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ expat-2.0.1.tar.gz +/expat-2.1.0.tar.gz diff --git a/mingw-expat.spec b/mingw-expat.spec index 251e38b..1929ce0 100644 --- a/mingw-expat.spec +++ b/mingw-expat.spec @@ -1,11 +1,8 @@ -%?mingw_package_header - -%global mingw_build_win32 1 -%global mingw_build_win64 1 +%{?mingw_package_header} Name: mingw-expat -Version: 2.0.1 -Release: 12%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: MinGW Windows port of expat XML parser library License: MIT @@ -23,8 +20,6 @@ BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-gcc BuildRequires: mingw64-binutils -BuildRequires: autoconf, automake, libtool - %description This is expat, the C library for parsing XML, written by James Clark. Expat @@ -65,12 +60,6 @@ register handlers. %prep %setup -q -n expat-%{version} -rm -rf autom4te*.cache -cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1 -libtoolize --copy --force --automake && aclocal && autoheader && autoconf - -chmod -x COPYING - %build %mingw_configure @@ -97,6 +86,7 @@ rm -r $RPM_BUILD_ROOT%{mingw64_mandir}/man1 %{mingw32_bindir}/libexpat-1.dll %{mingw32_bindir}/xmlwf %{mingw32_libdir}/libexpat.dll.a +%{mingw32_libdir}/pkgconfig/expat.pc %{mingw32_includedir}/expat.h %{mingw32_includedir}/expat_external.h @@ -105,11 +95,16 @@ rm -r $RPM_BUILD_ROOT%{mingw64_mandir}/man1 %{mingw64_bindir}/libexpat-1.dll %{mingw64_bindir}/xmlwf %{mingw64_libdir}/libexpat.dll.a +%{mingw64_libdir}/pkgconfig/expat.pc %{mingw64_includedir}/expat.h %{mingw64_includedir}/expat_external.h %changelog +* Sun Jun 03 2012 Erik van Pienbroek - 2.1.0-1 +- Update to 2.1.0 +- Dropped the autoconf/libtool regeneration pieces + * Sat Mar 10 2012 Erik van Pienbroek - 2.0.1-12 - Added win64 support - Dropped unneeded RPM tags diff --git a/sources b/sources index 9d051ba..7107749 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee8b492592568805593f81f8cdf2a04c expat-2.0.1.tar.gz +dd7dab7a5fea97d2a6a43f511449b7cd expat-2.1.0.tar.gz