[rpms/gnucobol] epel8: Merge branch 'rawhide' into epel8

[rpms/gnucobol] epel8: Merge branch 'rawhide' into epel8

[Gwyn Ciesla]

A new commit has been pushed.

Repo   : rpms/gnucobol
Branch : epel8
Commit : a018e9117d6477463361fba0929919b3c8414827
Author : Gwyn Ciesla <gwync@protonmail.com>
Date   : 2026-08-27T14:34:32-05:00
Stats  : +86/-19 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/gnucobol/c/a018e9117d6477463361fba0929919b3c8414827?branch=epel8

Log:
Merge branch 'rawhide' into epel8

---
diff --git a/.gitignore b/.gitignore
index 3428fd9..c749e98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /gnucobol-3.1.2.tar.gz.sig
 /gnucobol-3.2.tar.gz
 /gnucobol-3.2.tar.gz.sig
+/gnucobol-sql-3.0.tar.gz

diff --git a/gnucobol.spec b/gnucobol.spec
index fbee300..f081abf 100644
--- a/gnucobol.spec
+++ b/gnucobol.spec
@@ -3,16 +3,20 @@
 
 Name:           gnucobol
 Version:        3.2
-Release:        1%{?dist}
+Release:        11%{?dist}
 Summary:        COBOL compiler
 
-License:        GPLv3+ AND LGPL-3.0-or-later AND GFDL-1.3-only
+License:        GPL-3.0-or-later AND LGPL-3.0-or-later AND GFDL-1.3-only AND FSFAP AND GPL-2.0-or-later AND LGPL-3.0-or-later
 
 URL:            https://www.gnu.org/software/gnucobol/
 Source0:        https://ftp.gnu.org/gnu/gnucobol/gnucobol-%{version}.tar.gz
 Source1:        https://ftp.gnu.org/gnu/gnucobol/gnucobol-%{version}.tar.gz.sig
 Source2:        https://ftp.gnu.org/gnu/gnu-keyring.gpg
 Source3:        https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z
+Source4:        http://downloads.sourceforge.net/%{name}/contrib/esql/%{name}-sql-3.0.tar.gz
+
+# https://sourceforge.net/p/gnucobol/bugs/941/
+Patch0:         xml-parser.patch
 
 BuildRequires:  gcc
 BuildRequires:  gmp-devel
@@ -22,13 +26,11 @@ BuildRequires:  gettext
 BuildRequires:  gnupg2
 BuildRequires:  perl-interpreter
 BuildRequires:  libxml2-devel
-%if 0%{?el7}
-BuildRequires:  json-c12-devel
-%else
 BuildRequires:  json-c-devel
-%endif
 BuildRequires: make
-
+# esql
+BuildRequires: unixODBC-devel
+BuildRequires: gcc-c++
 
 Requires:       gcc
 Requires:       glibc-devel
@@ -48,58 +50,111 @@ License:        LGPL-3.0-or-later
 %{summary}.
 Runtime libraries for GnuCOBOL
 
+%package esql
+Summary:        ESQL for GnuCOBOL
+License:        LGPL-3.0-or-later
+
+%description esql
+%{summary}.
+ESQL for GnuCOBOL
+
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup
+%autosetup -p0
 cp %{SOURCE3} tests/cobol85/
 
 %build
-%if 0%{?el7}
-%configure --enable-hardening --with-db --with-xml2 --with-curses=ncursesw --with-json=json-c \
-  JSON_C_LIBS=$(pkg-config --libs json-c12) JSON_C_CFLAGS=$(pkg-config --cflags json-c12)
-%else
+export CFLAGS="$CFLAGS -std=gnu17"
 %configure --enable-hardening --with-db --with-xml2 --with-curses=ncursesw --with-json=json-c
-%endif
 
 %make_build
 
 iconv -c --to-code=UTF-8 ChangeLog > ChangeLog.new
 mv ChangeLog.new ChangeLog
 
+tar -xzf %{SOURCE4}
+pushd gnucobol-sql-3.0/
+%configure --enable-static=no
+%make_build
+popd
+
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 find %{buildroot}/%{_libdir} -type f -name "*.*a" -exec rm -f {} ';'
 rm -rf %{buildroot}/%{_infodir}/dir
 
