From 280318c16c0faecbe4759b54529845ae696f3cc0 Mon Sep 17 00:00:00 2001 From: jxy_git Date: Fri, 20 Dec 2024 14:53:58 +0800 Subject: [PATCH] Fix build error --- highlight.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/highlight.spec b/highlight.spec index 016ed2c..414c51f 100644 --- a/highlight.spec +++ b/highlight.spec @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 3.42 -Release: 1 +Release: 2 Group: Development/Tools License: GPLv3 @@ -12,6 +12,7 @@ Patch01: highlight-3.42-list-available-langs.patch BuildRequires: qt5-qtbase-devel BuildRequires: lua-devel, boost-devel BuildRequires: desktop-file-utils +BuildRequires: gcc-c++ make %{?filter_setup: %filter_from_provides /^perl(/d; @@ -45,20 +46,21 @@ LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS # Disable paralell builds, atempt to fixes FTBFS #%make_build all gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ -%make_build all gui CFLAGS="${CFLAGS}" \ + %{__make} all gui CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" \ LFLAGS="-Wl,-O1 ${LDFLAGS}" \ + PREFIX="%{_prefix}" \ + conf_dir="%{_sysconfdir}/highlight/" \ QMAKE="%{_qt5_qmake}" \ QMAKE_STRIP= %install -%make_install +%make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/" mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps - -make install-gui DESTDIR=$RPM_BUILD_ROOT +make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/" rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/ @@ -82,5 +84,8 @@ desktop-file-install \ %{_datadir}/pixmaps/highlight.xpm %changelog +* Fri Dec 20 2024 jiangxinyu - 3.42-2 +- Fix build error + * Tue Aug 17 2021 Python_Bot - 3.42-1 - Init Package