rpms/gitweb-caching/devel gitweb-caching-default-cache-dir.patch, NONE, 1.1 gitweb-caching-disable-version-matching.patch, NONE, 1.1 gitweb-caching-fix-base-bin-path.patch, NONE, 1.1 gitweb-caching.spec, 1.1, 1.2 import.log, 1.1, 1.2
John 'Warthog9' Hawley
warthog9 at fedoraproject.org
Fri Feb 5 00:03:48 UTC 2010
Author: warthog9
Update of /cvs/pkgs/rpms/gitweb-caching/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27903/devel
Modified Files:
gitweb-caching.spec import.log
Added Files:
gitweb-caching-default-cache-dir.patch
gitweb-caching-disable-version-matching.patch
gitweb-caching-fix-base-bin-path.patch
Log Message:
minor version 5
- Fixing apache configuration so that it points to the right location
- Added missing cache.pm file
- Fixed git binary path
- Created and pointed caching directory to /var/cache/gitweb-caching (default)
- Disable git version matching
gitweb-caching-default-cache-dir.patch:
gitweb_defaults.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gitweb-caching-default-cache-dir.patch ---
diff -uNr gitweb/gitweb/gitweb_defaults.perl gitweb.orig/gitweb/gitweb_defaults.perl
--- gitweb/gitweb/gitweb_defaults.perl 2010-02-04 15:49:27.000000000 -0800
+++ gitweb.orig/gitweb/gitweb_defaults.perl 2010-02-04 15:47:08.000000000 -0800
@@ -217,7 +217,7 @@
# If you need to change the location of the caching directory, override this
# otherwise this will probably do fine for you
-$cachedir = 'cache';
+$cachedir = '/var/cache/gitweb-caching';
# If this is set (to 1) cache will do it's best to always display something instead
# of making someone wait for the cache to update. This will launch the cacheUpdate
gitweb-caching-disable-version-matching.patch:
gitweb_defaults.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gitweb-caching-disable-version-matching.patch ---
diff -uNr gitweb/gitweb/gitweb_defaults.perl gitweb.orig/gitweb/gitweb_defaults.perl
--- gitweb/gitweb/gitweb_defaults.perl 2010-02-04 15:47:08.000000000 -0800
+++ gitweb.orig/gitweb/gitweb_defaults.perl 2010-02-04 15:41:16.000000000 -0800
@@ -192,7 +192,7 @@
);
# This is here to allow for missmatch git & gitweb versions
-$missmatch_git = '';
+$missmatch_git = 1;
#This is here to deal with an extra link on the summary pages - if it's left blank
# this link will not be shwon. If it's set, this will be prepended to the repo and used
gitweb-caching-fix-base-bin-path.patch:
gitweb_defaults.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gitweb-caching-fix-base-bin-path.patch ---
diff -uNr gitweb.orig/gitweb/gitweb_defaults.perl gitweb/gitweb/gitweb_defaults.perl
--- gitweb.orig/gitweb/gitweb_defaults.perl 2010-01-06 16:25:05.000000000 -0800
+++ gitweb/gitweb/gitweb_defaults.perl 2010-02-04 15:35:28.000000000 -0800
@@ -32,7 +32,7 @@
# core git executable to use
# this can just be "git" if your webserver has a sensible PATH
-$GIT = "++GIT_BINDIR++/git";
+$GIT = "/usr/bin/git";
# absolute fs-path which will be prepended to the project path
#our $projectroot = "/pub/scm";
Index: gitweb-caching.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gitweb-caching/devel/gitweb-caching.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gitweb-caching.spec 4 Feb 2010 22:26:41 -0000 1.1
+++ gitweb-caching.spec 5 Feb 2010 00:03:48 -0000 1.2
@@ -2,7 +2,7 @@
Name: gitweb-caching
Version: 1.6.5.2
-Release: 4.cda981c9%{?dist}
+Release: 5.cda981c9%{?dist}
%global SHA1 cda981c9765dabb7f34992de361eb35dce7857f6
Summary: Simple web interface to git repositories w/ caching support
License: GPLv2
@@ -45,6 +45,9 @@ Source0: gitweb-%{SHA1}.tar.gz
Source1: gitweb-%{SHA1}.tar.gz.asc
Source2: gitweb-caching.conf.httpd
Patch0: gitweb-caching-1.6-gitweb-home-link.patch
+Patch1: gitweb-caching-fix-base-bin-path.patch
+Patch2: gitweb-caching-default-cache-dir.patch
+Patch3: gitweb-caching-disable-version-matching.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -57,6 +60,9 @@ w/ caching from John 'Warthog9' Hawley f
%prep
%setup -n gitweb -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
make %{_smp_mflags} V=1 NO_CURL=1 gitweb/gitweb.cgi gitweb/gitweb_defaults.pl
@@ -64,9 +70,10 @@ make %{_smp_mflags} V=1 NO_CURL=1 gitweb
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_var}/www/gitweb-caching
-install -pm 644 gitweb/*.png gitweb/*.css gitweb/gitweb_defaults.pl $RPM_BUILD_ROOT%{_var}/www/%{name}
+install -pm 644 gitweb/*.png gitweb/*.css gitweb/gitweb_defaults.pl gitweb/cache.pm $RPM_BUILD_ROOT%{_var}/www/%{name}
install -pm 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT%{_var}/www/%{name}
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
+install -pm 0755 --directory $RPM_BUILD_ROOT%{_var}/cache/gitweb-caching
install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
%clean
@@ -77,8 +84,15 @@ rm -rf $RPM_BUILD_ROOT
%doc gitweb/README COPYING
%{_var}/www/%{name}/
%config(noreplace)%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%attr(0755, apache, apache) %{_var}/cache/gitweb-caching
%changelog
+* Thu Feb 4 2010 John 'Warthog9' Hawley <warthog9 at kernel.org> 1.6.5.2-5.cda981c9
+- Fixing apache configuration so that it points to the right location
+- Added missing cache.pm file
+- Fixed git binary path
+- Created and pointed caching directory to /var/cache/gitweb-caching (default)
+- Disable git version matching
* Wed Jan 6 2010 John 'Warthog9' Hawley <warthog9 at kernel.org> 1.6.5.2-4.cda981c9
- Added COPYING
* Sun Dec 7 2009 John 'Warthog9' Hawley <warthog9 at kernel.org> 1.6.5.2-3.cda981c9
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gitweb-caching/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 4 Feb 2010 22:26:41 -0000 1.1
+++ import.log 5 Feb 2010 00:03:48 -0000 1.2
@@ -1 +1,2 @@
gitweb-caching-1_6_5_2-4_cda981c9_fc12:HEAD:gitweb-caching-1.6.5.2-4.cda981c9.fc12.src.rpm:1265322279
+gitweb-caching-1_6_5_2-5_cda981c9_fc12:HEAD:gitweb-caching-1.6.5.2-5.cda981c9.fc12.src.rpm:1265328180
More information about the scm-commits
mailing list