From: Karol Krenski <charles@pld-linux.org>
Date: Wed, 13 Oct 2010 23:40:35 +0000 (+0000)
Subject: - updated to 0.8.3.4
X-Git-Tag: auto/th/cgit-0_8_3_4-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcgit.git;a=commitdiff_plain;h=18ab1fdd42883002676bed955eaf027ef890f8a7

- updated to 0.8.3.4

Changed files:
    cgit-system-git.patch -> 1.3
    cgit.spec -> 1.13
---

diff --git a/cgit-system-git.patch b/cgit-system-git.patch
index a237060..359ffe4 100644
--- a/cgit-system-git.patch
+++ b/cgit-system-git.patch
@@ -1,24 +1,23 @@
-diff -burN cgit-0.8.1.orig/Makefile cgit-0.8.1/Makefile
---- cgit-0.8.1.orig/Makefile	2008-12-10 09:59:24.000000000 +0100
-+++ cgit-0.8.1/Makefile	2008-12-10 10:03:03.000000000 +0100
-@@ -6,6 +6,7 @@
- GIT_VER = 1.6.1.1
+--- cgit-0.8.3.4/Makefile.orig	2010-09-27 08:00:47.000000000 +0200
++++ cgit-0.8.3.4/Makefile	2010-10-14 01:24:36.000000000 +0200
+@@ -8,6 +8,7 @@
+ GIT_VER = 1.7.3
  GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
  INSTALL = install
 +LIBDIR = /usr/lib
  
  # Define NO_STRCASESTR if you don't have strcasestr.
  #
-@@ -46,7 +47,7 @@
+@@ -68,7 +69,7 @@
  	$(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
  
  
--EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
-+EXTLIBS = $(LIBDIR)/libgit.a $(LIBDIR)/libgit_xdiff.a -lz -lcrypto
+-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread
++EXTLIBS = $(LIBDIR)/libgit.a $(LIBDIR)/libgit_xdiff.a -lz -lcrypto -lpthread
  OBJECTS =
  OBJECTS += cache.o
  OBJECTS += cgit.o
-@@ -97,17 +98,13 @@
+@@ -124,17 +125,13 @@
  	CFLAGS += -DNO_STRCASESTR
  endif
  
diff --git a/cgit.spec b/cgit.spec
index 6097089..bb91b2a 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -5,19 +5,19 @@
 Summary:	cgit - a fast webinterface to git
 Summary(pl.UTF-8):	cgit - szybki interfejs WWW do gita
 Name:		cgit
-Version:	0.8.3.3
+Version:	0.8.3.4
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://hjemli.net/git/cgit/snapshot/%{name}-%{version}.tar.bz2
-# Source0-md5:	30a28cb991d616970d19a5b5c470864a
+# Source0-md5:	712e4d3013d754aa5752e0101188cf32
 Source1:	%{name}.conf
 Source2:	%{name}-repo.conf
 Source3:	%{name}-httpd.conf
 Patch0:		%{name}-system-git.patch
 Patch1:		%{name}-override-cflags.patch
 URL:		http://hjemli.net/git/cgit
-BuildRequires:	git-core-devel >= 1.7.1-2
+BuildRequires:	git-core-devel >= 1.7.3
 BuildRequires:	openssl-devel
 BuildConflicts:	zlib-devel = 1.2.5-1
 Requires:	webapps