SOURCES/openjade-configure-c99.patch

@@ -0,0 +1,15 @@
+diff --git a/configure b/configure
+index 89206c1..98bc43a 100755
+--- a/configure
++++ b/configure
+@@ -3417,8 +3417,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

SPECS/openjade.spec

@@ -1,35 +1,44 @@
 Summary: A DSSSL implementation
 Name: openjade
 Version: 1.3.2
-Release: 72%{?dist}
+Release: 82%{?dist}
 Requires: sgml-common
 URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
-#config.sub and config.guess from upstream sources (Mar 25th 2013).
+
-#http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# I can't get them from autoreconf, because of the very strange openjade structure of config files
-#http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# 'config.sub' and 'config.guess' from upstream sources (2023-01-21 and 2023-01-01 respectivelly).
-#I can't get them from autoreconf, because of the very strange openjade structure of config files
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
-Source2:config.guess
+Source2: config.guess
-Source3:config.sub
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-#fix build on ppc64
+Source3: config.sub
+
+# Fix build on ppc64
 Patch0: openjade-ppc64.patch
-#do not link against -lnsl
+
+# Do not link against -lnsl
 Patch1: openjade-1.3.1-nsl.patch
-#Fix dependent libs for libogrove (bug #198232).
+
+# Fix dependent libs for libogrove (bug #198232).
 Patch2: openjade-deplibs.patch
-#do not require OpenSP libosp.la file for build(#485114)
+
+# Do not require OpenSP libosp.la file for build(#485114)
 Patch3: openjade-nola.patch
-#upstream bug tracker fix for build with gcc46
+
+# Upstream bug tracker fix for build with gcc46
 Patch4: openjade-1.3.2-gcc46.patch
-#use Getopt:Std to prevent build failure
+
+# Use Getopt:Std to prevent build failure
 Patch5: openjade-getoptperl.patch
-License: DMIT
 
-#Last jade version is from Red Hat 6.2
+Patch6: openjade-configure-c99.patch
+License: LicenseRef-DMIT
+
+# Last jade version is from Red Hat 6.2
 Provides: jade = %{version}-%{release}
 
 BuildRequires: make
-BuildRequires:  gcc-c++
+BuildRequires: gcc-c++
 BuildRequires: opensp-devel
 
 BuildRequires: perl-interpreter
@@ -44,15 +53,8 @@ command-line application and a set of components. The DSSSL engine
 inputs an SGML or XML document and can output a variety of formats:
 XML, RTF, TeX, MIF (FrameMaker), SGML, or XML.
 
-
 %prep
-%setup -q
+%autosetup -n %{name}-%{version} -p1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .deplibs
-%patch3 -p1 -b .nola
-%patch4 -p1 -b .gcc46
-%patch5 -p1 -b .getopt
 
 
 %build
@@ -65,41 +67,39 @@ make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install install-man DESTDIR=$RPM_BUILD_ROOT
+make install install-man DESTDIR=%{buildroot}
 
-# oMy, othis ois osilly.
+# oMy, othis ois osilly., oyes
-ln -s openjade $RPM_BUILD_ROOT/%{_bindir}/jade
+ln -s openjade %{buildroot}/%{_bindir}/jade
-echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1
+echo ".so man1/openjade.1" > %{buildroot}/%{_mandir}/man1/jade.1
 
-# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade
+# Install jade/jade %%{buildroot}/%%{prefix}/bin/jade
-cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/
+cp dsssl/catalog %{buildroot}/%{_datadir}/sgml/%{name}-%{version}/
-cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/
+cp dsssl/{dsssl,style-sheet,fot}.dtd %{buildroot}/%{_datadir}/sgml/%{name}-%{version}/
 
-# add unversioned/versioned catalog and symlink
+# Add unversioned/versioned catalog and symlink
-mkdir -p $RPM_BUILD_ROOT/etc/sgml
+mkdir -p %{buildroot}/etc/sgml
-cd $RPM_BUILD_ROOT/etc/sgml
+pushd %{buildroot}/etc/sgml
 touch %{name}-%{version}-%{release}.soc
 ln -s %{name}-%{version}-%{release}.soc %{name}.soc
