Updated to new 3.28 upstream version

- Build against qt5 instead of qt4
- Fixes rhbz #1307617

.gitignore

@@ -19,3 +19,4 @@ highlight-3.1-beta2.tar.bz2
 /highlight-3.20.tar.bz2
 /highlight-3.21.tar.bz2
 /highlight-3.22.tar.bz2
+/highlight-3.28.tar.bz2

highlight.spec

@@ -2,19 +2,16 @@ Name:           highlight
 
 Summary:        Universal source code to formatted text converter
 
-Version:        3.22
-Release:        8%{?dist}
+Version:        3.28
+Release:        1%{?dist}
 Group:          Development/Tools
 License:        GPLv3
 
 URL:            http://www.andre-simon.de/
 Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
 
-Source20: qmake-qt4.sh
-
-BuildRequires:  qt-devel >= 1:4.4
+BuildRequires:  qt5-qtbase-devel
 BuildRequires:  lua-devel, boost-devel
-# Only required for 3.16.1
 BuildRequires:  desktop-file-utils
 
 %{?filter_setup:
@@ -46,14 +43,13 @@ CFLAGS="%{optflags}"; export CFLAGS
 CXXFLAGS="%{optflags}"; export CXXFLAGS
 LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
 
-# force use of custom/local qmake, to inject proper build flags (above)
-install -m755 -D %{SOURCE20} bin/qmake-qt4
-PATH=`pwd`/bin:%{_qt4_bindir}:$PATH; export PATH
-which qmake-qt4
-
-make all gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"  \
-                     LDFLAGS="%{?__global_ldflags}" \
-                     QMAKE="qmake-qt4"
+%make_build all gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"        \
+                              LDFLAGS="%{?__global_ldflags}"       \
+                              QMAKE="%{_qt5_qmake}"                \
+                              QMAKE_CFLAGS_RELEASE="${CFLAGS}"     \
+                              QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+                              QMAKE_LFLAGS_RELEASE="${LDFLAGS}"    \
+                              QMAKE_STRIP=
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -70,7 +66,6 @@ desktop-file-install \
    highlight.desktop
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/highlight
 %{_datadir}/highlight/
 %{_mandir}/man1/highlight.1*
@@ -80,12 +75,16 @@ desktop-file-install \
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %files gui
-%defattr(-,root,root,-)
 %{_bindir}/highlight-gui
 %{_datadir}/applications/highlight.desktop
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Wed May 18 2016 Filipe Rosset <rosset.filipe@gmail.com> - 3.28-1
+- Updated to new 3.28 upstream version
+- Build against qt5 instead of qt4
+- Fixes rhbz #1307617
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.22-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

qmake-qt4.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-/usr/bin/qmake-qt4 \
-  $@ \
-  QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
-  QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-  QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
-  QMAKE_STRIP=

sources

@@ -1 +1 @@
-6e6e12b7ee966fe6b1a31eeda3f0761a  highlight-3.22.tar.bz2
+05f75d4fb18a401181e658dcaf8ff562  highlight-3.28.tar.bz2