From ea89828b38f96daa2fca8133e7ecaeedbb403ca0 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sun, 4 Nov 2001 22:13:45 +0000 Subject: [PATCH] cleanup updated with 2.4.8 Daniel * libxml.spec.in: cleanup * include/libxml/xmlwin32version.h: updated with 2.4.8 Daniel --- ChangeLog | 5 ++ include/libxml/xmlwin32version.h | 8 +- libxml.spec.in | 148 +++++++++++++++---------------- 3 files changed, 81 insertions(+), 80 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9eddd36..0e801900 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Nov 4 23:12:38 CET 2001 Daniel Veillard + + * libxml.spec.in: cleanup + * include/libxml/xmlwin32version.h: updated with 2.4.8 + Sun Nov 4 21:17:24 CET 2001 Daniel Veillard * encoding.c global.data globals.c testThreads.c: fix bug #63752 diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h index c8a86777..5c2c0d4f 100644 --- a/include/libxml/xmlwin32version.h +++ b/include/libxml/xmlwin32version.h @@ -27,21 +27,21 @@ extern void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.4.7" +#define LIBXML_DOTTED_VERSION "2.4.8" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXML_VERSION 20407 +#define LIBXML_VERSION 20408 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXML_VERSION_STRING "20407" +#define LIBXML_VERSION_STRING "20408" /** * LIBXML_TEST_VERSION: @@ -49,7 +49,7 @@ extern void xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20407); +#define LIBXML_TEST_VERSION xmlCheckVersion(20408); #if 0 /** diff --git a/libxml.spec.in b/libxml.spec.in index 08dbef8a..ce4de6ef 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -1,19 +1,14 @@ -# Note that this is NOT a relocatable package -%define ver @VERSION@ -%define prefix /usr -%define datadir %{prefix}/share - Summary: Library providing XML and HTML support Name: libxml2 -Version: %ver +Version: @VERSION@ Release: 1 -Copyright: LGPL +License: LGPL Group: Development/Libraries -Source: ftp://xmlsoft.org/libxml2-%{ver}.tar.gz -BuildRoot: /var/tmp/libxml2-%{PACKAGE_VERSION}-root - +Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://xmlsoft.org/ -Docdir: %{datadir}/doc +Prefix: %{_prefix} +Docdir: %{_docdir} %description This library allows to manipulate XML files. It includes support @@ -43,11 +38,77 @@ to select subnodes or ranges. A flexible Input/Output mechanism is available, with existing HTTP and FTP modules and combined to an URI library. +%prep +%setup -q + +%build +# Needed for snapshot releases. +if [ ! -f configure ]; then +%ifarch alpha + CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} +%else + CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} +%endif +else +%ifarch alpha + CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} +%else + CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} +%endif +fi + +if [ "$SMP" != "" ]; then + (make "MAKE=make -k -j $SMP"; exit 0) + make +else + make +fi + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT%{_mandir}/man1 +install -d $RPM_BUILD_ROOT%{_mandir}/man4 +make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{_mandir} install + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) + +%doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO +%doc %{_mandir}/man1/xmllint.1* +%doc %{_mandir}/man1/xmlcatalog.1* +%doc %{_mandir}/man4/libxml.4* + +%{prefix}/lib/lib*.so.* +%{prefix}/bin/xmllint +%{prefix}/bin/xmlcatalog + +%files devel +%defattr(-, root, root) + +%doc %{_mandir}/man1/xml2-config.1* +%doc doc/*.html doc/html + +%{prefix}/lib/lib*.so +%{prefix}/lib/*a +%{prefix}/lib/*.sh +%{prefix}/include/* +%{prefix}/bin/xml2-config +%{prefix}/share/aclocal/libxml.m4 +%{prefix}/lib/pkgconfig/libxml-2.0.pc %changelog * Sun Nov 4 2001 Daniel Veillard +- cleaned up the specfile - 2.4.7 broke SGML catalogs badly. this fixes it. * Thu Apr 26 2001 Toshio Kuratomi @@ -77,68 +138,3 @@ URI library. - Built release 0.30 -%prep -%setup - -%build -# Needed for snapshot releases. -if [ ! -f configure ]; then -%ifarch alpha - CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man -%else - CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man -%endif -else -%ifarch alpha - CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man -%else - CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" --mandir=%datadir/man -%endif -fi - -if [ "$SMP" != "" ]; then - (make "MAKE=make -k -j $SMP"; exit 0) - make -else - make -fi - -%install -rm -rf $RPM_BUILD_ROOT - -install -d $RPM_BUILD_ROOT%{datadir}/man/man1 -install -d $RPM_BUILD_ROOT%{datadir}/man/man4 -make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{datadir}/man install - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-, root, root) - -%doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO -%doc %{prefix}/share/man/man1/xmllint.1* -%doc %{prefix}/share/man/man1/xmlcatalog.1* -%doc %{prefix}/share/man/man4/libxml.4* - -%{prefix}/lib/lib*.so.* -%{prefix}/bin/xmllint -%{prefix}/bin/xmlcatalog - -%files devel -%defattr(-, root, root) - -%doc /usr/share/man/man1/xml2-config.1* -%doc doc/*.html doc/html - -%{prefix}/lib/lib*.so -%{prefix}/lib/*a -%{prefix}/lib/*.sh -%{prefix}/include/* -%{prefix}/bin/xml2-config -%{prefix}/share/aclocal/libxml.m4 -%{prefix}/lib/pkgconfig/libxml-2.0.pc