rpms/git/EL-4 git-1.5-gitweb-home-link.patch, NONE, 1.1 git.conf.httpd, NONE, 1.1 git.xinetd, NONE, 1.1 git.spec, 1.28, 1.29 sources, 1.36, 1.37
James Bowes (jbowes)
fedora-extras-commits at redhat.com
Fri Dec 21 14:49:54 UTC 2007
- Previous message (by thread): rpms/fontconfig/OLPC-2 mtime_fix.patch, NONE, 1.1 fontconfig.spec, 1.98, 1.99
- Next message (by thread): rpms/alpine/EL-4 alpine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jbowes
Update of /cvs/extras/rpms/git/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15165
Modified Files:
git.spec sources
Added Files:
git-1.5-gitweb-home-link.patch git.conf.httpd git.xinetd
Log Message:
Update to git 1.5.3.6 for el4
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: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/EL-4/git.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- git.spec 23 Jul 2007 20:36:01 -0000 1.28
+++ git.spec 21 Dec 2007 14:49:10 -0000 1.29
@@ -1,12 +1,15 @@
# Pass --without docs to rpmbuild if you don't want the documentation
Name: git
-Version: 1.5.2.1
-Release: 3%{?dist}
+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,14 @@
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 {} ';'
@@ -97,10 +123,11 @@
(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
%if %{!?_without_docs:1}0
-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%else
rm -rf $RPM_BUILD_ROOT%{_mandir}
%endif
+mkdir -p $RPM_BUILD_ROOT/srv/git
%clean
rm -rf $RPM_BUILD_ROOT
@@ -134,11 +161,10 @@
%{_bindir}/git-gui
%{_bindir}/git-citool
%{_datadir}/git-gui/
-# Not Yet...
-# %{!?_without_docs: %{_mandir}/man1/git-gui.1}
-# %{!?_without_docs: %doc Documentation/git-gui.html}
-# %{!?_without_docs: %{_mandir}/man1/git-citool.1}
-# %{!?_without_docs: %doc Documentation/git-citool.html}
+%{!?_without_docs: %{_mandir}/man1/git-gui.1*}
+%{!?_without_docs: %doc Documentation/git-gui.html}
+%{!?_without_docs: %{_mandir}/man1/git-citool.1*}
+%{!?_without_docs: %doc Documentation/git-citool.html}
%files -n gitk
%defattr(-,root,root)
@@ -154,10 +180,27 @@
%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 James Bowes <jbowes at redhat.com> 1.5.3.6-1
+- git-1.5.3.6 (Changes courtesy Josh Boyer)
+
+* Fri Oct 12 2007 James Bowes <jbowes at redhat.com> 1.5.3.3-1
+- git-1.5.3.3
+
* Mon Jul 23 2007 James Bowes <jbowes at redhat.com> 1.5.2.1-3
- Remove the git-arch subpackage (tla is not in epel).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/EL-4/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources 22 Jun 2007 17:07:24 -0000 1.36
+++ sources 21 Dec 2007 14:49:10 -0000 1.37
@@ -1 +1 @@
-e65b08c2e1a4112c3139c15ac5a13e71 git-1.5.2.1.tar.gz
+37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz
- Previous message (by thread): rpms/fontconfig/OLPC-2 mtime_fix.patch, NONE, 1.1 fontconfig.spec, 1.98, 1.99
- Next message (by thread): rpms/alpine/EL-4 alpine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list