rpms/gitweb-caching/F-11 gitweb-caching-1.6-gitweb-home-link.patch, NONE, 1.1 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.conf.httpd, NONE, 1.1 gitweb-caching.spec, NONE, 1.1 gitweb-cda981c9765dabb7f34992de361eb35dce7857f6.tar.gz.asc, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

John 'Warthog9' Hawley warthog9 at fedoraproject.org
Fri Feb 5 00:29:08 UTC 2010 

Author: warthog9

Update of /cvs/pkgs/rpms/gitweb-caching/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31178/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gitweb-caching-1.6-gitweb-home-link.patch 
	gitweb-caching-default-cache-dir.patch 
	gitweb-caching-disable-version-matching.patch 
	gitweb-caching-fix-base-bin-path.patch 
	gitweb-caching.conf.httpd gitweb-caching.spec 
	gitweb-cda981c9765dabb7f34992de361eb35dce7857f6.tar.gz.asc 
	import.log 
Log Message:
Initial commit into F-11


gitweb-caching-1.6-gitweb-home-link.patch:
 gitweb_defaults.perl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gitweb-caching-1.6-gitweb-home-link.patch ---
diff -uNr gitweb.bak/gitweb/gitweb_defaults.perl gitweb/gitweb/gitweb_defaults.perl
--- gitweb.bak/gitweb/gitweb_defaults.perl	2009-10-07 22:17:05.000000000 -0700
+++ gitweb/gitweb/gitweb_defaults.perl	2009-12-06 13:09:37.000000000 -0800
@@ -46,7 +46,7 @@
 $home_link = $my_uri || "/";
 
 # string of the home link on top of all pages
-$home_link_str = "++GITWEB_HOME_LINK_STR++";
+$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

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";


--- NEW FILE gitweb-caching.conf.httpd ---
Alias /git-caching /var/www/gitweb-caching

<Directory /var/www/gitweb-caching>
  Options +ExecCGI
  AddHandler cgi-script .cgi
  DirectoryIndex gitweb.cgi
</Directory>


--- NEW FILE gitweb-caching.spec ---
# Pass --without docs to rpmbuild if you don't want the documentation

Name:           gitweb-caching
Version:        1.6.5.2
Release:        6.cda981c9%{?dist}
%global SHA1    cda981c9765dabb7f34992de361eb35dce7857f6
Summary:        Simple web interface to git repositories w/ caching support
License:        GPLv2
Group:          Development/Tools
URL:            http://git.kernel.org/?p=git/warthog9/gitweb.git;a=summary
# Tarball is generated from a snapshot of the SHA1 sum above.
# http://git.kernel.org/?p=git/warthog9/gitweb.git;a=snapshot;h=%{SHA1};sf=tgz
#
# NOTE: When downloading a snapshot in this manor (or really anytime git archive
#       is used) the sha1sum of this and any subsequent run is going to be
#       minutely different (the timestamp in the tarball will be current time)
#       because each time it is requested gitweb (and gitweb-caching) is going
#       to completely regenerate the file for download, and thus things like
#       the md5um / sha1sum of the tarball that's present in the RPM here and
#       what could be downloaded to "verify" that things match - won't.
#
#       With that said git already gives us a point of cryptographic integrity
#       internally, and the SHA1 is included here in full so if one cared
#       the individual files would be verified in the tarball vs. what is 
#       present in the repository.  Also to help make verification faster / 
#       easier I, John 'Warthog9' Hawley, am going to GPG sign the tarballs 
#       present so that the chain of trust becomes me claiming the tarball
#       was created by snagging the snapshot from the URL below and if 
#       additional verification is needed please confirm the files via a git
#       checkout of the sha1 above and doing a file by file comparison of the
#       two.
#
# NOTE: When using something like wget or curl to download the snapshot URL
#       this will likely end up in an unexpected state.  The caching, currently,
#       assumes that the client attempting to make use of it will actually
#       interpret the html passed back to it.  During cache generation an interim
#       page is displayed containing "Generating..." as a wait page.  At the end
#       of the page load a meta tag forces an immediate refresh of the page and
#       the actual intended data is shown.  However if your using the
#       aforementioned clients, they do not interpret the data downloaded and thus
#       do not 'refresh' to get the actual data intended.  In those cases the easiest
#       thing to do is to run wget until the data intended does download, or 
#       use an actual webbrowser on the same link.
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
Requires:       git

%description
Simple web interface to track changes in git repositories
w/ caching from John 'Warthog9' Hawley from kernel.org

%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

%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 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
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,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-6.cda981c9
- Really fixing apache configuration now
* 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
- Added documentation about wget + gitweb-caching will likely result in unexpected
  results
- Signed tarball with GPG
- Added documentation about why git snapshots do not match md5sum or sha1sums
  naturally.

* Sun Dec 6 2009 John 'Warthog9' Hawley <warthog9 at kernel.org> 1.6.5.2-2.cda981c9
- Fixing URL
- Adding version to changelog
- Sha1 sum added to release
- Setting to always build noarch

* Sun Dec 6 2009 John 'Warthog9' Hawley <warthog9 at kernel.org> 1.6.5.2-1.cda981c9
- initial gitweb-caching spec file


--- NEW FILE gitweb-cda981c9765dabb7f34992de361eb35dce7857f6.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAksdCuMACgkQ/E3kyWU9didmIACdG3xG3jMVLSOiPiAeVp8a3CCn
N3gAn18gtxQNjbru50vpRCT2+Bf/MHn3
=Y9mj
-----END PGP SIGNATURE-----


--- NEW FILE import.log ---
gitweb-caching-1_6_5_2-6_cda981c9_fc12:F-11:gitweb-caching-1.6.5.2-6.cda981c9.fc12.src.rpm:1265329727


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gitweb-caching/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Jan 2010 05:03:59 -0000	1.1
+++ .cvsignore	5 Feb 2010 00:29:07 -0000	1.2
@@ -0,0 +1 @@
+gitweb-cda981c9765dabb7f34992de361eb35dce7857f6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gitweb-caching/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Jan 2010 05:03:59 -0000	1.1
+++ sources	5 Feb 2010 00:29:08 -0000	1.2
@@ -0,0 +1 @@
+8a522d29f39ee0957441b0b452a8425e  gitweb-cda981c9765dabb7f34992de361eb35dce7857f6.tar.gz

More information about the scm-commits mailing list