From 17207d999cc2641ce79e44af7c302ad5f2d34a2e Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Tue, 30 Jan 2007 17:00:48 +0000
Subject: [PATCH] - regenerate configure/libtool correctly (#199361) - strip
 DSP files from examples (#186889) - fix expat.h compilation with g++
 -pedantic (#190244)

---
 expat-1.95.8-pedantic.patch | 11 +++++++++++
 expat.spec                  | 22 +++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 expat-1.95.8-pedantic.patch

diff --git a/expat-1.95.8-pedantic.patch b/expat-1.95.8-pedantic.patch
new file mode 100644
index 0000000..0973176
--- /dev/null
+++ b/expat-1.95.8-pedantic.patch
@@ -0,0 +1,11 @@
+--- expat-1.95.8/lib/expat.h.pedantic
++++ expat-1.95.8/lib/expat.h
+@@ -43,7 +43,7 @@
+ #define XML_STATUS_ERROR XML_STATUS_ERROR
+   XML_STATUS_OK = 1,
+ #define XML_STATUS_OK XML_STATUS_OK
+-  XML_STATUS_SUSPENDED = 2,
++  XML_STATUS_SUSPENDED = 2
+ #define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
+ };
+ 
diff --git a/expat.spec b/expat.spec
index 16a94b7..1d3c258 100644
--- a/expat.spec
+++ b/expat.spec
@@ -1,9 +1,10 @@
 Summary: A library for parsing XML.
 Name: expat
 Version: 1.95.8
-Release: 8.2.1
+Release: 9
 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
 BuildRoot: %{_tmppath}/%{name}-root
@@ -27,8 +28,12 @@ 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
 make %{?_smp_mflags}
@@ -36,18 +41,16 @@ make %{?_smp_mflags}
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
+rm -f examples/*.dsp
+
 %makeinstall man1dir=$RPM_BUILD_ROOT/%{_mandir}/man1 \
         libdir=$RPM_BUILD_ROOT/%{_lib}
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT/%{_lib}/libexpat.{so,a,la} $RPM_BUILD_ROOT%{_libdir}
 
 lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*`
-
-ln -s ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so
-
-rm -f $RPM_BUILD_ROOT/%{_lib}/*.so
-
-mv $RPM_BUILD_ROOT/%{_lib}/*.*a $RPM_BUILD_ROOT%{_libdir}/
+ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -70,6 +73,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/*.h
 
 %changelog
+* Tue Jan 30 2007 Joe Orton <jorton@redhat.com> 1.95.8-9
+- regenerate configure/libtool correctly (#199361)
+- strip DSP files from examples (#186889)
+- fix expat.h compilation with g++ -pedantic (#190244)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.95.8-8.2.1
 - rebuild