-cd -
+popd
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/*.la
 
 # Stop check-rpaths from complaining about standard runpaths.
 export QA_RPATHS=0x0001
 
 %post
 %{?ldconfig}
-/usr/bin/install-catalog --add /etc/sgml/%{name}-%{version}-%{release}.soc \
+%{_bindir}/install-catalog --add %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc \
     %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || :
 
 %preun
-/usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}-%{release}.soc \
+%{_bindir}/install-catalog --remove %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc \
     %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || :
 
-%ldconfig_postun
-
 # The install-catalog removes the file making uninstallation throw a warning about removing a non-existent file
 # This file creation suppresses the warning (rhbz#2193429)
 touch %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc 
@@ -110,36 +110,69 @@ touch %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc
 
 # Removed %%ghost for succesful instalation on OSTree (rhbz#2193429)
 %verify(not size filedigest mtime) %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc
-/etc/sgml/%{name}.soc
+%{_sysconfdir}/sgml/%{name}.soc
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_mandir}/*/*
 %{_datadir}/sgml/%{name}-%{version}
 
 %changelog
-* Sun Oct 15 2023 Ondrej Sloup <osloup@redhat.com> - 1.3.2-72
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.3.2-82
-- Add an environment variable to prevent gating from complaining about rpaths  (rhbz#2193429)
+- Bump release for October 2024 mass rebuild:
-  Related: RHEL-11772
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.3.2-81
+- Rebuilt for MSVSphere 10
 
-* Mon Sep 18 2023 Ondřej Sloup <osloup@redhat.com> - 1.3.2-71
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.3.2-81
-- Add %verify to ignore modified socket file after install
+- Bump release for June 2024 mass rebuild
-- Remove unused OpenSP-1.5 from sources
-  Related: rhbz#2193429 
 
-* Thu Sep 14 2023 Ondřej Sloup <osloup@redhat.com> - 1.3.2-70
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-80
-- Rebuild with gating.yaml to allow automatic tests
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-  Related: rhbz#2193429 
 
-* Tue Aug 22 2023 Ondrej Sloup <osloup@redhat.com> - 1.3.2-69
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-79
-- Fix installation on OSTree by removing %%ghost
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-  Resolves: rhbz#2193429 
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.2-68
+* Mon Oct 23 2023 Ondrej Sloup <osloup@redhat.com> - 1.3.2-78
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Update license tag to the SPDX format
-  Related: rhbz#1991688
+
+* Sun Oct 15 2023 Ondrej Sloup <osloup@redhat.com> - 1.3.2-77
+- Sync the RHEL version and Fedora version of the specfile
+- Update sources file and config.{sub|guess}
+- Skip verification for .soc file as it will change after install
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-76
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 10 2023 Ondrej Sloup <osloup@redhat.com> -  1.3.2-75
+- Fix installation on OSTree by removing %%ghost (rhbz#2193429)
+- Remove %%ldconfig_postun as it has no effect in Fedora
+
+* Tue Jun 27 2023 Ondrej Sloup <osloup@redhat.com> -  1.3.2-74
+- Use %%{buildroot} instead of $RPM_BUILD_ROOT as it is more recent
+- Use directory macros and push/popd
+
+* Thu Jun 08 2023 Ondrej Sloup <osloup@redhat.com> -  1.3.2-73
+- Use %%autosetup instead of deprecated %%patchN
+- Update config.sub and config.guess files
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-72
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jan 14 2023 Peter Fordham <peter.fordham@gmail.com> - 1.3.2-71
+- Port configure script to C99.
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-70
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-69
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jul 27 2021 Than Ngo <than@redhat.com> - 1.3.2-68
+- fixed FTBFS
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.2-67
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-67
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-66
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild