Compare commits

..

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

9 changed files with 275 additions and 13 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/OpenSP-1.5.2.tar.gz
OpenSP-1.5.1.tar.gz
OpenSP-1.5.2.tar.gz

View File

@ -1 +0,0 @@
b4e903e980f8a8b3887396a24e067bef126e97d5 SOURCES/OpenSP-1.5.2.tar.gz

198
opensp-configure-c99.patch Normal file
View File

@ -0,0 +1,198 @@
Avoid implicit function declarations because they have been removed
from C in 1999. Future compilers are likely to reject them by
default.
No need to upstream this because the aclocal.m4 file is not checked
into the repository since:
------------------------------------------------------------------------
r412 | clasen | 1999-11-06 14:10:34 +0100 (Sat, 06 Nov 1999) | 3 lines
Changed paths:
M /trunk/sp/Makefile.in
D /trunk/sp/config/aclocal.m4
D /trunk/sp/config/configure.in
M /trunk/sp/configure
A /trunk/sp/configure.in
Install headers in $(includedir)/OpenSP, move configure.in to toplevel,
remove generated file aclocal.m4.
diff --git a/aclocal.m4 b/aclocal.m4
index d7cc45cf7b80ca54..2fde71fb866f12bc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -833,10 +833,6 @@ else
# endif
#endif
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
void fnord() { int i=42;}
int main ()
{
@@ -850,7 +846,7 @@ int main ()
/* dlclose (self); */
}
- exit (status);
+ return status;
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
diff --git a/configure b/configure
index caa2d31585b112bd..90dce8e854b35393 100755
--- a/configure
+++ b/configure
@@ -2917,7 +2917,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- '' \
+ '#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -5186,8 +5186,8 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
@@ -9508,10 +9508,6 @@ else
# endif
#endif
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
void fnord() { int i=42;}
int main ()
{
@@ -9525,7 +9521,7 @@ int main ()
/* dlclose (self); */
}
- exit (status);
+ return status;
}
EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -9606,10 +9602,6 @@ else
# endif
#endif
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
void fnord() { int i=42;}
int main ()
{
@@ -9623,7 +9615,7 @@ int main ()
/* dlclose (self); */
}
- exit (status);
+ return status;
}
EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -13321,10 +13313,6 @@ else
# endif
#endif
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
void fnord() { int i=42;}
int main ()
{
@@ -13338,7 +13326,7 @@ int main ()
/* dlclose (self); */
}
- exit (status);
+ return status;
}
EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -13419,10 +13407,6 @@ else
# endif
#endif
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
void fnord() { int i=42;}
int main ()
{
@@ -13436,7 +13420,7 @@ int main ()
/* dlclose (self); */
}
- exit (status);
+ return status;
}
EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -19110,10 +19094,6 @@ else
# endif
#endif
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
void fnord() { int i=42;}
int main ()
{
@@ -19127,7 +19107,7 @@ int main ()
/* dlclose (self); */
}
- exit (status);
+ return status;
}
EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -19208,10 +19188,6 @@ else
# endif
#endif
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
void fnord() { int i=42;}
int main ()
{
@@ -19225,7 +19201,7 @@ int main ()
/* dlclose (self); */
}
- exit (status);
+ return status;
}
EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -27450,8 +27426,8 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext

View File

@ -1,16 +1,20 @@
Summary: SGML and XML parser
Name: opensp
Version: 1.5.2
Release: 28%{?dist}
Release: 48%{?dist}
Requires: sgml-common >= 0.5
Provides: bundled(gettext) = 0.14.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
Patch4: opensp-configure-c99.patch
License: X11
BuildRequires: make
BuildRequires: gcc-c++
%if ! 0%{?_module_build}
BuildRequires: xmlto, jadetex
@ -25,7 +29,6 @@ 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.
@ -37,6 +40,7 @@ Header files and libtool library for developing applications that use OpenSP.
%patch1 -p1 -b .nodeids
%patch2 -p1 -b .sigsegv
%patch3 -p1 -b .manpage
%patch4 -p1 -b .configure-c99
# convert files to UTF-8
iconv -f latin1 -t utf8 ChangeLog -o ChangeLog.tmp
mv -f ChangeLog.tmp ChangeLog
@ -52,8 +56,8 @@ touch lib/parser_inst.cxx
--disable-doc-build \
%endif
--disable-dependency-tracking --disable-static --enable-http \
--enable-default-catalog=%{_sysconfdir}/sgml/catalog \
--enable-default-search-path=%{_datadir}/sgml:%{_datadir}/xml
--enable-default-catalog=/etc/sgml/catalog \
--enable-default-search-path=/usr/share/sgml:/usr/share/xml
make %{?_smp_mflags}
%install
@ -86,18 +90,17 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSP
%find_lang sp5
# Stop check-rpaths from complaining about standard runpaths.
export QA_RPATHS=0x0001
%check
make check || : # TODO: failures as of 1.5.2 :(
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files -f sp5.lang
%defattr(-,root,root)
%if ! 0%{?_module_build}
%doc doc/*.htm
%doc docsrc/releasenotes.html
@ -111,12 +114,72 @@ make check || : # TODO: failures as of 1.5.2 :(
%endif
%files devel
%defattr(-,root,root)
%{_includedir}/OpenSP/
%{_libdir}/libosp.so
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.5.2-48
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.2-47
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Oct 23 2023 Ondrej Sloup <osloup@redhat.com> - 1.5.2-44
- Update license tag to the SPDX format
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Dec 6 2022 Florian Weimer <fweimer@redhat.com> - 1.5.2-41
- Port configure script to C99
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jul 27 2021 Than Ngo <than@redhat.com> - 1.5.2-38
- Fix FTBFS
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 27 2018 Ondrej Vasik <ovasik@redhat.com> - 1.5.2-31
- add note about bundled old gettext library
* Sat Jul 21 2018 Ondrej Vasik <ovasik@redhat.com> - 1.5.2-30
- BuildRequires: gcc-c++ (#1605338)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1
sources Normal file
View File

@ -0,0 +1 @@
670b223c5d12cee40c9137be86b6c39b OpenSP-1.5.2.tar.gz