X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=xerces-c%2Fmingw32-xerces-c.spec;h=0cec81cf929897bc1ee318ce0d3be6928bc12851;hb=f5fb0d87bb47b6a323131a45dea1e19c8718ce71;hp=79c2125b7ce24af6d1a68e5d5f730b158c4521e0;hpb=ed0dc8864c3a0994fa7da8ae198745bab134ddd4;p=fedora-mingw.git

diff --git a/xerces-c/mingw32-xerces-c.spec b/xerces-c/mingw32-xerces-c.spec
index 79c2125..0cec81c 100644
--- a/xerces-c/mingw32-xerces-c.spec
+++ b/xerces-c/mingw32-xerces-c.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-xerces-c
 Version:        2.8.0
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Validating XML parser
 
 License:        ASL 2.0
@@ -44,7 +44,6 @@ faithful to the XML 1.0 recommendation and associated standards (DOM
 rm -rf doc/html/resources/.svn
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 find ./samples -type f -perm 755 -exec chmod 644 {} \;
-%{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
 rm doc/html/apiDocs/XMLRegisterCleanup_8hpp__incl.map
 rm doc/html/apiDocs/XSConstants_8hpp__incl.map
 
@@ -72,6 +71,7 @@ find -name runConfigure | while read f; do
         sed -i -e 's/-w -O -DNDEBUG/-DNDEBUG/g' $f
 done
 
+# NB: This is duplicated in 'mingw32-xqilla.spec'.
 cd $XERCESCROOT/src/xercesc
 CXXFLAGS="%{_mingw32_cflags}" \
 CFLAGS="%{_mingw32_cflags}" \
@@ -97,6 +97,7 @@ export XERCESCROOT="$PWD"
 %{__make} install -C src/xercesc DESTDIR="$RPM_BUILD_ROOT"
 
 # Move the DLLs into the bindir.
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
 mv $RPM_BUILD_ROOT%{_mingw32_libdir}/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/
 
 
@@ -107,11 +108,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE
-%{_mingw32_include}/xercesc/
+%{_mingw32_includedir}/xercesc/
+%{_mingw32_bindir}/libxerces-c.dll
+%{_mingw32_bindir}/libxerces-c28.dll
 %{_mingw32_bindir}/libxerces-c2_8_0.dll
+%{_mingw32_bindir}/libxerces-depdom.dll
+%{_mingw32_bindir}/libxerces-depdom28.dll
 %{_mingw32_bindir}/libxerces-depdom2_8_0.dll
 
 
 %changelog
-* Wed Feb 18 2009 Richard W.M. Jones <rjones@redhat.com> - 2.8.0-1
+* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 2.8.0-4
+- Rebuild for mingw32-gcc 4.4
+
+* Wed Feb 18 2009 Richard W.M. Jones <rjones@redhat.com> - 2.8.0-3
 - Initial RPM release.