From 3e83948baaa472d4ca1213ba082336504312fcb8 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 23 Dec 2024 18:19:50 +0300 Subject: [PATCH] import --- ..metadata | 1 + SOURCES/opensp-configure-c99.patch | 198 +++++++++++++++++++++++++++++ SPECS/opensp.spec | 55 ++++++-- 3 files changed, 245 insertions(+), 9 deletions(-) create mode 100644 ..metadata create mode 100644 SOURCES/opensp-configure-c99.patch diff --git a/..metadata b/..metadata new file mode 100644 index 0000000..e6bc60b --- /dev/null +++ b/..metadata @@ -0,0 +1 @@ +b4e903e980f8a8b3887396a24e067bef126e97d5 SOURCES/OpenSP-1.5.2.tar.gz diff --git a/SOURCES/opensp-configure-c99.patch b/SOURCES/opensp-configure-c99.patch new file mode 100644 index 0000000..64e3e4b --- /dev/null +++ b/SOURCES/opensp-configure-c99.patch @@ -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 ' \ + '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 diff --git a/SPECS/opensp.spec b/SPECS/opensp.spec index 3edb29d..13d4275 100644 --- a/SPECS/opensp.spec +++ b/SPECS/opensp.spec @@ -1,7 +1,7 @@ Summary: SGML and XML parser Name: opensp Version: 1.5.2 -Release: 38%{?dist} +Release: 48%{?dist} Requires: sgml-common >= 0.5 Provides: bundled(gettext) = 0.14.5 URL: http://openjade.sourceforge.net/ @@ -10,7 +10,8 @@ Patch0: opensp-multilib.patch Patch1: opensp-nodeids.patch Patch2: opensp-sigsegv.patch Patch3: opensp-manpage.patch -License: MIT +Patch4: opensp-configure-c99.patch +License: X11 BuildRequires: make BuildRequires: gcc-c++ @@ -39,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 @@ -54,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 @@ -88,6 +90,8 @@ 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 :( @@ -115,12 +119,45 @@ make check || : # TODO: failures as of 1.5.2 :( %changelog -* Mon Aug 09 2021 Mohan Boddu - 1.5.2-38 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Dec 23 2024 Arkady L. Shane - +- Rebuilt for MSVSphere 10 -* Fri Apr 16 2021 Mohan Boddu - 1.5.2-37 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Oct 29 2024 Troy Dawson - 1.5.2-48 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.5.2-47 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.5.2-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.5.2-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 23 2023 Ondrej Sloup - 1.5.2-44 +- Update license tag to the SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 1.5.2-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.5.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Dec 6 2022 Florian Weimer - 1.5.2-41 +- Port configure script to C99 + +* Fri Jul 22 2022 Fedora Release Engineering - 1.5.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.5.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Than Ngo - 1.5.2-38 +- Fix FTBFS + +* Thu Jul 22 2021 Fedora Release Engineering - 1.5.2-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Tue Jan 26 2021 Fedora Release Engineering - 1.5.2-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild