- updated to 1.95.7, removed obsolete gcc3-c++ patch

Changed files:
    expat-gcc3-c++.patch -> 1.2
    expat.spec -> 1.39

diff --git a/expat-gcc3-c++.patch b/expat-gcc3-c++.patch
deleted file mode 100644 (file)
index ac7b886..0000000
--- a/expat-gcc3-c++.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- expat-1.95.6/lib/expat.h.orig      Thu Jan 16 22:03:42 2003
-+++ expat-1.95.6/lib/expat.h   Tue Mar 11 12:16:14 2003
-@@ -488,6 +488,30 @@
-   void (*release)(void *data);
- } XML_Encoding;
- 
-+/* The XML_Status enum gives the possible return values for the
-+   XML_Parse and XML_ParseBuffer functions.  Though the return values
-+   for these functions has always been described as a Boolean value,
-+   the implementation, at least for the 1.95.x series, has always
-+   returned exactly one of these values.  The preprocessor #defines
-+   are included so this stanza can be added to code that still needs
-+   to support older versions of Expat 1.95.x:
-+
-+   #ifndef XML_STATUS_OK
-+   #define XML_STATUS_OK    1
-+   #define XML_STATUS_ERROR 0
-+   #endif
-+
-+   Otherwise, the #define hackery is quite ugly and would have been dropped.
-+*/
-+
-+enum XML_Status {
-+  XML_STATUS_ERROR = 0,
-+#define XML_STATUS_ERROR XML_STATUS_ERROR
-+  XML_STATUS_OK = 1
-+#define XML_STATUS_OK XML_STATUS_OK
-+};
-+
-+
- /* This is called for an encoding that is unknown to the parser.
- 
-    The encodingHandlerData argument is that which was passed as the
-@@ -716,28 +740,7 @@
- /* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
-    detected.  The last call to XML_Parse must have isFinal true; len
-    may be zero for this call (or any other).
--
--   The XML_Status enum gives the possible return values for the
--   XML_Parse and XML_ParseBuffer functions.  Though the return values
--   for these functions has always been described as a Boolean value,
--   the implementation, at least for the 1.95.x series, has always
--   returned exactly one of these values.  The preprocessor #defines
--   are included so this stanza can be added to code that still needs
--   to support older versions of Expat 1.95.x:
--
--   #ifndef XML_STATUS_OK
--   #define XML_STATUS_OK    1
--   #define XML_STATUS_ERROR 0
--   #endif
--
--   Otherwise, the #define hackery is quite ugly and would have been dropped.
- */
--enum XML_Status {
--  XML_STATUS_ERROR = 0,
--#define XML_STATUS_ERROR XML_STATUS_ERROR
--  XML_STATUS_OK = 1
--#define XML_STATUS_OK XML_STATUS_OK
--};
- 
- XMLPARSEAPI(enum XML_Status)
- XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);

diff --git a/expat.spec b/expat.spec
index 23b0a8e52271e213a19832a12e722cb264ab2b04..a9d76288ad6d34ff9f580ae9203096d885a48d75 100644 (file)
--- a/expat.spec
+++ b/expat.spec
@@ -4,17 +4,16 @@ Summary(pt_BR):       Biblioteca XML expat
 Summary(ru):   ðÅÒÅÎÏÓÉÍÁÑ ÂÉÂÌÉÏÔÅËÁ ÒÁÚÂÏÒÁ XML (expat)
 Summary(uk):   ðÅÒÅÎÏÓÉÍÁ ¦Â̦ÏÔÅËÁ ÒÏÚÂÏÒÕ XML (expat)
 Name:          expat
-Version:       1.95.6
-Release:       5
+Version:       1.95.7
+Release:       1
 Epoch:         1
 License:       Thai Open Source Software Center Ltd (distributable)
 Group:         Applications/Publishing/XML
 Source0:       http://dl.sourceforge.net/expat/%{name}-%{version}.tar.gz
-# Source0-md5: ca78d94e83e9f077b5da2bfe28ba986a
+# Source0-md5: 2ff59c2a5cbdd21a285c5f343e214fa9
 Source1:       %{name}.m4
 Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-gcc3-c++.patch
-Patch2:                %{name}-ac_fixes.patch
+Patch1:                %{name}-ac_fixes.patch
 URL:           http://expat.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -105,7 +104,6 @@ Bibliotecas est
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}