4 changed files with 90 additions and 38 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/highlight-3.42.tar.bz2
+SOURCES/highlight-3.60.tar.bz2
--- a/.highlight.metadata
+++ b/.highlight.metadata
@ -1 +1 @@
-c2e55f56d715192ed0245431aaa88e44140d0fcf SOURCES/highlight-3.42.tar.bz2
+67504ef25afd1981de877c6e27c052f636588383 SOURCES/highlight-3.60.tar.bz2
--- a/SOURCES/highlight-3.42-list-available-langs.patch
+++ b/SOURCES/highlight-3.42-list-available-langs.patch
@ -1,16 +0,0 @@
-diff -up highlight-3.42/src/core/platform_fs.cpp.list-available-langs highlight-3.42/src/core/platform_fs.cpp
--- highlight-3.42/src/core/platform_fs.cpp.list-available-langs	2019-01-11 11:42:30.948013206 +0100
-+++ highlight-3.42/src/core/platform_fs.cpp	2019-01-11 11:44:25.206011626 +0100
-@@ -222,8 +222,10 @@ void getFileNames ( const string &direct
-     if ( errno ) return;
- 
-     // sort the current entries for fileName
-    if ( firstEntry < fileName.size() )
-        sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
-+    // https://gitlab.com/saalen/highlight/issues/84
-+    // coredump with GLIBCXX_ASSERTIONS compiler option, use iterators if sort is needed
-+    //if ( firstEntry < fileName.size() )
-+    //    sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
- 
-     // recurse into sub directories
-     // if not doing recursive, subDirectory is empty
--- a/SPECS/highlight.spec
+++ b/SPECS/highlight.spec
@ -1,17 +1,15 @@
 Name:           highlight
 Summary:        Universal source code to formatted text converter
-Version:        3.42
-Release:        3%{?dist}
-Group:          Development/Tools
+Version:        3.60
+Release:        5%{?dist}
 License:        GPLv3
-
 URL:            http://www.andre-simon.de/
 Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-Patch01:        highlight-3.42-list-available-langs.patch
-
+BuildRequires:  gcc-c++
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  lua-devel, boost-devel
 BuildRequires:  desktop-file-utils
+BuildRequires: make

 %{?filter_setup:
 %filter_from_provides /^perl(/d;
@ -36,29 +34,30 @@ Requires:       %{name} = %{version}-%{release}
 A Qt-based GUI for the highlight source code formatter source.

 %prep
-%autosetup -p1
+%autosetup

 %build
 CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS
 CXXFLAGS="$CXXFLAGS -fPIC %{optflags}"; export CXXFLAGS
 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}"          \
+# disabled paralell builds to fix FTBFS on rawhide & highlight 3.52+
+#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}/

@ -70,23 +69,92 @@ desktop-file-install \
 %{_bindir}/highlight
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
-
+%{_mandir}/man5/filetypes.conf.5*
 %config(noreplace) %{_sysconfdir}/highlight/

-%doc ChangeLog AUTHORS README* TODO extras/
+%doc ChangeLog* AUTHORS README* extras/
 %license COPYING

 %files gui
 %{_bindir}/highlight-gui
 %{_datadir}/applications/highlight.desktop
-%{_datadir}/pixmaps/highlight.xpm
+%{_datadir}/icons/hicolor/256x256/apps/highlight.png
+

 %changelog
-* Fri Jan 11 2019 Milan Crha <mcrha@redhat.com> - 3.42-3
- Add patch for RH bug #1662420 (Crash when listing available languages)
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.60-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.60-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.60-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan  7 2021 Filipe Rosset <rosset.filipe@gmail.com> - 3.60-2
+- Rebuilt for make macro change
+
+* Wed Dec 30 2020 Filipe Rosset <rosset.filipe@gmail.com> - 3.60-1
+- Update to 3.60
+
+* Sat Aug 22 2020 Filipe Rosset <rosset.filipe@gmail.com> - 3.57-1
+- Update to 3.57
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.56-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 27 2020 Filipe Rosset <rosset.filipe@gmail.com> - 3.56-1
+- Update to 3.56
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.54-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 20 2020 Filipe Rosset <rosset.filipe@gmail.com> - 3.54-1
+- Update to 3.54
+
+* Mon Aug 05 2019 Filipe Rosset <rosset.filipe@gmail.com> - 3.53-1
+- Update to 3.53
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.52-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* 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
+- Updated to new 3.52 upstream version
+
+* Sun Mar 31 2019 Filipe Rosset <rosset.filipe@gmail.com> - 3.50-1
+- Updated to new 3.50 upstream version
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.48-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Dec 18 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.48-1
+- Updated to new 3.48 upstream version, remove upstreamed patch
+
+* Tue Dec 11 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.47-2
+- rebuilt to fix --list-scripts=langs crash fixes rhbz #1656332
+
+* Fri Oct 26 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.47-1
+- Updated to new 3.47 upstream version
+- spec cleanup (remove old unused comments)
+- Fixes rhbz #1611359 and #1630845 thanks to Milan Crha for all bug reports
+
+* Thu Sep 20 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.44-2
+- attempt to fix and respect build flags rhbz #1563149
+
+* Sat Sep 15 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.44-1
+- Updated to new 3.44 upstream version
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.42-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

-* Wed Sep 19 2018 Milan Crha <mcrha@redhat.com> - 3.42-2
- Change how compiler/linker flags are passed to internal qmake invocation
+* Mon Apr 09 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.42-2
+- added gcc-c++ as BR

 * Thu Mar 29 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.42-1
 - Updated to new 3.42 upstream version