up to 3.60

diff --git a/highlight-Makefile.patch b/highlight-Makefile.patch
index d092a7523e40bfd5c71ece9d8830a508836dd987..a8403698c6bc01a4de707cefe5c886dacaea7f26 100644 (file)
--- a/highlight-Makefile.patch
+++ b/highlight-Makefile.patch
@@ -11,9 +11,9 @@ diff -urN highlight-3.34.orig/src/makefile highlight-3.34/src/makefile
  # Copy *.conf, ./langDefs, ./themes amd ./indentSchemes to /your/path/.
  # See ../makefile for the definition of ${data_dir}
 @@ -19,13 +19,13 @@
- QMAKE=qmake
  
- # Added -std=c++11 because of auto_ptr to unique_ptr transition
+ QMAKE ?= qmake
+ 
 -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
 +CXXFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
  
@@ -26,7 +26,7 @@ diff -urN highlight-3.34.orig/src/makefile highlight-3.34/src/makefile
 -CFLAGS_DILU=-fno-strict-aliasing
 +CXXFLAGS_DILU=-fno-strict-aliasing
  
- SO_VERSION=3.53
+ SO_VERSION=3.60
  
 @@ -63,7 +63,7 @@
  endif

diff --git a/highlight.spec b/highlight.spec
index 85dc7bd243398fd51ceaa761b78767bc361d8181..53e90e8d55927d729d9575b60fca9d50a9da7d36 100644 (file)
--- a/highlight.spec
+++ b/highlight.spec
@@ -5,12 +5,12 @@
 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.58
+Version:       3.60
 Release:       1
 License:       GPL v3
 Group:         Applications/Publishing
 Source0:       http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-# Source0-md5: 06d9b1070ee9eed48a3769815eb8204e
+# Source0-md5: 33f7f5548ac86e18a39b93fbefbe7e5d
 Patch0:                %{name}-Makefile.patch
 URL:           http://www.andre-simon.de/
 BuildRequires: Qt5Core-devel
@@ -64,6 +64,8 @@ Summary:      GUI for highlight - a source code converter to HTML, XHTML, RTF, TeX, L
 Summary(pl.UTF-8):     GUI do highlight - konwertera kodu źródłowego do HTML, XHTML, RTF, TeX, LaTeX, XSL-FO oraz XML
 Group:         Development/Tools
 Requires:      %{name}
+Requires(post,postun): gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 
 %description gui
 Qt4 GUI for for highlight - a source code converter to HTML, XHTML,
@@ -98,6 +100,12 @@ rm -fr $RPM_BUILD_ROOT%{_docdir}/highlight
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post gui
+%update_icon_cache hicolor
+
+%postun gui
+%update_icon_cache hicolor
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog.adoc README.adoc README_LANGLIST.adoc README_PLUGINS.adoc README_REGEX.adoc extras
@@ -133,4 +141,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/*.lua
 %{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.xpm
+%{_iconsdir}/hicolor/*x*/apps/highlight.png