packages: cgit/cgit.spec - BC: zlib-devel-1.2.5-1 (see zlib-lfs.patch for d...

[adamg]

Author: adamg                        Date: Sun May 23 20:27:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BC: zlib-devel-1.2.5-1 (see zlib-lfs.patch for details)
- release 2

---- Files affected:
packages/cgit:
   cgit.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/cgit/cgit.spec
diff -u packages/cgit/cgit.spec:1.9 packages/cgit/cgit.spec:1.10
--- packages/cgit/cgit.spec:1.9	Sun May  2 11:02:37 2010
+++ packages/cgit/cgit.spec	Sun May 23 22:27:25 2010
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	cgit - szybki interfejs WWW do gita
 Name:		cgit
 Version:	0.8.3.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://hjemli.net/git/cgit/snapshot/%{name}-%{version}.tar.bz2
@@ -20,6 +20,7 @@
 URL:		http://hjemli.net/git/cgit
 BuildRequires:	git-core-devel >= 1.7.1-2
 BuildRequires:	openssl-devel
+BuildConflicts:	zlib-devel = 1.2.5-1
 Requires:	webapps
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -113,6 +114,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/05/23 20:27:25  adamg
+- BC: zlib-devel-1.2.5-1 (see zlib-lfs.patch for details)
+- release 2
+
 Revision 1.9  2010/05/02 09:02:37  adamg
 - updated to 0.8.3.1; BR: git-core-devel >= 1.7.1-2 (compat/bswap.h)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cgit/cgit.spec?r1=1.9&r2=1.10&f=u