Accepting request 87800 from devel:tools:scm

NOTE: this SR is intended to move cgit from git (as of now cgit.spec is
      incldued in git package src).  cgit will be no longer linked repo.

- split from OBS git repo to an individual repo (since cgit-0.9
  doesn't build with git-1.7.7)
- merged fixes in git repo back to cgit repo
- updated to git 1.7.6.4
- updated to cgit 0.9.0.2

OBS-URL: https://build.opensuse.org/request/show/87800
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cgit?expand=0&rev=3

cgit.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package cgit (Version 0.8.3.3)
+# spec file for package cgit
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +17,23 @@
 
 # norootforbuild
 
-%define git_version	1.7.3.4
+%define git_version	1.7.6.4
 
 Name:           cgit
 Url:            http://hjemli.net/git/cgit/
 License:        GPLv2
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
-Version:        0.8.3.3
-Release:        4
+Version:        0.9.0.2
+Release:        7
 Summary:        A web frontend for git repositories
 Source0:        %{name}-%{version}.tar.bz2
-Source1:        git-%{git_version}.tar.bz2
+Source1:        git-%{git_version}.tar.gz
 Source2:        cgitrc
-Patch0:         cgit-link-fixes.diff
-Patch1:         cgit_fix_stringlist.patch
+Patch:          cgit-optflags.diff
+Patch1:         cgit-git-1.7.6_build_fix.patch
+Patch2:         cgit-CVE-2011-2711-fix.diff
 # Requirements for cgit
-BuildRequires:  git >= 1.7.1
 BuildRequires:  gnu-crypto libopenssl-devel libzip-devel
 # Requirements for cgitrc man page generation
 BuildRequires:  asciidoc libxslt
@@ -50,38 +50,38 @@ Authors:
 %prep
 %setup -q
 %setup -q -T -D -a 1
+%patch -p1
+%patch1 -p1
+%patch2 -p1
 rm -rf git
 mv git-%{git_version} git
-%patch0 -p1
-%patch1 -p1
 
 %build
-make
-make man-doc
+make V=1
 
 %install
-make install CGIT_SCRIPT_PATH="%{buildroot}"/srv/www/htdocs/cgit
+make install DESTDIR="%{buildroot}" CGIT_SCRIPT_PATH=/srv/www/htdocs/cgit
+make install-man DESTDIR="%{buildroot}"
 
 mkdir -p "%{buildroot}"/srv/www/cgi-bin/cgit/
 mv "%{buildroot}"/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi
 
-mkdir -p "%{buildroot}%{_mandir}"/man5/
-cp cgitrc.5 "%{buildroot}%{_mandir}"/man5/cgitrc.5
-
 mkdir -p "%{buildroot}"/etc
 cp %{SOURCE2} "%{buildroot}"/etc/cgitrc
 
 %clean
-make clean
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%doc README COPYING
+%doc %{_mandir}/man5/cgitrc.5.gz
 %dir /srv/www/htdocs/cgit
 %dir /srv/www/cgi-bin/cgit
 /srv/www/cgi-bin/cgit/cgit.cgi
 /srv/www/htdocs/cgit/cgit.css
 /srv/www/htdocs/cgit/cgit.png
-%doc %{_mandir}/man5/cgitrc.5.gz
+/usr/lib/cgit
 %config(noreplace) /etc/cgitrc
 
 %changelog