Author: glen Date: Sun Feb 13 12:56:06 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.5.8, add html docs
---- Files affected: packages/gitolite: gitolite.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: packages/gitolite/gitolite.spec diff -u packages/gitolite/gitolite.spec:1.14 packages/gitolite/gitolite.spec:1.15 --- packages/gitolite/gitolite.spec:1.14 Thu Dec 2 15:47:52 2010 +++ packages/gitolite/gitolite.spec Sun Feb 13 13:56:01 2011 @@ -1,30 +1,33 @@ # $Revision$, $Date$ # TODO: # - how is it excpected to cooperate with git-daemon? +# - add dedicated system user %include /usr/lib/rpm/macros.perl Summary: Software for hosting git repositories Summary(pl.UTF-8): Narzędzie do hostowania repozytoriów git Name: gitolite -Version: 1.5.7 -Release: 2 +Version: 1.5.8 +Release: 1 License: GPL v2 Group: Development/Tools Source0: http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 4a7604902b35ad246b95fc8c99d59b8c +# Source0-md5: 2494d8fc5632b7f209ebc7082466a30a # Use the following script to update Patch0: -# for I in $(ack 'require gitolite' gitolite-1.5.7/ | cut -d: -f1 | sort | uniq ); do mv $I $I.old; sed < $I.old > $I '/require gitolite/iuse lib "/usr/share/gitolite/lib";'; done -# for I in $(ack 'require gitolite' gitolite-1.5.7/ | cut -d: -f1 | sort | uniq | grep -v old); do diff -u $I.old $I; done +# for I in $(ack 'require gitolite' gitolite-1.5.8/ | cut -d: -f1 | sort | uniq ); do mv $I $I.old; sed < $I.old > $I '/require gitolite/iuse lib "/usr/share/gitolite/lib";'; done +# for I in $(ack 'require gitolite' gitolite-1.5.8/ | cut -d: -f1 | sort | uniq | grep -v old); do diff -u $I.old $I; done Patch0: lib.patch URL: http://github.com/sitaramc/gitolite +BuildRequires: perl-Text-Markdown BuildRequires: rpm-perlprov BuildRequires: rpmbuild(macros) >= 1.219 BuildRequires: sed >= 4.0 Requires: git-core +Requires: openssh-clients BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoprov ^perl(gitolite)$ -%define _noautoreq ^perl(gitolite)$ +%define _noautoprov perl(gitolite) +%define _noautoreq perl(gitolite) %description Gitolite allows a server to host many git repositories and provide @@ -37,16 +40,31 @@ (push) a repository. It can also restrict who can push to what branch or tag, which is very important in a corporate environment. Gitolite can be installed without requiring root permissions, and with no -additional software than git itself and perl. It also has several -other neat features described below and elsewhere in the doc/ -directory. +additional software than git itself and Perl. + +%package doc +Summary: Manual for Gitolite +Summary(fr.UTF-8): Documentation pour Gitolite +Summary(it.UTF-8): Documentazione di Gitolite +Summary(pl.UTF-8): Podręcznik dla Gitolite +Group: Documentation + +%description doc +Documentation for Gitolite. + +%description doc -l fr.UTF-8 +Documentation pour Gitolite. + +%description doc -l it.UTF-8 +Documentazione di Gitolite. + +%description doc -l pl.UTF-8 +Dokumentacja do Gitolite. %prep %setup -qc - mv sitaramc-gitolite-*/* . rm -rf sitaramc-gitolite-* - %patch0 -p1 rm src/gl-system-install @@ -55,18 +73,23 @@ sed -i 's,^# $GL_PACKAGE_CONF =.*,$GL_PACKAGE_CONF = "%{_sysconfdir}/gitolite";,g' conf/example.gitolite.rc sed -i 's,^# $GL_PACKAGE_HOOKS =.*,$GL_PACKAGE_HOOKS = "%{_datadir}/gitolite/hooks";,g' conf/example.gitolite.rc -# Some ugly hacks. Life without ugly hacks would be so borring. +# Some ugly hacks. Life without ugly hacks would be so booring. sed -i 's,^GL_PACKAGE_CONF=.*,GL_PACKAGE_CONF=%{_sysconfdir}/gitolite,g' src/gl-setup sed -i '2a\GL_ADMIN=$HOME/.gitolite\nGL_BINDIR=%{_bindir}\n' hooks/gitolite-admin/post-update %build +# Format documentation +for F in doc/*.mkd; do + perl -MText::Markdown > $(echo $F | sed s/.mkd/.html/) < $F \ + -e 'print Text::Markdown::markdown (join "", <>)' +done %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/gitolite,%{_datadir}/gitolite/{hooks,lib}} cp -a src/gl-* src/sshkeys-lint $RPM_BUILD_ROOT%{_bindir} -cp src/gitolite.pm $RPM_BUILD_ROOT%{_datadir}/gitolite/lib -cp -a conf/example.gitolite.rc $RPM_BUILD_ROOT%{_sysconfdir}/gitolite +cp -p src/gitolite.pm $RPM_BUILD_ROOT%{_datadir}/gitolite/lib +cp -p conf/example.gitolite.rc $RPM_BUILD_ROOT%{_sysconfdir}/gitolite cp -a hooks/* $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks rm -rf $RPM_BUILD_ROOT%{py_sitescriptdir}/gitosis/test @@ -76,22 +99,25 @@ %files %defattr(644,root,root,755) -%doc README.mkd doc conf/example.conf - +%doc README.mkd conf/example.conf %dir %{_sysconfdir}/gitolite %dir %{_sysconfdir}/gitolite %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitolite/example.gitolite.rc +%attr(755,root,root) %{_bindir}/gl-* +%attr(755,root,root) %{_bindir}/sshkeys-lint %dir %{_datadir}/gitolite %{_datadir}/gitolite/lib %dir %{_datadir}/gitolite/hooks %dir %{_datadir}/gitolite/hooks/common %dir %{_datadir}/gitolite/hooks/gitolite-admin %attr(755,root,root) %{_datadir}/gitolite/hooks/common/gitolite-hooked +%attr(755,root,root) %{_datadir}/gitolite/hooks/common/post-receive.mirrorpush %attr(755,root,root) %{_datadir}/gitolite/hooks/common/update %attr(755,root,root) %{_datadir}/gitolite/hooks/gitolite-admin/post-update -%attr(755,root,root) %{_bindir}/gl-* -%attr(755,root,root) %{_bindir}/sshkeys-lint +%files doc +%defattr(644,root,root,755) +%doc doc/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -99,6 +125,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2011/02/13 12:56:01 glen +- up to 1.5.8, add html docs + Revision 1.14 2010/12/02 14:47:52 pawelz - script for upgrading lib.patch - rel 2 (because of fixed patch) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/gitolite.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
