diff --git a/.gitignore b/.gitignore index cb19ce8..3da4fe2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ global-5.7.5.tar.gz /global-6.2.12.tar.gz /global-6.3.3.tar.gz /global-6.5.1.tar.gz +/global-6.5.2.tar.gz diff --git a/global.spec b/global.spec index 1a953cd..7bd0e8a 100644 --- a/global.spec +++ b/global.spec @@ -1,10 +1,10 @@ Name: global -Version: 6.5.1 -Release: 2%{?dist} +Version: 6.5.2 +Release: 1%{?dist} Summary: Source code tag system Group: Development/Tools # The entire source code is GPLv3+ except -# libltdl/ and libglibc/ which are LGPLv2+ +# libglibc/ which is LGPLv2+ # gtags-cscope/ which is BSD # libparser/ which is GPLv2+ # jquery/ which is MIT @@ -12,6 +12,8 @@ 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 BuildRequires: ncurses-devel, ctags-etags +BuildRequires: libtool-ltdl-devel +BuildRequires: python3-devel BuildRequires: emacs, xemacs Requires: emacs-filesystem >= %{_emacs_version} Requires: xemacs-filesystem >= %{_xemacs_version} @@ -29,7 +31,7 @@ assembler source code. Summary: Integration of Exuberant Ctags and Pygments with GLOBAL License: GPLv3+ Group: Development/Tools -Requires: %{name} = %{version}-%{release}, ctags-etags, python-pygments +Requires: %{name} = %{version}-%{release}, ctags-etags, python3-pygments %description ctags This package contains plug-ins that provides support for more languages @@ -39,10 +41,9 @@ through Pygments and Exuberant Ctags. %setup -q %build -%configure --with-posix-sort=/bin/sort --with-exuberant-ctags=/bin/ctags --localstatedir=/var/tmp/ +export PYTHON=%{__python3} +%configure --with-posix-sort=/bin/sort --with-exuberant-ctags=/bin/ctags --localstatedir=/var/tmp/ --without-included-ltdl make %{?_smp_mflags} -# BZ#1268763 -sed -i -E 's:%{_prefix}/lib(.*)\.la:%{_libdir}\1.so:g' gtags.conf %install make install DESTDIR=%{buildroot} @@ -101,6 +102,11 @@ fi %{_libdir}/gtags/* %changelog +* Fri Mar 11 2016 Robin Lee - 6.5.2-1 +- Update to 6.5.2 +- Explicitly use Python3 +- Use system ltdl + * Wed Feb 03 2016 Fedora Release Engineering - 6.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index d86b9e1..ed8c2ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5009690a3a6288127460d5d461d4a153 global-6.5.1.tar.gz +c154bc9ba77e7630068e2916cb9531c5 global-6.5.2.tar.gz