- updated to 2.8.0

Changed files:
    crossmingw32-libxml2.spec -> 1.13
    libxml2-amfix.patch -> 1.3
    libxml2-version-script.patch -> 1.2

diff --git a/crossmingw32-libxml2.spec b/crossmingw32-libxml2.spec
index 94875f96e2560f1a62e15dba68881bab3c02456e..36ca8f5fad2f31bb7bb03c1862f7b2870766d293 100644 (file)
--- a/crossmingw32-libxml2.spec
+++ b/crossmingw32-libxml2.spec
@@ -2,20 +2,18 @@
 Summary:       libXML library - cross MinGW32 version
 Summary(pl.UTF-8):     Biblioteka libXML wersja 2 - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       2.7.8
+Version:       2.8.0
 Release:       1
 License:       MIT
 Group:         Development/Libraries
 #Source0:      http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/%{name}-%{version}.tar.bz2
 Source0:       ftp://xmlsoft.org/libxml2/%{realname}-%{version}.tar.gz
-# Source0-md5: 8127a65e8c3b08856093099b52599c86
-Patch0:                %{realname}-amfix.patch
-Patch1:                %{realname}-man_fixes.patch
-Patch2:                %{realname}-open.gz.patch
-Patch3:                %{realname}-largefile.patch
-Patch4:                %{realname}-version-script.patch
+# Source0-md5: c62106f02ee00b6437f0fb9d370c1093
+Patch0:                %{realname}-man_fixes.patch
+Patch1:                %{realname}-open.gz.patch
+Patch2:                %{realname}-largefile.patch
 URL:           http://xmlsoft.org/
-BuildRequires: autoconf >= 2.2
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.4
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-zlib >= 1.2.4-3
@@ -78,8 +76,6 @@ Biblioteka DLL libxml2 dla Windows.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -90,6 +86,7 @@ Biblioteka DLL libxml2 dla Windows.
 %configure \
        --target=%{target} \
        --host=%{target} \
+       --disable-silent-rules \
        --without-python
 
 %{__make}
@@ -108,7 +105,7 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc,gtk-doc,man}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc,gtk-doc,man}
 
 %clean
 rm -rf $RPM_BUILD_ROOT

diff --git a/libxml2-amfix.patch b/libxml2-amfix.patch
deleted file mode 100644 (file)
index 3b35ec2..0000000
--- a/libxml2-amfix.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nur libxml2-2.6.17.orig/Makefile.am libxml2-2.6.17/Makefile.am
---- libxml2-2.6.17.orig/Makefile.am    2005-01-11 10:17:08.000000000 +0100
-+++ libxml2-2.6.17/Makefile.am 2005-01-18 12:10:48.763861240 +0100
-@@ -4,7 +4,7 @@
- 
- DIST_SUBDIRS = include . doc example python xstc
- 
--INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
-+INCLUDES = -I$(top_builddir)/include -I$(srcdir)/include $(THREAD_CFLAGS) $(Z_CFLAGS)
- 
- noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
-                 testThreads testC14N testAutomata testRegexp \
-@@ -16,7 +16,7 @@
- bin_SCRIPTS=xml2-config
- 
- lib_LTLIBRARIES = libxml2.la
--libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
-+libxml2_la_LIBADD = $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
- 
- if USE_VERSION_SCRIPT
- LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
-@@ -24,10 +24,10 @@
- LIBXML2_VERSION_SCRIPT =
- endif
- 
--libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ \
-+libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) \
-                      $(LIBXML2_VERSION_SCRIPT) \
--                   -version-info @LIBXML_VERSION_INFO@ \
--                   @MODULE_PLATFORM_LIBS@
-+                   -version-info $(LIBXML_VERSION_INFO) \
-+                   $(MODULE_PLATFORM_LIBS)
- 
- if WITH_TRIO_SOURCES
- libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
-@@ -41,7 +41,7 @@
- endif
- 
- DEPS = $(top_builddir)/libxml2.la
--LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
-+LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
- 
- 
- man_MANS = xml2-config.1 libxml.3
-@@ -52,7 +52,7 @@
- xmllint_SOURCES=xmllint.c
- xmllint_LDFLAGS = 
- xmllint_DEPENDENCIES = $(DEPS)
--xmllint_LDADD=  @RDL_LIBS@ $(LDADDS)
-+xmllint_LDADD=  $(RDL_LIBS) libxml2.la
- 
- testSAX_SOURCES=testSAX.c
- testSAX_LDFLAGS = 
-@@ -1031,8 +1031,6 @@
- 
- CLEANFILES=xml2Conf.sh
- 
--confexecdir=$(libdir)
--confexec_DATA = xml2Conf.sh
- CVS_EXTRA_DIST=
- EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
-              libxml.m4 Copyright check-xml-test-suite.py gentest.py \

diff --git a/libxml2-version-script.patch b/libxml2-version-script.patch
deleted file mode 100644 (file)
index bc07645..0000000
--- a/libxml2-version-script.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxml2-2.7.8/configure.in.orig    2010-11-04 18:01:19.000000000 +0100
-+++ libxml2-2.7.8/configure.in 2010-11-13 19:34:41.607099099 +0100
-@@ -84,7 +84,7 @@
-   esac
- fi
- AC_SUBST(VERSION_SCRIPT_FLAGS)
--AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
-+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
- 
- dnl
- dnl We process the AC_ARG_WITH first so that later we can modify