From 26f53faec0d2cf69b6fddf9c9091370d84fc3509 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Sun, 31 Jan 2010 17:06:05 +0000
Subject: [PATCH] - drop static libraries (#556046) - add fix for regression in
 CVE-2009-3560 patch (#544996)

---
 expat.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/expat.spec b/expat.spec
index 55726a0..d678b4c 100644
--- a/expat.spec
+++ b/expat.spec
@@ -1,12 +1,13 @@
 Summary: An XML parser library
 Name: expat
 Version: 2.0.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: System Environment/Libraries
 Source: http://downloads.sourceforge.net/expat/expat-%{version}.tar.gz
 Patch1: expat-2.0.1-confcxx.patch
 Patch2: expat-1.95.8-CVE-2009-3560.patch
 Patch3: expat-1.95.8-CVE-2009-3720.patch
+Patch4: expat-2.0.1-fix3560.patch
 URL: http://www.libexpat.org/
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,13 +35,14 @@ to develop XML applications with expat.
 %patch1 -p1 -b .confcxx
 %patch2 -p1 -b .cve3560
 %patch3 -p1 -b .cve3720
+%patch4 -p1 -b .fix3560
 
 %build
 rm -rf autom4te*.cache
 rm conftools/libtool.m4
 libtoolize --copy --force --automake && aclocal && autoheader && autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-%configure --libdir=/%{_lib}
+%configure --libdir=/%{_lib} --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -52,7 +54,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,a} $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT/%{_lib}/libexpat.so $RPM_BUILD_ROOT%{_libdir}
 
 rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.la
 
@@ -79,10 +81,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %doc Changes doc examples
 %{_libdir}/lib*.so
-%{_libdir}/lib*.*a
 %{_includedir}/*.h
 
 %changelog
+* Sun Jan 31 2010 Joe Orton <jorton@redhat.com> - 2.0.1-9
+- drop static libraries (#556046)
+- add fix for regression in CVE-2009-3560 patch (#544996)
+
 * Tue Dec  1 2009 Joe Orton <jorton@redhat.com> - 2.0.1-8
 - add security fix for CVE-2009-3560 (#533174)
 - add security fix for CVE-2009-3720 (#531697)