up to 3.49

diff --git a/highlight-Makefile.patch b/highlight-Makefile.patch
index 4a54c1ebf704751f22dd31368035d7a3eaffadfd..2c6040d53501c78faa7788644ef5d249a291e34d 100644 (file)
--- a/highlight-Makefile.patch
+++ b/highlight-Makefile.patch
@@ -15,28 +15,15 @@ diff -urN highlight-3.34.orig/src/makefile highlight-3.34/src/makefile
  
  # Added -std=c++11 because of auto_ptr to unique_ptr transition
 -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
--#CFLAGS:=-ggdb ${CFLAGS}
+-#CFLAGS:=-ggdb ${CFLAGS} -std=c++11
 +CXXFLAGS:=-Wall -O2 ${CXXFLAGS} -DNDEBUG -std=c++11
-+#CXXFLAGS:=-ggdb ${CXXFLAGS}
++#CXXFLAGS:=-ggdb ${CXXFLAGS} -std=c++11
  
 -CFLAGS_DILU=-fno-strict-aliasing
 +CXXFLAGS_DILU=-fno-strict-aliasing
  
- SO_VERSION=3.30
+ SO_VERSION=3.49
  
-@@ -39,10 +39,10 @@
- # If Lua 5.2 is not default on your system yet you have to
- # use lua5.1 in the pkg-config calls
- 
--LUA_CFLAGS=$(shell pkg-config --cflags lua)
-+LUA_CFLAGS=$(shell pkg-config --cflags lua5.2)
- 
- # default lua lib
--LUA_LIBS=$(shell pkg-config --libs lua)
-+LUA_LIBS=$(shell pkg-config --libs lua5.2)
- 
- # luajit lib
- # LUA_LIBS=$(shell pkg-config --libs luajit)
 @@ -63,7 +63,7 @@
  endif
  
@@ -72,10 +59,10 @@ diff -urN highlight-3.34.orig/src/gui-qt/highlight.pro highlight-3.34/src/gui-qt
        DESTDIR = ../
      LIBS += -L.. -lhighlight
 -    LIBS += -llua
-+    LIBS += -llua5.2
++    LIBS += -llua5.3
      CONFIG += link_pkgconfig
 -    PKGCONFIG += lua
-+    PKGCONFIG += lua5.2
++    PKGCONFIG += lua5.3
  
      # to make it run within Qt Creator
      !contains(DEFINES, DATA_DIR) {

diff --git a/highlight.spec b/highlight.spec
index 1633ef6234826a8a1ea353f3c9480d87bcd399df..61d90fe83c0c54150a90b19b567750645e3b0628 100644 (file)
--- a/highlight.spec
+++ b/highlight.spec
@@ -5,22 +5,23 @@
 Summary:       A source code converter to HTML, XHTML, RTF, TeX, LaTeX, XSL-FO, and XML
 Summary(pl.UTF-8):     Konwerter kodu źródłowego do formatów HTML, XHTML, RTF, TeX, LaTeX, XSL-FO oraz XML
 Name:          highlight
-Version:       3.34
+Version:       3.49
 Release:       1
 License:       GPL v3
 Group:         Applications/Publishing
 Source0:       http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-# Source0-md5: 6c886515231f5c16eca991a736eefe6e
+# Source0-md5: ea39fb9f562156efa35e4de586909d6a
 Patch0:                %{name}-Makefile.patch
 URL:           http://www.andre-simon.de/
-BuildRequires: QtCore-devel
-BuildRequires: QtGui-devel
+BuildRequires: Qt5Core-devel
+BuildRequires: Qt5Gui-devel
+BuildRequires: Qt5Widgets-devel
 BuildRequires: boost-devel
 %{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: libstdc++-devel
-BuildRequires: lua52-devel
-BuildRequires: qt4-build
-BuildRequires: qt4-qmake
+BuildRequires: lua53-devel
+BuildRequires: qt5-build
+BuildRequires: qt5-qmake
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/highlight
@@ -77,7 +78,7 @@ RTF, TeX, LaTeX, XSL-FO, and XML.
        CXX="%{__cxx}" \
        CXXFLAGS="%{rpmcxxflags} -std=c++11"
 %{__make} gui \
-       QMAKE=qmake-qt4 \
+       QMAKE=qmake-qt5 \
        CXX="%{__cxx}" \
        CXXFLAGS="%{rpmcxxflags} -std=c++11 "'$(DEFINES)'
 
@@ -100,13 +101,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README README_LANGLIST README_REGEX TODO examples
-%lang(de) %doc README_DE
+%doc AUTHORS ChangeLog.adoc README.adoc README_LANGLIST.adoc README_PLUGINS.adoc README_REGEX.adoc extras
+%lang(de) %doc README_DE.adoc
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/langDefs
 %{_datadir}/%{name}/themes
-%{_mandir}/man1/*
+%{_mandir}/man1/highlight.1*
+%{_mandir}/man5/filetypes.conf.5*
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 
@@ -121,9 +123,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{name}-gui
 %dir %{_datadir}/%{name}/gui_files
 %dir %{_datadir}/%{name}/gui_files/l10n
+%lang(bg) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_bg_BG.qm
 %lang(cs) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_cs_CZ.qm
 %lang(de) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_de_DE.qm
 %lang(es) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_es_ES.qm
+%lang(fr) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_fr_FR.qm
+%lang(it) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_it_IT.qm
 %lang(zh) %dir %{_datadir}/%{name}/gui_files/l10n/highlight_zh_CN.qm
 %{_datadir}/%{name}/gui_files/ext
 %dir %{_datadir}/%{name}/plugins