- BC: zlib-devel-1.2.5-1 (see zlib-lfs.patch for details)

- release 2

Changed files:
    cgit.spec -> 1.10

diff --git a/cgit.spec b/cgit.spec
index a3d3c8e48b54eb597726569ddae4d0713d522007..eb920d994a7bbf2d08587d6a6f2b53ba8d63ec30 100644 (file)
--- a/cgit.spec
+++ b/cgit.spec
@@ -6,7 +6,7 @@ Summary:        cgit - a fast webinterface to git
 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
@@ -19,6 +19,7 @@ Patch1:               %{name}-override-cflags.patch
 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)