[highlight/f19] New upstream release

[Jochen Schmitt]

commit 1afa6dc592a3609b7a112b97eb9958a9b4037286
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Nov 27 19:33:37 2013 +0100

    New upstream release

 highlight-3.16-lua51.patch |   12 ++++++++++++
 highlight.spec             |   24 ++++++++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)
---
diff --git a/highlight-3.16-lua51.patch b/highlight-3.16-lua51.patch
new file mode 100644
index 0000000..2a20afb
--- /dev/null
+++ b/highlight-3.16-lua51.patch
@@ -0,0 +1,12 @@
+diff -up highlight-3.16/src/makefile.lua51 highlight-3.16/src/makefile
+--- highlight-3.16/src/makefile.lua51	2013-11-27 19:23:39.167591085 +0100
++++ highlight-3.16/src/makefile	2013-11-27 19:24:50.195298503 +0100
+@@ -38,7 +38,7 @@ INCLUDE_DIR=./include/
+ # - remove -DUSE_LUA52
+ # - use lua5.1 in the pkg-config calls
+ 
+-LUA_CFLAGS=$(shell pkg-config --cflags lua) -DUSE_LUA52
++LUA_CFLAGS=$(shell pkg-config --cflags lua) # -DUSE_LUA52
+ 
+ # default lua lib
+ LUA_LIBS=$(shell pkg-config --libs lua)
diff --git a/highlight.spec b/highlight.spec
index 2de6d0a..4731c4e 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,7 +1,8 @@
 Name:           highlight
+
 Summary:        Universal source code to formatted text converter
 
-Version:        3.14
+Version:        3.16.1
 Release:        1%{?dist}
 
 Group:          Development/Tools
@@ -9,10 +10,11 @@ License:        GPLv3
 
 URL:            http://www.andre-simon.de/
 Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-Patch1:         highlight-3.13-lua.patch
+Patch1:         highlight-3.16-lua51.patch
 
 BuildRequires:  qt-devel >= 1:4.4
 BuildRequires:  lua-devel, boost-devel
+# Only required for 3.16.1
 BuildRequires:  desktop-file-utils
 
 %{?filter_setup:
@@ -37,8 +39,8 @@ Requires:       %{name} = %{version}-%{release}
 A Qt-based GUI for the highlight source code formatter source.
 
 %prep
-%setup -q
-%patch1 -p1 -b .mk
+%setup -q -n  %{name}-3.16
+%patch1 -p1 -b .lua51
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@@ -78,8 +80,18 @@ desktop-file-install \
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
-* Sun Aug  4 2013 Jochen Schmitt <Jochen herr-schmitt de> - 3.14-1
-- New upstream releae
+* Wed Nov 27 2013 Jochen Schmitt <Jochen herr-schmitt de> - 3.16.1-1
+- New upstream release
+
+* Wed Aug 21 2013 Jochen Schmitt <Jochen herr-schmitt de> - 3.15-1
+- New upstream release
+- Fix FTBFS due changed lua API (#991892)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul 30 2013 Petr Machata <pmachata at redhat.com> - 3.13-2
+- Rebuild for boost 1.54.0
 
 * Tue Feb 19 2013 Jochen Schmitt <Jochen herr-schmitt de> - 3.13-1
 - New upstream release