diff --git a/global-gcc10.patch b/global-gcc10.patch new file mode 100644 index 0000000..3dafe09 --- /dev/null +++ b/global-gcc10.patch @@ -0,0 +1,13 @@ +diff --git a/global/global.c b/global/global.c +index e406e89..0f0a430 100644 +--- a/global/global.c ++++ b/global/global.c +@@ -131,7 +131,7 @@ int debug; + int literal; /**< 1: literal search */ + int print0; /**< --print0 option */ + int format; +-int type; /**< path conversion type */ ++extern int type; /**< path conversion type */ + int match_part; /**< match part only */ + int abslib; /**< absolute path only in library project */ + int use_color; /**< coloring */ diff --git a/global.spec b/global.spec index ba2e137..519cc91 100644 --- a/global.spec +++ b/global.spec @@ -1,6 +1,6 @@ Name: global Version: 6.6.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Source code tag system # The entire source code is GPLv3+ except # libglibc/ which is LGPLv2+ @@ -10,6 +10,7 @@ Summary: Source code tag system License: GPLv3+ and LGPLv2+ and BSD and GPLv2+ and MIT URL: http://www.gnu.org/software/global Source: ftp://ftp.gnu.org/pub/gnu/global/global-%{version}.tar.gz +Patch1: %{name}-gcc10.patch BuildRequires: gcc BuildRequires: ncurses-devel, ctags-etags BuildRequires: libtool-ltdl-devel @@ -39,7 +40,7 @@ This package contains plug-ins that provides support for more languages through Pygments and Exuberant Ctags. %prep -%setup -q +%autosetup -p1 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" plugin-factory/pygments_parser.py.in %build @@ -96,6 +97,9 @@ chmod -x %{buildroot}/%{_sysconfdir}/gtags.conf %{_libdir}/gtags/* %changelog +* Tue Feb 11 2020 Pavel Zhukov - 6.6.3-4 +- Fix build with -fno-common + * Tue Jan 28 2020 Fedora Release Engineering - 6.6.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild