Browse Source

opensp package update

Signed-off-by: basebuilder_pel7ppc64lebuilder0 <basebuilder@powerel.org>
master
basebuilder_pel7ppc64lebuilder0 5 years ago
parent
commit
bf9d2dc8a8
  1. 39
      SOURCES/opensp-manpage.patch
  2. 91
      SOURCES/opensp-multilib.patch
  3. 128
      SOURCES/opensp-nodeids.patch
  4. 20
      SOURCES/opensp-sigsegv.patch
  5. 190
      SPECS/opensp.spec

39
SOURCES/opensp-manpage.patch

@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
diff -urNp OpenSP-1.5.2-orig/docsrc/osgmlnorm.xml OpenSP-1.5.2/docsrc/osgmlnorm.xml
--- OpenSP-1.5.2-orig/docsrc/osgmlnorm.xml 2005-12-08 20:34:01.000000000 +0100
+++ OpenSP-1.5.2/docsrc/osgmlnorm.xml 2013-08-15 14:58:01.284430911 +0200
@@ -173,6 +173,15 @@
<para>Show error numbers in error messages.</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><option>-g</option></term>
+ <term><option>--open-elements</option></term>
+ <listitem>
+ <para>Show the generic identifiers of open elements in error
+ messages.</para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term><option>-h</option></term>
diff -urNp OpenSP-1.5.2-orig/docsrc/ospam.xml OpenSP-1.5.2/docsrc/ospam.xml
--- OpenSP-1.5.2-orig/docsrc/ospam.xml 2005-12-08 20:34:01.000000000 +0100
+++ OpenSP-1.5.2/docsrc/ospam.xml 2013-08-15 14:53:58.414782217 +0200
@@ -151,6 +151,16 @@
of stderr.</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><option>-g</option></term>
+ <term><option>--open-elements</option></term>
+ <listitem>
+ <para>Show the generic identifiers of open elements in error
+ messages.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>-h</option></term>
<term><option>--hoist-omitted-tags</option></term>

91
SOURCES/opensp-multilib.patch

@ -0,0 +1,91 @@ @@ -0,0 +1,91 @@
--- OpenSP-1.5.2/configure.in.multilib 2005-12-23 14:15:21.000000000 +0000
+++ OpenSP-1.5.2/configure.in 2006-06-13 13:36:49.000000000 +0100
@@ -90,7 +90,7 @@
#define SP_SIZEOF_BOOL_1
#endif
-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT)
+#if (WCHAR_MAX == SHRT_MAX)
#define SP_WCHAR_T_USHORT
#endif
--- OpenSP-1.5.2/lib/parser_inst.cxx.multilib 2005-07-21 16:33:41.000000000 +0100
+++ OpenSP-1.5.2/lib/parser_inst.cxx 2006-06-13 13:36:49.000000000 +0100
@@ -9,6 +9,7 @@
// Copyright (c) 1994 James Clark
// See the file COPYING for copying permission.
+#include <limits.h>
#include "splib.h"
#ifdef SP_MANUAL_INST
@@ -1338,7 +1339,7 @@
#endif
#endif
// we really just want to test if size_t == unsigned int
-#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT)
+#if INT_MAX != SSIZE_MAX
#ifdef __DECCXX
#pragma define_template Vector<unsigned int>
#else
--- OpenSP-1.5.2/lib/parser_inst.m4.multilib 2005-05-14 10:17:35.000000000 +0100
+++ OpenSP-1.5.2/lib/parser_inst.m4 2006-06-13 13:36:49.000000000 +0100
@@ -1,6 +1,7 @@
// Copyright (c) 1994 James Clark
// See the file COPYING for copying permission.
+#include <limits.h>
#include "splib.h"
#ifdef SP_MANUAL_INST
@@ -166,7 +167,7 @@
__instantiate(Vector<LeafContentToken*>)
__instantiate(Vector<size_t>)
// we really just want to test if size_t == unsigned int
-#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT)
+#if INT_MAX != SSIZE_MAX
__instantiate(Vector<unsigned int>)
#endif
--- OpenSP-1.5.2/config.h.in.multilib 2005-11-05 09:43:42.000000000 +0000
+++ OpenSP-1.5.2/config.h.in 2006-06-13 13:41:45.000000000 +0100
@@ -1,5 +1,7 @@
/* config.h.in. Generated from configure.in by autoheader. */
+#include <limits.h>
+
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/
@@ -333,22 +335,6 @@
/* The size of a `bool', as computed by sizeof. */
#undef SIZEOF_BOOL
-/* The size of a `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of a `unsigned int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_INT
-
-/* The size of a `unsigned short', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_SHORT
-
-/* The size of a `wchar_t', as computed by sizeof. */
-#undef SIZEOF_WCHAR_T
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
- it. */
-#undef SIZE_MAX
-
/* define this if h_errno should be declared extern int */
#undef SP_DECLARE_H_ERRNO
@@ -503,7 +489,7 @@
#define SP_SIZEOF_BOOL_1
#endif
-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT)
+#if (WCHAR_MAX == SHRT_MAX)
#define SP_WCHAR_T_USHORT
#endif

128
SOURCES/opensp-nodeids.patch

@ -0,0 +1,128 @@ @@ -0,0 +1,128 @@
--- OpenSP-1.5.2/docsrc/releasenotes.xml.nodeids 2006-10-13 13:54:59.000000000 +0100
+++ OpenSP-1.5.2/docsrc/releasenotes.xml 2006-10-13 13:58:25.000000000 +0100
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<book>
+<book id="relnotesb">
<bookinfo>
<title>OpenSP 1.5.2</title>
<subtitle>Release Notes</subtitle>
@@ -16,7 +16,7 @@
</copyright>
</bookinfo>
- <chapter><title>OpenSP 1.5.2 Release Notes</title>
+ <chapter id="relnotesc"><title>OpenSP 1.5.2 Release Notes</title>
<para>The OpenJade project provides a suite of tools and libraries for
validating, processing and applying DSSSL (Document Style Semantics and
@@ -29,7 +29,7 @@
can be used as a basis for either open source or commerical projects. The
library can be built as either a dynamic or static library.
</para>
- <sect1><title>Applications of OpenSP</title>
+ <sect1 id="apps"><title>Applications of OpenSP</title>
<para>The OpenSP library has been used in a number of projects. The
World Wide Web consortium on-line HTML and XHTML validator is based on the
OpenSP library. In addition to the OpenSP library a set of command line tools
@@ -41,7 +41,7 @@
tools.</para>
</sect1>
- <sect1><title>Obtaining OpenSP</title>
+ <sect1 id="obtaining"><title>Obtaining OpenSP</title>
<para>OpenSP is a project hosted at sourceforge.net and is available
from the OpenJade web site at http://openjade.sourceforge.net or directly from
the OpenJade project page at http://sourceforge.net/projects/openjade</para>
@@ -49,7 +49,7 @@
linkend="bindist"/> for information on how to obtain pre-compiled
binary packages.</para>
</sect1>
- <sect1><title>Supported Platforms</title>
+ <sect1 id="supported"><title>Supported Platforms</title>
<para>OpenSP is intended to be as portable as possible. It should be
possible to compile and build on most contemporary UNIX type platforms. In
addition OpenSP should also build on Microsoft's Win32 based operating
@@ -166,7 +166,7 @@
<email>openjade-devel@lists.sourceforge.net</email>, including any
diffs/patches you have used.</para>
</sect1>
- <sect1><title>Building OpenSP from Source</title>
+ <sect1 id="building"><title>Building OpenSP from Source</title>
<para>OpenSP requires 20Mb to 50Mb of disk space to build. An
installation will require around 10Mb to 20Mb depending on
architecture.</para>
@@ -249,7 +249,7 @@
the latest version of OpenSP to be available from your distributor in due
course.</para>
</sect1>
- <sect1><title>Installation</title>
+ <sect1 id="installation"><title>Installation</title>
<para>In addition to the OpenSP executables and libraries you will also
need various DTDs and declaration files. Some DTDs and associated files
(entity definitions) are available in the <filename>pubtext</filename>
@@ -263,7 +263,7 @@
recommended that you set up and use such a catalog system.
</para>
</sect1>
- <sect1><title>Support</title>
+ <sect1 id="support"><title>Support</title>
<para>If, after reading the documentation, you still have a problem,
then you may require some additional help. The OpenJade project is a volunteer
effort and as such does not provide any formal support. Instead, you should
@@ -299,7 +299,7 @@
often the case that someone has had the same problem before.</para>
</sect1>
- <sect1><title>Version 1.5.2</title>
+ <sect1 id="v152"><title>Version 1.5.2</title>
<formalpara><title>Released December 2005.</title>
<para>The release contains a number of enhancements together with
support for version 4.0 of the GNU C++ compiler.</para>
@@ -418,7 +418,7 @@
</table>
</sect1>
- <sect1><title>Version 1.5.1</title>
+ <sect1 id="v151"><title>Version 1.5.1</title>
<formalpara><title>Released October 2003.</title>
<para>The release contains a number of new features together with
support for version 3.3 for the GNU C++ compiler.</para>
@@ -613,7 +613,7 @@
</table>
</sect1>
- <sect1><title>Version 1.5</title>
+ <sect1 id="v15"><title>Version 1.5</title>
<formalpara><title>Released November 2002.</title>
<para>In addition to many new features this version also supports the
latest GNU C++ compiler: gcc 3.2 at the time of writing.</para>
@@ -976,7 +976,7 @@
</tgroup>
</table>
</sect1>
- <sect1>
+ <sect1 id="v14">
<title>Version 1.4</title>
<formalpara><title>Released February 2000</title>
<para>Version 1.4 added many improvements. Changes
@@ -1023,7 +1023,7 @@
</listitem>
</itemizedlist>
</sect1>
- <sect1><title>Version 1.3.4</title>
+ <sect1 id="v134"><title>Version 1.3.4</title>
<formalpara><title>Released October 1999</title>
<para>The second release from the OpenJade project. This version was
distributed as part of OpenJade 1.3</para>
@@ -1040,7 +1040,7 @@
</itemizedlist>
</sect1>
- <sect1><title>Version 1.3.3</title>
+ <sect1 id="v133"><title>Version 1.3.3</title>
<para>The first release from the OpenJade project</para>
</sect1>
</chapter>

20
SOURCES/opensp-sigsegv.patch

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
--- OpenSP-1.5.2/lib/ExtendEntityManager.cxx 2005-11-05 10:05:20.000000000 +0100
+++ OpenSP-1.5.2.new/lib/ExtendEntityManager.cxx 2007-06-21 12:56:26.000000000 +0200
@@ -1238,7 +1238,8 @@ StorageObjectSpec::StorageObjectSpec()
}
StorageObjectSpec::StorageObjectSpec(const StorageObjectSpec& x)
-: codingSystemName(x.codingSystemName),
+: storageManager(x.storageManager),
+ codingSystemName(x.codingSystemName),
codingSystem(x.codingSystem),
specId(x.specId),
baseId(x.baseId),
@@ -1253,6 +1254,7 @@ StorageObjectSpec::StorageObjectSpec(con
StorageObjectSpec& StorageObjectSpec::operator=(const StorageObjectSpec& x)
{
if (this != &x) {
+ storageManager = x.storageManager;
codingSystemName = x.codingSystemName;
codingSystem = x.codingSystem;
specId = x.specId;

190
SPECS/opensp.spec

@ -0,0 +1,190 @@ @@ -0,0 +1,190 @@
Summary: SGML and XML parser
Name: opensp
Version: 1.5.2
Release: 19%{?dist}
Requires: sgml-common >= 0.5
URL: http://openjade.sourceforge.net/
Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz
Patch0: opensp-multilib.patch
Patch1: opensp-nodeids.patch
Patch2: opensp-sigsegv.patch
Patch3: opensp-manpage.patch
License: MIT
Group: Applications/Text

BuildRequires: xmlto, jadetex

%description
OpenSP is an implementation of the ISO/IEC 8879:1986 standard SGML
(Standard Generalized Markup Language). OpenSP is based on James
Clark's SP implementation of SGML. OpenSP is a command-line
application and a set of components, including a generic API.

%package devel
Summary: Files for developing applications that use OpenSP
Requires: %{name} = %{version}-%{release}
Group: Development/Libraries

%description devel
Header files and libtool library for developing applications that use OpenSP.


%prep
%setup -q -n OpenSP-%{version}
%patch0 -p1 -b .multilib
%patch1 -p1 -b .nodeids
%patch2 -p1 -b .sigsegv
%patch3 -p1 -b .manpage
# convert files to UTF-8
iconv -f latin1 -t utf8 ChangeLog -o ChangeLog.tmp
mv -f ChangeLog.tmp ChangeLog

%build
%configure --disable-dependency-tracking --disable-static --enable-http \
--enable-default-catalog=%{_sysconfdir}/sgml/catalog \
--enable-default-search-path=%{_datadir}/sgml:%{_datadir}/xml
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

# Get rid of libtool libraries
rm $RPM_BUILD_ROOT%{_libdir}/*.la

# oMy, othis ois osilly.
for file in nsgmls sgmlnorm spam spent sx ; do
ln -s o$file $RPM_BUILD_ROOT%{_bindir}/$file
echo ".so man1/o${file}.1" > $RPM_BUILD_ROOT%{_mandir}/man1/${file}.1
done

#
# Rename sx to sgml2xml.
mv $RPM_BUILD_ROOT%{_bindir}/sx $RPM_BUILD_ROOT%{_bindir}/sgml2xml
mv $RPM_BUILD_ROOT%{_mandir}/man1/{sx,sgml2xml}.1

#
# Clean out (installed) redundant copies of the docs and DTDs.
rm -rf $RPM_BUILD_ROOT%{_docdir}/OpenSP
rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSP

%find_lang sp5


%check
make check || : # TODO: failures as of 1.5.2 :(


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files -f sp5.lang
%defattr(-,root,root)
%doc doc/*.htm
%doc docsrc/releasenotes.html
%doc AUTHORS BUGS COPYING ChangeLog NEWS README
%doc pubtext/opensp-implied.dcl
%{_bindir}/*
%{_libdir}/libosp.so.*
%{_mandir}/man1/*.1*

%files devel
%defattr(-,root,root)
%{_includedir}/OpenSP/
%{_libdir}/libosp.so


%changelog
* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1.5.2-19
- Mass rebuild 2014-01-24

* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.5.2-18
- Mass rebuild 2013-12-27

* Thu Aug 15 2013 Ondrej Vasik <ovasik@redhat.com> - 1.5.2-18
- fix the inconsistency between man page and help (#854941)

* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Fri Oct 24 2008 Ondrej Vasik <ovasik@redhat.com> 1.5.2-10
- move conversion to prep, do not convert html doc(#226217)

* Thu Oct 23 2008 Ondrej Vasik <ovasik@redhat.com> 1.5.2-9
- convert doc files to UTF-8 (#226217)

* Wed Oct 22 2008 Ondrej Vasik <ovasik@redhat.com> 1.5.2-8
- merge review by V.Skyttä (#226217), changed license to
MIT, dropped .la, adjusted comments

* Mon Feb 11 2008 Ondrej Vasik <ovasik@redhat.com> 1.5.2-7
- gcc43 rebuild

* Mon Aug 27 2007 Ondrej Vasik <ovasik@redhat.com> 1.5.2-6
- License tag change to BSD
- Rebuilt for F8

* Thu Jun 21 2007 Ondrej Vasik <ovasik@redhat.com> 1.5.2-5
- fixed SIGSEGV (bug #245104)

* Mon Feb 12 2007 Tim Waugh <twaugh@redhat.com> 1.5.2-4
- Fixed build root.
- Give IDs to nodes in the release notes source to prevent releasenotes.html
having multilib conflicts (bug #228320).

* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.5.2-3.1
- rebuild

* Tue Jun 13 2006 Tim Waugh <twaugh@redhat.com> 1.5.2-3
- Fixed multilib fix (bug #194702).

* Fri May 26 2006 Tim Waugh <twaugh@redhat.com> 1.5.2-2
- Fixed multilib devel conflicts (bug #192741).

* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.5.2-1.2
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.5.2-1.1
- rebuilt for new gcc4.1 snapshot and glibc changes

* Thu Jan 5 2006 Tim Waugh <twaugh@redhat.com> 1.5.2-1
- 1.5.2.

* Tue Dec 14 2005 Tim Waugh <twaugh@redhat.com> 1.5.1-2
- Backported patch from 1.5.2pre1 to fix ArcEngine crash.

* Tue Dec 13 2005 Tim Waugh <twaugh@redhat.com> 1.5.1-1
- Back down to 1.5.1 for now.
- Fixes for GCC4.1.

* Sun Dec 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.5.2-0.1.pre1
- Fix build dependencies.
- Require exact version of main package in -devel.
- Build with dependency tracking disabled.
- Add %%{_datadir}/xml to default search path.
- Run test suite during build.
- Add URL tag.
- Use %%find_lang.
- Cosmetic improvements.

* Tue Nov 29 2005 Terje Bless <link@pobox.com> 1.5.2-0.pre1
- New package OpenSP.

Loading…
Cancel
Save