cleanup updated with 2.4.8 Daniel

* libxml.spec.in: cleanup
* include/libxml/xmlwin32version.h: updated with 2.4.8
Daniel

ChangeLog

+Sun Nov  4 23:12:38 CET 2001 Daniel Veillard <daniel@veillard.com>
+
+	* libxml.spec.in: cleanup
+	* include/libxml/xmlwin32version.h: updated with 2.4.8
+
 Sun Nov  4 21:17:24 CET 2001 Daniel Veillard <daniel@veillard.com>
 
 	* encoding.c global.data globals.c testThreads.c: fix bug #63752

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
 /**

libxml.spec.in

-# 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,56 +38,22 @@ to select subnodes or ranges. A flexible Input/Output mechanism is
 available, with existing HTTP and FTP modules and combined to an
 URI library.
 
-
-%changelog
-
-* Sun Nov  4 2001 Daniel Veillard <veillard@redhat.com>
-
-- 2.4.7 broke SGML catalogs badly. this fixes it.
-
-* Thu Apr 26 2001 Toshio Kuratomi <badger@prtr-13.ucsc.edu>
-
-[2.3.7]
-- Added libxml.m4 to the distribution file list
-- Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0
-- Moved programmer documentation into the devel package
-
-* Thu Sep 23 1999 Daniel Veillard <daniel@veillard.com>
-
-- corrected the spec file alpha stuff
-- switched to version 1.7.1
-- Added validation, XPath, nanohttp, removed memory leaks
-- Renamed CHAR to xmlChar
-
-* Wed Jun  2 1999 Daniel Veillard <daniel@veillard.com>
-
-- Switched to version 1.1: SAX extensions, better entities support, lots of
-  bug fixes.
-
-* Sun Oct  4 1998 Daniel Veillard <daniel@veillard.com>
-
-- Added xml-config to the package
-
-* Thu Sep 24 1998 Michael Fulbright <msf@redhat.com>
-
-- Built release 0.30
-
 %prep
-%setup
+%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=%datadir/man
+  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=%datadir/man
+  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=%datadir/man
+  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=%datadir/man
+  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir}
 %endif
 fi
 
@@ -106,9 +67,9 @@ 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
+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
@@ -121,9 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %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*
+%doc %{_mandir}/man1/xmllint.1*
+%doc %{_mandir}/man1/xmlcatalog.1*
+%doc %{_mandir}/man4/libxml.4*
 
 %{prefix}/lib/lib*.so.*
 %{prefix}/bin/xmllint
@@ -132,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-, root, root)
 
-%doc /usr/share/man/man1/xml2-config.1*
+%doc %{_mandir}/man1/xml2-config.1*
 %doc doc/*.html doc/html
 
 %{prefix}/lib/lib*.so
@@ -142,3 +103,38 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/bin/xml2-config
 %{prefix}/share/aclocal/libxml.m4
 %{prefix}/lib/pkgconfig/libxml-2.0.pc
+
+%changelog
+
+* Sun Nov  4 2001 Daniel Veillard <veillard@redhat.com>
+
+- cleaned up the specfile
+- 2.4.7 broke SGML catalogs badly. this fixes it.
+
+* Thu Apr 26 2001 Toshio Kuratomi <badger@prtr-13.ucsc.edu>
+
+[2.3.7]
+- Added libxml.m4 to the distribution file list
+- Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0
+- Moved programmer documentation into the devel package
+
+* Thu Sep 23 1999 Daniel Veillard <daniel@veillard.com>
+
+- corrected the spec file alpha stuff
+- switched to version 1.7.1
+- Added validation, XPath, nanohttp, removed memory leaks
+- Renamed CHAR to xmlChar
+
+* Wed Jun  2 1999 Daniel Veillard <daniel@veillard.com>
+
+- Switched to version 1.1: SAX extensions, better entities support, lots of
+  bug fixes.
+
+* Sun Oct  4 1998 Daniel Veillard <daniel@veillard.com>
+
+- Added xml-config to the package
+
+* Thu Sep 24 1998 Michael Fulbright <msf@redhat.com>
+
+- Built release 0.30
+