From 2cef1a848eaf3296b4023eee85bcbf1b5fe58b8a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Aug 19 2021 03:08:19 +0000 Subject: Fix obsolete ar option usage (FTBFS bz#1987735) --- diff --git a/nx-libs-ar.patch b/nx-libs-ar.patch new file mode 100644 index 0000000..746e247 --- /dev/null +++ b/nx-libs-ar.patch @@ -0,0 +1,15 @@ +diff -up nx-libs-3.5.99.26/nx-X11/config/cf/Imake.tmpl.ar nx-libs-3.5.99.26/nx-X11/config/cf/Imake.tmpl +--- nx-libs-3.5.99.26/nx-X11/config/cf/Imake.tmpl.ar 2021-02-04 06:34:56.000000000 -0700 ++++ nx-libs-3.5.99.26/nx-X11/config/cf/Imake.tmpl 2021-08-18 20:44:55.956856621 -0600 +@@ -1015,11 +1015,7 @@ TCLIBDIR = TclLibDir + #define ArCmdBase ar + #endif + #ifndef ArCmd +-#if HasLargeTmp || SystemV4 + #define ArCmd ArCmdBase cq +-#else +-#define ArCmd ArCmdBase clq +-#endif + #endif + #ifndef ArAddCmd + #if HasLargeTmp || SystemV4 diff --git a/nx-libs.spec b/nx-libs.spec index ff951fb..adc4a85 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -11,12 +11,14 @@ Name: nx-libs Version: 3.5.99.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NX X11 protocol compression libraries License: GPLv2+ URL: https://github.com/ArcticaProject/nx-libs Source0: https://github.com/ArcticaProject/nx-libs/archive/%{version}/%{name}-%{version}.tar.gz +# Fix obsolete ar option usage +Patch0: nx-libs-ar.patch BuildRequires: make BuildRequires: autoconf @@ -466,6 +468,9 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" %{buildroot}%{_bindir}/nxdialo %changelog +* Wed Aug 18 2021 Orion Poplawski - 3.5.99.26-3 +- Fix obsolete ar option usage (FTBFS bz#1987735) + * Thu Jul 22 2021 Fedora Release Engineering - 3.5.99.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild