rpms/git/EL-5 git-1.5-gitweb-home-link.patch, NONE, 1.1 git.conf.httpd, NONE, 1.1 git.xinetd, NONE, 1.1 .cvsignore, 1.39, 1.40 git.spec, 1.33, 1.34 sources, 1.41, 1.42
Joshua W. Boyer (jwboyer)
fedora-extras-commits at redhat.com
Fri Dec 7 04:45:28 UTC 2007
Author: jwboyer
Update of /cvs/pkgs/rpms/git/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6978
Modified Files:
.cvsignore git.spec sources
Added Files:
git-1.5-gitweb-home-link.patch git.conf.httpd git.xinetd
Log Message:
* Wed Dec 05 2007 Josh Boyer <jwboyer at gmail.com> 1.5.3.6-1
- git-1.5.3.6
- Add git-deamon and git-web subpackages
git-1.5-gitweb-home-link.patch:
--- NEW FILE git-1.5-gitweb-home-link.patch ---
--- git-1.5.0.6/gitweb/gitweb.perl~ 2007-03-30 01:37:05.000000000 +0100
+++ git-1.5.0.6/gitweb/gitweb.perl 2007-05-07 08:31:37.000000000 +0100
@@ -39,7 +39,7 @@ our $projectroot = "++GITWEB_PROJECTROOT
our $home_link = $my_uri || "/";
# string of the home link on top of all pages
-our $home_link_str = "++GITWEB_HOME_LINK_STR++";
+our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects";
# name of your site or organization to appear in page titles
# replace this with something more descriptive for clearer bookmarks
--- NEW FILE git.conf.httpd ---
Alias /git /var/www/git
<Directory /var/www/git>
Options +ExecCGI
AddHandler cgi-script .cgi
</Directory>
--- NEW FILE git.xinetd ---
# default: off
# description: The git dæmon allows git repositories to be exported using
# the git:// protocol.
service git
{
disable = yes
socket_type = stream
wait = no
user = nobody
server = /usr/bin/git-daemon
server_args = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose
log_on_failure += USERID
# xinetd doesn't do this by default. bug #195265
flags = IPv6
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/EL-5/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 30 Mar 2007 17:52:28 -0000 1.39
+++ .cvsignore 7 Dec 2007 04:44:48 -0000 1.40
@@ -1 +1 @@
-git-1.5.0.6.tar.gz
+git-1.5.3.6.tar.gz
Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/EL-5/git.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- git.spec 12 Oct 2007 13:25:34 -0000 1.33
+++ git.spec 7 Dec 2007 04:44:48 -0000 1.34
@@ -1,12 +1,15 @@
# Pass --without docs to rpmbuild if you don't want the documentation
Name: git
-Version: 1.5.3.3
+Version: 1.5.3.6
Release: 1%{?dist}
Summary: Git core and tools
License: GPL
Group: Development/Tools
URL: http://kernel.org/pub/software/scm/git/
Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
+Source1: git.xinetd
+Source2: git.conf.httpd
+Patch0: git-1.5-gitweb-home-link.patch
BuildRequires: perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: git-core, git-svn, git-cvs, git-email, gitk, git-gui, perl-Git
@@ -29,6 +32,20 @@
These are the core tools with minimal dependencies.
+%package daemon
+Summary: Git protocol daemon
+Group: Development/Tools
+Requires: git-core = %{version}-%{release}
+%description daemon
+The git dæmon for supporting git:// access to git repositories
+
+%package -n gitweb
+Summary: Simple web interface to git repositories
+Group: Development/Tools
+Requires: git-core = %{version}-%{release}
+%description -n gitweb
+Simple web interface to track changes in git repositories
+
%package svn
Summary: Git tools for importing Subversion repositories
Group: Development/Tools
@@ -75,6 +92,7 @@
%prep
%setup -q
+%patch0 -p1
%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -87,6 +105,15 @@
prefix=%{_prefix} mandir=%{_mandir} \
ETC_GITCONFIG=/etc/gitconfig \
INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
+install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git
+mkdir -p $RPM_BUILD_ROOT/var/www/git
+install -m 644 -t $RPM_BUILD_ROOT/var/www/git gitweb/*.png gitweb/*.css
+install -m 755 -t $RPM_BUILD_ROOT/var/www/git gitweb/gitweb.cgi
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
+install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf
+
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
@@ -100,6 +127,7 @@
%else
rm -rf $RPM_BUILD_ROOT%{_mandir}
%endif
+mkdir -p $RPM_BUILD_ROOT/srv/git
%clean
rm -rf $RPM_BUILD_ROOT
@@ -152,10 +180,26 @@
%defattr(-,root,root)
%{_datadir}/git-core/
%doc README COPYING Documentation/*.txt
+
+%files daemon
+%defattr(-,root,root)
+%{_bindir}/git-daemon
+%config(noreplace)%{_sysconfdir}/xinetd.d/git
+/srv/git
+
+%files -n gitweb
+%defattr(-,root,root)
+/var/www/git/
+%{_sysconfdir}/httpd/conf.d/git.conf
%{!?_without_docs: %doc Documentation/*.html Documentation/howto}
%{!?_without_docs: %doc Documentation/technical}
+
%changelog
+* Wed Dec 05 2007 Josh Boyer <jwboyer at gmail.com> 1.5.3.6-1
+- git-1.5.3.6
+- Add git-deamon and git-web subpackages
+
* Fri Oct 12 2007 James Bowes <jbowes at redhat.com> 1.5.3.3-1
- git-1.5.3.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/EL-5/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 12 Oct 2007 13:25:34 -0000 1.41
+++ sources 7 Dec 2007 04:44:48 -0000 1.42
@@ -1 +1 @@
-978bda72a636d805dd3058efec5e6f2e git-1.5.3.3.tar.gz
+37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz
More information about the fedora-extras-commits
mailing list