[packages/cgit] - updated to 0.10.1
kiesiu
kiesiu at pld-linux.org
Sat Mar 1 19:16:53 CET 2014
commit 8e4d66370eff5de766b6bff833ecb9bcbbe329c4
Author: Łukasz Kieś <kiesiu at pld-linux.org>
Date: Sat Mar 1 19:16:28 2014 +0100
- updated to 0.10.1
cgit-lua.patch | 52 +++++++++-------------------------------------------
cgit.spec | 8 ++++----
2 files changed, 13 insertions(+), 47 deletions(-)
---
diff --git a/cgit.spec b/cgit.spec
index 75db72c..62b1277 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -1,19 +1,19 @@
Summary: cgit - a fast webinterface to git
Summary(pl.UTF-8): cgit - szybki interfejs WWW do gita
Name: cgit
-Version: 0.10
-Release: 2
+Version: 0.10.1
+Release: 1
License: GPL v2
Group: Development/Tools
Source0: http://git.zx2c4.com/cgit/snapshot/%{name}-%{version}.tar.xz
-# Source0-md5: 19944c17ecea1b1d1944718ce8ce6b61
+# Source0-md5: 060ef0aa95ebda6ea7daf823214bc4d0
Source1: %{name}.conf
Source2: %{name}-repo.conf
Source3: %{name}-apache.conf
Patch0: %{name}-system-git.patch
Patch1: %{name}-lua.patch
URL: http://git.zx2c4.com/cgit/about/
-BuildRequires: git-core-devel >= 1.8.5
+BuildRequires: git-core-devel >= 1.9.0
BuildRequires: lua-devel >= 5.0
BuildRequires: openssl-devel
BuildConflicts: zlib-devel = 1.2.5-1
diff --git a/cgit-lua.patch b/cgit-lua.patch
index 146a686..5236484 100644
--- a/cgit-lua.patch
+++ b/cgit-lua.patch
@@ -1,46 +1,12 @@
-diff -uNr cgit-0.10.old/cgit.mk cgit-0.10/cgit.mk
---- cgit-0.10.old/cgit.mk 2014-01-17 16:09:16.000000000 +0100
-+++ cgit-0.10/cgit.mk 2014-02-25 18:26:04.391520820 +0100
-@@ -29,30 +29,18 @@
- LUA_MESSAGE := linking without specified Lua support
+diff -uNr cgit-0.10.1.old/cgit.mk cgit-0.10.1/cgit.mk
+--- cgit-0.10.1.old/cgit.mk 2014-02-28 00:12:08.000000000 +0100
++++ cgit-0.10.1/cgit.mk 2014-03-01 19:02:59.424624275 +0100
+@@ -30,7 +30,7 @@
CGIT_CFLAGS += -DNO_LUA
else
--LUAJIT_CFLAGS := $(shell pkg-config --cflags luajit 2>/dev/null)
--LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null)
--LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null)
--LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null)
--ifeq (JIT,$(LUA_IMPLEMENTATION))
-- ifeq ($(strip $(LUAJIT_LIBS)),)
-- $(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.)
-- endif
-- LUA_MESSAGE := linking with selected LuaJIT
-- CGIT_LIBS += $(LUAJIT_LIBS)
-- CGIT_CFLAGS += $(LUAJIT_CFLAGS)
--else ifeq (VANILLA,$(LUA_IMPLEMENTATION))
-- ifeq ($(strip $(LUA_LIBS)),)
-- $(error Lua specified via LUA_IMPLEMENTATION=VANILLA, but library could not be found.)
-- endif
-- LUA_MESSAGE := linking with selected Lua
-- CGIT_LIBS += $(LUA_LIBS)
-- CGIT_LIBS += $(LUA_CFLAGS)
--else ifneq ($(strip $(LUAJIT_LIBS)),)
-- LUA_MESSAGE := linking with autodetected LuaJIT
-- CGIT_LIBS += $(LUAJIT_LIBS)
-- CGIT_CFLAGS += $(LUAJIT_CFLAGS)
--else ifneq ($(strip $(LUA_LIBS)),)
-- LUA_MESSAGE := linking with autodetected Lua
-+ifeq ($(LUA_PKGCONFIG),)
+ ifeq ($(LUA_PKGCONFIG),)
+- LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
+ LUA_PKGCONFIG := $(shell for pc in lua5.2 lua51 lua50; do \
-+ pkg-config --exists $$pc 2>/dev/null && echo $$pc && break; \
-+ done)
-+ LUA_MODE := autodetected
-+else
-+ LUA_MODE := specified
-+endif
-+ifneq ($(LUA_PKGCONFIG),)
-+ LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
-+ LUA_LIBS := $(shell pkg-config --libs $(LUA_PKGCONFIG) 2>/dev/null)
-+ LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKGCONFIG) 2>/dev/null)
- CGIT_LIBS += $(LUA_LIBS)
- CGIT_CFLAGS += $(LUA_CFLAGS)
- else
+ pkg-config --exists $$pc 2>/dev/null && echo $$pc && break; \
+ done)
+ LUA_MODE := autodetected
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cgit.git/commitdiff/8e4d66370eff5de766b6bff833ecb9bcbbe329c4
More information about the pld-cvs-commit
mailing list