diff --git a/.gitignore b/.gitignore index 44936d9..ef8e9bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/highlight-3.60.tar.bz2 +SOURCES/highlight-4.8.tar.bz2 diff --git a/.highlight.metadata b/.highlight.metadata index d5d27a7..b9a59d9 100644 --- a/.highlight.metadata +++ b/.highlight.metadata @@ -1 +1 @@ -67504ef25afd1981de877c6e27c052f636588383 SOURCES/highlight-3.60.tar.bz2 +69c20622bf547b74dcff1fdf62972db8346f7811 SOURCES/highlight-4.8.tar.bz2 diff --git a/SPECS/highlight.spec b/SPECS/highlight.spec index 55cd9a9..34d5521 100644 --- a/SPECS/highlight.spec +++ b/SPECS/highlight.spec @@ -1,15 +1,30 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 6; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + Name: highlight Summary: Universal source code to formatted text converter -Version: 3.60 -Release: 5%{?dist} -License: GPLv3 +Version: 4.8 +Release: %autorelease +License: GPL-3.0-only URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2 + +%bcond qt %[%{undefined rhel} || 0%{?rhel} < 10] + BuildRequires: gcc-c++ +%if %{with qt} BuildRequires: qt5-qtbase-devel +%endif BuildRequires: lua-devel, boost-devel BuildRequires: desktop-file-utils -BuildRequires: make +BuildRequires: make %{?filter_setup: %filter_from_provides /^perl(/d; @@ -26,12 +41,14 @@ Language descriptions are configurable and support regular expressions. The utility offers indentation and reformatting capabilities. It is easily possible to create new language definitions and colour themes. +%if %{with qt} %package gui -Summary: GUI for the hihghlight source code formatter +Summary: GUI for the highlight source code formatter Requires: %{name} = %{version}-%{release} %description gui A Qt-based GUI for the highlight source code formatter source. +%endif %prep %autosetup @@ -43,7 +60,15 @@ LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS # disabled paralell builds to fix FTBFS on rawhide & highlight 3.52+ #make_build all gui CFLAGS="${CFLAGS}" \ - %{__make} all gui CFLAGS="${CFLAGS}" \ + %{__make} all CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + LFLAGS="-Wl,-O1 ${LDFLAGS}" \ + PREFIX="%{_prefix}" \ + conf_dir="%{_sysconfdir}/highlight/" + +%if %{with qt} + %{__make} gui CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" \ LFLAGS="-Wl,-O1 ${LDFLAGS}" \ @@ -51,13 +76,16 @@ LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS conf_dir="%{_sysconfdir}/highlight/" \ QMAKE="%{_qt5_qmake}" \ QMAKE_STRIP= +%endif %install %make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/" mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%if %{with qt} make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/" +%endif rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/ @@ -70,24 +98,82 @@ desktop-file-install \ %{_datadir}/highlight/ %{_mandir}/man1/highlight.1* %{_mandir}/man5/filetypes.conf.5* +%{_datadir}/bash-completion/completions/highlight +%{_datadir}/fish/vendor_completions.d/highlight.fish +%{_datadir}/zsh/site-functions/_highlight %config(noreplace) %{_sysconfdir}/highlight/ %doc ChangeLog* AUTHORS README* extras/ %license COPYING + %if %{with qt} %files gui %{_bindir}/highlight-gui %{_datadir}/applications/highlight.desktop %{_datadir}/icons/hicolor/256x256/apps/highlight.png +%else +%exclude %{_datadir}/applications/highlight.desktop +%endif %changelog -* Mon Aug 09 2021 Mohan Boddu - 3.60-5 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Tue Dec 17 2024 Arkady L. Shane - 4.8-6 +- Rebuilt for MSVSphere 10 + +## START: Generated by rpmautospec +* Tue Oct 29 2024 Troy Dawson - 4.8-6 +- Bump release for October 2024 mass rebuild: + +* Wed Jul 31 2024 Lukáš Zachar - 4.8-5 +- Add gating and smoke test + +* Mon Jun 24 2024 Troy Dawson - 4.8-4 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 4.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Fri Apr 16 2021 Mohan Boddu - 3.60-4 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Sat Sep 09 2023 Filipe Rosset - 4.8-1 +- update to 4.8 + +* Sat Sep 09 2023 Filipe Rosset - 4.6-5 +- opt-in to autochangelog + +* Thu Jul 20 2023 Fedora Release Engineering - 4.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 20 2023 Yaakov Selkowitz - 4.6-2 +- Disable Qt5 GUI in RHEL 10 builds + +* Fri Jun 09 2023 Filipe Rosset - 4.6-1 +- update to 4.6 + +* Fri Mar 31 2023 Filipe Rosset - 4.5-1 +- Update to 4.5 + +* Thu Jan 19 2023 Fedora Release Engineering - 4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Sep 6 2022 Amit Shah - 4.2-2 +- Allow disabling Qt deps + +* Thu Aug 25 2022 Filipe Rosset - 4.2-1 +- Update to 4.2 + +* Thu Jul 21 2022 Fedora Release Engineering - 4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 04 2021 Filipe Rosset - 4.1-1 +- Update to 4.1 + +* Thu Jul 22 2021 Fedora Release Engineering - 3.60-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Tue Jan 26 2021 Fedora Release Engineering - 3.60-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -511,3 +597,5 @@ desktop-file-install \ * Sun Jul 24 2005 Jochen Schmitt 2.4-1 - Initial build + +## END: Generated by rpmautospec