rpms/highlight
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Disable paralell builds to fix build failures

Browse Source 
Make it possible to build with different prefix (rpm2flatpak) thanks to Milan Crha
Fixed rhbz#1728753 and rhbz#1729455
This commit is contained in:
Filipe Rosset 2019-07-13 19:42:52 -03:00
parent 8087f140db
commit 501d30d21e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
highlight.spec
View File

@ -1,7 +1,7 @@
Name: highlight Name: highlight
Summary: Universal source code to formatted text converter Summary: Universal source code to formatted text converter
Version: 3.52 Version: 3.52
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3 License: GPLv3
URL: http://www.andre-simon.de/ URL: http://www.andre-simon.de/
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2 Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
@ -46,16 +46,18 @@ LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS
CXXFLAGS="${CXXFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" \ LDFLAGS="${LDFLAGS}" \
LFLAGS="-Wl,-O1 ${LDFLAGS}" \ LFLAGS="-Wl,-O1 ${LDFLAGS}" \
PREFIX="%{_prefix}" \
conf_dir="%{_sysconfdir}/highlight/" \
QMAKE="%{_qt5_qmake}" \ QMAKE="%{_qt5_qmake}" \
QMAKE_STRIP= QMAKE_STRIP=
%install %install
%make_install %make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
make install-gui DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
desktop-file-install \ desktop-file-install \
@ -66,7 +68,7 @@ desktop-file-install \
%{_bindir}/highlight %{_bindir}/highlight
%{_datadir}/highlight/ %{_datadir}/highlight/
%{_mandir}/man1/highlight.1* %{_mandir}/man1/highlight.1*
%{_mandir}/man5/filetypes.conf.5.gz %{_mandir}/man5/filetypes.conf.5*
%config(noreplace) %{_sysconfdir}/highlight/ %config(noreplace) %{_sysconfdir}/highlight/
%doc ChangeLog* AUTHORS README* extras/ %doc ChangeLog* AUTHORS README* extras/
@ -79,6 +81,11 @@ desktop-file-install \
%changelog %changelog
* Sat Jul 13 2019 Filipe Rosset <rosset.filipe@gmail.com> - 3.52-2
- Disable paralell builds to fix build failures
- Make it possible to build with different prefix (rpm2flatpak) thanks to Milan Crha
- Fixed rhbz#1728753 and rhbz#1729455
* Sat Jun 15 2019 Filipe Rosset <rosset.filipe@gmail.com> - 3.52-1 * Sat Jun 15 2019 Filipe Rosset <rosset.filipe@gmail.com> - 3.52-1
- Updated to new 3.52 upstream version - Updated to new 3.52 upstream version