rpms/expat/devel expat-1.95.8-pedantic.patch, NONE, 1.1 expat.spec, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/expat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26894

Modified Files:
	expat.spec 
Added Files:
	expat-1.95.8-pedantic.patch 
Log Message:
* Tue Jan 30 2007 Joe Orton <jorton at 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)


expat-1.95.8-pedantic.patch:
 expat.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE expat-1.95.8-pedantic.patch ---
--- 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
 };
 


Index: expat.spec
===================================================================
RCS file: /cvs/dist/rpms/expat/devel/expat.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- expat.spec	12 Jul 2006 05:47:22 -0000	1.23
+++ expat.spec	30 Jan 2007 17:00:48 -0000	1.24
@@ -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 @@
 
 %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 @@
 %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 @@
 %{_includedir}/*.h
 
 %changelog
+* Tue Jan 30 2007 Joe Orton <jorton at 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 at redhat.com> - 1.95.8-8.2.1
 - rebuild