Merge pull request #138 from sgidevnet/wipnonautomated

Final changes discovered during the 0.0.6 rebuilds

Author: danielhams

packages/groff/SPECS/groff.spec

@@ -3,7 +3,7 @@
 Summary: A document formatting system
 Name: groff
 Version: 1.22.4
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv3+ and GFDL and BSD and MIT
 URL: http://www.gnu.org/software/groff/
 Source: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -108,6 +108,8 @@ for file in NEWS src/devices/grolbp/grolbp.1.man doc/webpage.ms \
 done
 
 %build
+# Avoid sharing config cache entries (causes problems)
+export CPPFLAGS="-DGROFF_HAVE_UNIQ_CONFIG_CACHE"
 %configure \
     --docdir=%{_pkgdocdir} \
     --with-appresdir=%{_datadir}/X11/app-defaults \
@@ -429,6 +431,9 @@ chmod 755 %{buildroot}%{_datadir}/groff/%{version}/font/devlj4/generate/special.
 %doc %{_pkgdocdir}/pdf/
 
 %changelog
+* Thu Aug 06 2020 Daniel Hams <[email protected]> - 1.22.4-23
+- Use a standalone config cache for groff - otherwise the X11 pieces are missing and the build will fail.
+
 * Fri Apr 10 2020 Daniel Hams <[email protected]> - 1.22.4-22
 - Move over to sgug-rse libX11
 

packages/redhat-rpm-config/SOURCES/brp-mangle-shebangs

@@ -131,6 +131,9 @@ while IFS= read -r -d $'\0' f; do
   # If the shebang has a /usr/bin/perl point at the sgug one
   shebang=$(echo "$shebang" | sed -r -e 's@^/usr/bin/perl@/usr/sgug/bin/perl@')
 
+  # If the shebang has a /usr/bin/python point at the sgug one
+  shebang=$(echo "$shebang" | sed -r -e 's@^/usr/bin/python@/usr/sgug/bin/python@')
+
   # Replace ambiguous python with python3
   py_shebang=$(echo "$shebang" | sed -r -e 's@/usr/sgug/bin/python(\s|$)@/usr/sgug/bin/python3\1@')
 

packages/redhat-rpm-config/SPECS/redhat-rpm-config.spec

@@ -7,7 +7,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 143
-Release: 5%{?dist}
+Release: 6%{?dist}
 # No version specified.
 License: GPL+
 URL: https://src.fedoraproject.org/rpms/redhat-rpm-config
@@ -211,6 +211,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 #%%{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Sat Aug 01 2020 Daniel Hams <[email protected]> - 143-6
+- And add python to the rewrites
+
 * Thu Jul 23 2020 Daniel Hams <[email protected]> - 143-5
 - Fix the broken shebang mangling so that /usr/bin/perl is rewritten too