- updated to 1.95.3 (many bug fixes)

- rebuilding ac/am is not necessary and creates problems with libtool;
  use only DESTDIR patch
- new %%doc, added xmlwf program, removed English "es" translations

Changed files:
    expat-DESTDIR.patch -> 1.1
    expat-ac_fix.patch -> 1.2
    expat.spec -> 1.20

diff --git a/expat-DESTDIR.patch b/expat-DESTDIR.patch
new file mode 100644 (file)
index 0000000..9e3051b
--- /dev/null
+++ b/expat-DESTDIR.patch
@@ -0,0 +1,32 @@
+--- expat-1.95.3/Makefile.in.orig      Mon Jun  3 20:16:07 2002
++++ expat-1.95.3/Makefile.in   Mon Jul  8 23:44:12 2002
+@@ -30,7 +30,7 @@
+ bindir = @bindir@
+ libdir = @libdir@
+ includedir = @includedir@
+-mandir = ${prefix}/man/man1
++mandir = @mandir@/man1
+ 
+ top_builddir = .
+ 
+@@ -68,14 +68,14 @@
+       tests/runtests
+ 
+ install: xmlwf/xmlwf installlib
+-      $(mkinstalldirs) $(bindir) $(mandir)
+-      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
+-      $(INSTALL_DATA) doc/xmlwf.1 $(mandir)
++      $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
++      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf
++      $(INSTALL_DATA) doc/xmlwf.1 $(DESTDIR)$(mandir)
+ 
+ installlib: lib/$(LIBRARY) lib/$(APIHEADER)
+-      $(mkinstalldirs) $(libdir) $(includedir)
+-      $(LIBTOOL) --mode=install $(INSTALL) lib/$(LIBRARY) $(libdir)/$(LIBRARY)
+-      $(INSTALL_DATA) lib/$(APIHEADER) $(includedir)
++      $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
++      $(LIBTOOL) --mode=install $(INSTALL) lib/$(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
++      $(INSTALL_DATA) lib/$(APIHEADER) $(DESTDIR)$(includedir)
+ 
+ uninstall: uninstalllib
+       $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf

diff --git a/expat-ac_fix.patch b/expat-ac_fix.patch
deleted file mode 100644 (file)
index 6259fbc..0000000
--- a/expat-ac_fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- expat-1.95.2/configure.in~ Fri Jul 27 22:33:34 2001
-+++ expat-1.95.2/configure.in  Mon Jul 30 18:58:34 2001
-@@ -76,7 +76,7 @@
- 
- dnl Note: Avoid using AC_C_BIGENDIAN because it does not
- dnl work in a cross compile.
--AC_C_BIGENDIAN_CROSS
-+AC_C_BIGENDIAN
- 
- AC_C_CONST
- AC_TYPE_OFF_T
---- expat-1.95.2/xmlwf/Makefile.in~    Fri Jul 27 22:33:34 2001
-+++ expat-1.95.2/xmlwf/Makefile.in     Mon Jul 30 19:21:10 2001
-@@ -48,11 +48,11 @@
-       $(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
- 
- install: xmlwf
--      $(mkinstalldirs) $(bindir)
--      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf $(bindir)/xmlwf
-+      $(mkinstalldirs) $(DESTDIR)$(bindir)
-+      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf $(DESTDIR)$(bindir)/xmlwf
- 
- uninstall:
--      $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
-+      $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf
- 
- check:        $(SUBDIRS)
-       @echo
---- expat-1.95.2/lib/Makefile.in~      Fri Jul 27 22:33:34 2001
-+++ expat-1.95.2/lib/Makefile.in       Mon Jul 30 19:26:35 2001
-@@ -135,13 +135,13 @@
-       @echo
- 
- install: $(LIBRARY) $(APIHEADER)
--      $(mkinstalldirs) $(libdir) $(includedir)
--      $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
--      $(INSTALL_DATA) $(APIHEADER) $(includedir)
-+      $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
-+      $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
-+      $(INSTALL_DATA) $(APIHEADER) $(DESTDIR)$(includedir)
- 
- uninstall:
--      $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY);
--      rm -f $(libdir)/$(APIHEADER)
-+      $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY);
-+      rm -f $(DESTDIR)$(libdir)/$(APIHEADER)
- 
- $(LIBRARY): $(LTOBJECTS)
-       $(LINK) -rpath $(libdir) $(LDFLAGS) $(LTOBJECTS)

diff --git a/expat.spec b/expat.spec
index b55e0010d3801c44c8a05a8573f824011cf13eac..baa25d360ba033c8c21188440ddfede2335c1729 100644 (file)
--- a/expat.spec
+++ b/expat.spec
@@ -1,18 +1,14 @@
 Summary:       XML 1.0 parser
-Summary(es):   expat XML library
-Summary(pl):   XML 1.0 parser
+Summary(pl):   Parser XML 1.0
 Summary(pt_BR):        Biblioteca XML expat
 Name:          expat
-Version:       1.95.2
-Release:       3
+Version:       1.95.3
+Release:       1
 License:       Thai Open Source Software Center Ltd (distributable)
 Group:         Applications/Publishing/XML
 Source0:       ftp://download.sourceforge.net/pub/sourceforge/expat/%{name}-%{version}.tar.gz
-Patch0:                %{name}-ac_fix.patch
+Patch0:                %{name}-DESTDIR.patch
 URL:           http://expat.sourceforge.net/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libexpat1_95
 
@@ -20,11 +16,6 @@ Obsoletes:   libexpat1_95
 Expat is an XML parser written in C. It aims to be fully conforming.
 It is currently not a validating XML parser.
 
-%description -l es
-This is James Clark's expat XML parser library in C. It is a stream
-oriented parser that requires setting handlers to deal with the
-structure that the parser discovers in the document.
-
 %description -l pl
 Expat to parser XML napisany w jêzyku C.
 
@@ -46,17 +37,16 @@ Obsoletes:  libexpat1_95-devel
 Expat header files.
 
 %description devel -l es
-Archivos de inclusión del expat
+Archivos de inclusión del expat.
 
 %description devel -l pl
 Pliki nag³ówkowe do biblioteki expat.
 
 %description devel -l pt_BR
-Arquivos de inclusão do expat
+Arquivos de inclusão do expat.
 
 %package static
 Summary:       Expat static library
-Summary(es):   Expat static libs
 Summary(pl):   Biblioteka statyczna expat
 Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com a biblioteca expat
 Group:         Development/Libraries
@@ -65,24 +55,19 @@ Requires:   %{name} = %{version}
 %description static
 Expat static library.
 
-%description static -l es
-Expat static libs
-
 %description static -l pl
-Bioblioteka statyczna expat.
+Biblioteka statyczna expat.
 
 %description static -l pt_BR
-Bibliotecas estáticas para desenvolvimento com a biblioteca expat
+Bibliotecas estáticas para desenvolvimento com a biblioteca expat.
 
 %prep
 %setup -q
 %patch0 -p1
 
 %build
-%{__libtoolize}
-aclocal
-%{__autoconf}
 %configure
+
 %{__make}
 
 %install
@@ -90,21 +75,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-gzip -9nf Changes COPYING README
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_bindir}/*
+%{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%doc *.gz doc/*
+%doc Changes COPYING README doc/{reference.html,style.css}
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
 %{_includedir}/*