diff --git a/openjade.spec b/openjade.spec index 14d099f..3c73ff9 100644 --- a/openjade.spec +++ b/openjade.spec @@ -2,14 +2,14 @@ Summary: A DSSSL implementation. Name: openjade Version: 1.3.2 -Release: 9 +Release: 11.1 Prereq: sgml-common >= 0.5 Prereq: docbook-dtds Source0: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz Source1: http://download.sourceforge.net/openjade/OpenSP-%{opensp_ver}.tar.gz Patch0: openjade-1.3.1-manpage.patch Patch1: openjade-ppc64.patch -Patch3: opensp-1.5-gcc33.patch +Patch3: opensp-1.5-gcc34.patch Patch4: openjade-1.3.1-nsl.patch License: Distributable Group: Applications/Text @@ -48,7 +48,7 @@ pushd %{openjadetop}/openjade-%{version} popd pushd %{openjadetop}/OpenSP-%{opensp_ver} -%patch3 -p1 -b .gcc33 +%patch3 -p1 -b .gcc34 popd %build @@ -141,6 +141,15 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/* %changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 31 2004 Tim Waugh 1.3.2-10 +- More C++ fixes (for GCC 3.4). + * Thu Dec 4 2003 Tim Waugh 1.3.2-9 - No longer need httphost patch. diff --git a/opensp-1.5-gcc34.patch b/opensp-1.5-gcc34.patch new file mode 100644 index 0000000..4b4a297 --- /dev/null +++ b/opensp-1.5-gcc34.patch @@ -0,0 +1,74 @@ +--- OpenSP-1.5/include/Attribute.h.gcc33 2003-05-22 17:04:20.000000000 +0100 ++++ OpenSP-1.5/include/Attribute.h 2003-05-22 17:04:48.000000000 +0100 +@@ -25,12 +25,32 @@ + class Entity; + class Notation; + class DeclaredValue; +-class AttributeValue; + class TokenizedAttributeValue; + class AttributeSemantics; + class AttributeContext; + class Syntax; + ++class SP_API AttributeValue : public Resource { ++public: ++ enum Type { ++ implied, ++ cdata, ++ tokenized ++ }; ++ AttributeValue(); ++ virtual ~AttributeValue(); ++ virtual AttributeSemantics *makeSemantics(const DeclaredValue *, ++ AttributeContext &, ++ const StringC &, ++ unsigned &, ++ unsigned &) const; ++ virtual Type info(const Text *&, const StringC *&) const = 0; ++ virtual const Text *text() const; ++ virtual Boolean recoverUnquoted(const StringC &, const Location &, ++ AttributeContext &, const StringC &); ++ static Boolean handleAsUnterminated(const Text &, AttributeContext &); ++}; ++ + class SP_API AttributeDefinitionDesc { + public: + AttributeDefinitionDesc() { } +@@ -380,27 +400,6 @@ + ConstPtr notation_; + }; + +-class SP_API AttributeValue : public Resource { +-public: +- enum Type { +- implied, +- cdata, +- tokenized +- }; +- AttributeValue(); +- virtual ~AttributeValue(); +- virtual AttributeSemantics *makeSemantics(const DeclaredValue *, +- AttributeContext &, +- const StringC &, +- unsigned &, +- unsigned &) const; +- virtual Type info(const Text *&, const StringC *&) const = 0; +- virtual const Text *text() const; +- virtual Boolean recoverUnquoted(const StringC &, const Location &, +- AttributeContext &, const StringC &); +- static Boolean handleAsUnterminated(const Text &, AttributeContext &); +-}; +- + class SP_API ImpliedAttributeValue : public AttributeValue { + public: + ImpliedAttributeValue(); +--- OpenSP-1.5/include/RangeMap.cxx.gcc34 2004-01-31 13:50:50.000000000 +0000 ++++ OpenSP-1.5/include/RangeMap.cxx 2004-01-31 13:51:36.000000000 +0000 +@@ -7,6 +7,7 @@ + #include "RangeMap.h" + #include "ISet.h" + #include "types.h" ++#include "constant.h" + + #ifdef SP_NAMESPACE + namespace SP_NAMESPACE {