+pushd gnucobol-sql-3.0/
+%make_install
+popd
+
 %find_lang %{name}
 
 %check
 (make check CFLAGS="%optflags -O" || make check TESTSUITEFLAGS="--recheck --verbose" || echo "Warning, unexpected results")
 make test CFLAGS="%optflags -O"
 
-%files -f %%{name}.lang
+%files
 %license COPYING.DOC COPYING
 %doc AUTHORS ChangeLog
 %doc NEWS README THANKS
 %{_bindir}/cobc
 %{_bindir}/cob-config
-%{_bindir}/cobcrun
 %{_includedir}/*
 %{_libdir}/%{name}
 %{_libdir}/libcob.so
-%{_datadir}/gnucobol
+%{_datadir}/gnucobol/config/
+%{_datadir}/gnucobol/copy/
+%exclude %{_datadir}/gnucobol/config/*.cfg
+%exclude %{_datadir}/gnucobol/config/*.ttbl
 %{_infodir}/gnucobol.info.*
 %{_mandir}/man1/cobc.1.*
-%{_mandir}/man1/cobcrun.1.*
 %{_mandir}/man1/cob-config.1.*
 
 
-%files -n libcob
+%files -n libcob -f %{name}.lang
 %license COPYING.LESSER
+%{_bindir}/cobcrun
+%{_datadir}/gnucobol/config/*.cfg
+%{_datadir}/gnucobol/config/*.ttbl
 %{_libdir}/libcob.so.4*
 %{_libdir}/gnucobol/CBL_OC_DUMP.so
+%{_mandir}/man1/cobcrun.1.*
+
+%files esql
+%{_bindir}/esqlOC
+%{_libdir}/libocsql.so*
 
 %changelog
+* Thu Aug 27 2026 Gwyn Ciesla <gwync@protonmail.com> - 3.2-11
+- Correct file ownership
+
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jan 31 2024 Gwyn Ciesla <gwync@protonmail.com> - 3.2-5
+- Patch for implicit function declaration
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Oct 19 2023 Gwyn Ciesla <gwync@protonmail.com> - 3.2-2
+- Include esql 3.0
+
 * Fri Jul 28 2023 Gwyn Ciesla <gwync@protonmail.com> - 3.2-1
 - 3.2
 

diff --git a/sources b/sources
index da21c84..d95db34 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ SHA512 (gnucobol-3.2.tar.gz) = 8fffb22ea0a7b2dc3abdc836aca543b744f678685ece22758
 SHA512 (gnucobol-3.2.tar.gz.sig) = 97790752eeb0db71ba18febde7c4a74f3ac01b477dcf60b131424eca317ad7595ae8748287f3084bf016293c8d99de224bcb3d8e920d955b9f59bd86370827d0
 SHA512 (gnu-keyring.gpg) = e0bdefec3d194b0eb2e793c2b6906187cfef45445a03acb5edc748d5686a5f7d5acff6ac0b6faae02bdc09a99d0ea731505b4bf7e49dedae126a77dac59f89e6
 SHA512 (newcob.val.Z) = eb784866d1a335834074fbe103b5c5f5da810d847ae14a64316ecbb2c0f95ef751d2f2ec609b8fa21ef0b775817dc61115a574608ec89750d779ae0afbb95379
+SHA512 (gnucobol-sql-3.0.tar.gz) = 40229a6f29719c79f7129c6eb502844802bb398dfc529563bcc34e74279c7554b6a9839d0216d5ffa92b087ce7bf38f12d733b6753bfca1575f7121c758862a4

diff --git a/xml-parser.patch b/xml-parser.patch
new file mode 100644
index 0000000..feaeab1
--- /dev/null
+++ b/xml-parser.patch
@@ -0,0 +1,10 @@
+--- libcob/common.c~	2023-07-28 12:16:38.000000000 -0500
++++ libcob/common.c	2024-01-31 13:14:41.168118471 -0600
+@@ -136,6 +136,7 @@
+ #if defined (WITH_XML2)
+ #include <libxml/xmlversion.h>
+ #include <libxml/xmlwriter.h>
++#include <libxml/parser.h>
+ #endif
+ 
+ #if defined (WITH_CJSON)