New upstream release

- Fix FTBFS due changed lua API (#991892)
This commit is contained in:
Jochen Schmitt 2013-08-21 21:50:27 +02:00
parent 50eae34fdd
commit 8e211c28bf
4 changed files with 8 additions and 36 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ highlight-3.1-beta2.tar.bz2
/highlight-3.11-beta.tar.bz2
/highlight-3.12.tar.bz2
/highlight-3.13.tar.bz2
/highlight-3.15.tar.bz2

View File

@ -1,31 +0,0 @@
diff -up highlight-3.13/src/gui-qt/highlight.pro.mk highlight-3.13/src/gui-qt/highlight.pro
--- highlight-3.13/src/gui-qt/highlight.pro.mk 2013-02-19 18:43:29.139258245 +0100
+++ highlight-3.13/src/gui-qt/highlight.pro 2013-02-19 18:44:26.651647337 +0100
@@ -31,9 +31,9 @@ unix:LIBS += -L.. -lhighlight
# If Lua 5.2 is not default on your system yet you have to omit 5.1 here:
unix {
- LIBS += -llua5.1
+ LIBS += -llua
CONFIG += link_pkgconfig
- PKGCONFIG += lua5.1
+ PKGCONFIG += lua
}
win32:QMAKE_POST_LINK = f:/upx/upx.exe --best ../../highlight-gui.exe
diff -up highlight-3.13/src/makefile.mk highlight-3.13/src/makefile
--- highlight-3.13/src/makefile.mk 2013-02-01 21:37:56.000000000 +0100
+++ highlight-3.13/src/makefile 2013-02-19 18:33:33.025879310 +0100
@@ -34,10 +34,10 @@ INCLUDE_DIR=./include/
# If Lua 5.2 is not default on your system yet you have to omit 5.1:
-LUA_CFLAGS=$(shell pkg-config --cflags lua5.1)
+LUA_CFLAGS=$(shell pkg-config --cflags lua)
# default lua lib
-LUA_LIBS=$(shell pkg-config --libs lua5.1)
+LUA_LIBS=$(shell pkg-config --libs lua)
# luajit lib
#LUA_LIBS=$(shell pkg-config --libs luajit)

View File

@ -1,15 +1,14 @@
Name: highlight
Summary: Universal source code to formatted text converter
Version: 3.13
Release: 3%{?dist}
Version: 3.15
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
Patch1: highlight-3.13-lua.patch
BuildRequires: qt-devel >= 1:4.4
BuildRequires: lua-devel, boost-devel
@ -38,7 +37,6 @@ A Qt-based GUI for the highlight source code formatter source.
%prep
%setup -q
%patch1 -p1 -b .mk
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@ -78,6 +76,10 @@ desktop-file-install \
%{_datadir}/pixmaps/highlight.xpm
%changelog
* 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@lists.fedoraproject.org> - 3.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

View File

@ -1 +1 @@
2b5e217c80c441853360926dbb7777e9 highlight-3.13.tar.bz2
ca89c1f01449059459d8cb173a9cf2dc highlight-3.15.tar.bz2