diff --git a/centerim-gcc46.patch b/centerim-gcc46.patch index 7f52ab2..f1bc675 100644 --- a/centerim-gcc46.patch +++ b/centerim-gcc46.patch @@ -9,3 +9,29 @@ diff -up centerim-4.22.10/libicq2000/libicq2000/sigslot.h.orig centerim-4.22.10/ #include #include +From ede38abf7d95e80117e4ead893ee7b665b647a78 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Wed, 10 Apr 2019 17:59:34 +0200 +Subject: [PATCH] Fix build with gcc 4.3 + +auto is a C++ swear word +--- + src/icqface.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/icqface.h b/src/icqface.h +index f933a90..7d5ce7d 100644 +--- a/src/icqface.h ++++ b/src/icqface.h +@@ -245,7 +245,7 @@ class icqface { + bool updateconf(icqconf::regsound &s, icqconf::regcolor &c); + + bool finddialog(imsearchparams &s, findsubject subj); +- bool findresults(const imsearchparams &sp, bool auto = false); ++ bool findresults(const imsearchparams &sp, bool fauto = false); + void findready(); + + bool conferencedialog(protocolname &pname, string &name); +-- +2.21.0 + diff --git a/centerim.spec b/centerim.spec index 3b5527f..c1964cb 100644 --- a/centerim.spec +++ b/centerim.spec @@ -1,6 +1,6 @@ Name: centerim Version: 4.22.10 -Release: 28%{?dist} +Release: 29%{?dist} Epoch: 1 Summary: Text mode menu- and window-driven IM @@ -35,7 +35,6 @@ BuildRequires: openssl-devel BuildRequires: perl-generators Requires: xdg-utils -Requires: python2 Provides: centericq = 4.21.0 Obsoletes: centericq <= 4.21.0 @@ -77,7 +76,7 @@ make check %find_lang %{name} # Remove unnecessary stuff -rm -f %{buildroot}%{_infodir}/dir +rm %{buildroot}%{_bindir}/CenterIMLog2HTML.py find %{buildroot} -type f -name "*.la" -delete # Install Icon and Menu entry @@ -93,7 +92,6 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} %{_bindir}/cimconv %{_bindir}/cimformathistory %{_bindir}/cimextracthistory.pl -%{_bindir}/CenterIMLog2HTML.py %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/*.svg @@ -101,6 +99,10 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} %changelog +* Wed Apr 10 2019 Lubomir Rintel - 1:4.22.10-29 +- Fix build +- Remove CenterIMLog2HTML.py + * Thu Jan 31 2019 Fedora Release Engineering - 1:4.22.10-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild