[packages/gitolite3] Updated for gitolite3
jajcus
jajcus at pld-linux.org
Thu Sep 12 10:14:03 CEST 2013
commit fe36b7303e9e77efa95608e244f0917361158d4b
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Thu Sep 12 10:12:06 2013 +0200
Updated for gitolite3
Not much of the original gitolite.spec left.
No attempt to provide 'default config' or something – gitolite
is intended to be manually set-up on a dedicated user account.
gitolite3-README.patch | 23 +++++++
gitolite3.spec | 172 +++++++++++++------------------------------------
2 files changed, 66 insertions(+), 129 deletions(-)
---
diff --git a/gitolite3.spec b/gitolite3.spec
index 8757a37..8992c86 100644
--- a/gitolite3.spec
+++ b/gitolite3.spec
@@ -11,13 +11,14 @@ License: GPL v2
Group: Development/Tools
Source0: http://github.com/sitaramc/gitolite/tarball/v%{version}/gitolite-%{version}.tar.gz
# Source0-md5: fe962443eab63cb7e4735c021950d895
+Patch0: %{name}-README.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-server
+Requires: git-core >= 1.6.6
+Requires: openssh-server >= 5.0
+Conflicts: gitolite
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -34,6 +35,9 @@ 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.
+Gitolite 3.x is a total rewrite of Gitolite 2.x, see the online
+documentation for upgrade instructions.
+
%description -l pl.UTF-8
Gitolite pozwala na hostowanie wielu repozytoriów git na jednym
serwerze i udostępnianie ich wielu deweloperom bez potrzeby nadawania
@@ -48,149 +52,59 @@ może być bardzo ważne w środowisku korporacyjnym. Gitolite może być
zainstalowany bez dostępu do konta roota i bez dodatkowego
oprogramowania poza samym gitem i Perlem.
-%package contrib
-Summary: Miscellaneous scripts for gitolite
-Summary(pl.UTF-8): Różne skrypty dla gitolite
-Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
-
-%description contrib
-Miscellaneous scripts for gitolite.
-
-%description contrib -l pl.UTF-8
-Różne skrypty dla gitolite.
-
-%package doc
-Summary: Manual for Gitolite
-Summary(fr.UTF-8): Documentation pour Gitolite
-Summary(it.UTF-8): Documentazione di Gitolite
-Summary(pl.UTF-8): Dokumentacja do 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.
+Gitolite 3.x to kod Gitolite napisany od nowa, dokumentacja online
+wyjaśnia proces aktualizacji.
%prep
%setup -qc
mv sitaramc-gitolite-*/* .
%{__rm} -r sitaramc-gitolite-*
-%{__rm} src/gl-system-install
-
-echo v%{version} > conf/VERSION
-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
+%patch0 -p1
-# 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
+echo "v%{version}" > src/VERSION # add '-pld' suffix or something if patched
%build
-# Copy documentation from contrib
-find contrib -name \*.mkd -exec cp '{}' doc \;
-# Format documentation
-for F in doc/*.mkd; do
- %{__perl} -MText::Markdown > $(echo $F | sed s/.mkd/.html/) < $F \
- -e '$text=join("",<>); $text=~s#(\[\w+\]: )http://sitaramc.github.com/gitolite/doc/#$1#g;
- print Text::Markdown::markdown ($text);'
-done
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/gitolite,%{_datadir}/gitolite/{hooks,contrib},%{perl_vendorlib}}
-cp -a src/gl-* src/sshkeys-lint $RPM_BUILD_ROOT%{_bindir}
-cp -p src/*.pm $RPM_BUILD_ROOT%{perl_vendorlib}
-cp -p conf/{example.gitolite.rc,VERSION} $RPM_BUILD_ROOT%{_sysconfdir}/gitolite
-cp -a hooks/* $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks
-cp -a contrib/* $RPM_BUILD_ROOT%{_datadir}/gitolite/contrib
-find $RPM_BUILD_ROOT%{_datadir}/gitolite/contrib -name \*.mkd | xargs rm
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir},%{perl_vendorlib}}
+
+install check-g2-compat convert-gitosis-conf $RPM_BUILD_ROOT%{_bindir}
+
+cp -a src $RPM_BUILD_ROOT%{_datadir}/gitolite
+mv $RPM_BUILD_ROOT%{_datadir}/gitolite/lib/* $RPM_BUILD_ROOT%{perl_vendorlib}
+rmdir $RPM_BUILD_ROOT%{_datadir}/gitolite/lib
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks/common/{gl-pre-git.hub-sample,post-receive.mirrorpush}
+ln -sf %{_datadir}/gitolite/gitolite $RPM_BUILD_ROOT%{_bindir}
+ln -sf %{_datadir}/gitolite/gitolite-shell $RPM_BUILD_ROOT%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README.mkd doc/CHANGELOG conf/example.conf hooks/common/{gl-pre-git.hub-sample,post-receive.mirrorpush}
-
-%dir %{_sysconfdir}/gitolite
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitolite/example.gitolite.rc
-%{_sysconfdir}/gitolite/VERSION
-%attr(755,root,root) %{_bindir}/gl-*
-%attr(755,root,root) %{_bindir}/sshkeys-lint
+%doc CHANGELOG CONTRIBUTING README.txt
+%attr(755,root,root) %{_bindir}/gitolite
+%attr(755,root,root) %{_bindir}/gitolite-shell
+%attr(755,root,root) %{_bindir}/check-g2-compat
+%attr(755,root,root) %{_bindir}/convert-gitosis-conf
%dir %{_datadir}/gitolite
-%{perl_vendorlib}/gitolite*.pm
-%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/update
-%attr(755,root,root) %{_datadir}/gitolite/hooks/gitolite-admin/post-update
-
-%files contrib
-%defattr(644,root,root,755)
-%dir %{_datadir}/gitolite/contrib
-%dir %{_datadir}/gitolite/contrib/adc
-%dir %{_datadir}/gitolite/contrib/partial-copy
-%dir %{_datadir}/gitolite/contrib/real-users
-%dir %{_datadir}/gitolite/contrib/VREF
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/able
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/delete-branch
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/fork
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/get-rights-and-owner.in-perl
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/git
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/git-annex-shell
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/gl-reflog
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/help
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/hub
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/list-trash
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/lock
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/perms
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/restore
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/restrict-admin
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/rm
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/rmrepo
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/rsync
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/sskm
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/sudo
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/su-expand
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/su-getperms
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/symbolic-ref
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/trash
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/unlock
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/watch
-%attr(755,root,root) %{_datadir}/gitolite/contrib/adc/who-pushed
-%attr(755,root,root) %{_datadir}/gitolite/contrib/mirrorconf-helper.sh
-%attr(755,root,root) %{_datadir}/gitolite/contrib/partial-copy/gl-pre-git
-%attr(755,root,root) %{_datadir}/gitolite/contrib/partial-copy/t.sh
-%attr(755,root,root) %{_datadir}/gitolite/contrib/partial-copy/update.secondary
-%attr(755,root,root) %{_datadir}/gitolite/contrib/real-users/gl-shell
-%attr(755,root,root) %{_datadir}/gitolite/contrib/real-users/gl-shell-setup
-%attr(755,root,root) %{_datadir}/gitolite/contrib/VREF/gl-VREF-COUNT
-%attr(755,root,root) %{_datadir}/gitolite/contrib/VREF/gl-VREF-DUPKEYS
-%attr(755,root,root) %{_datadir}/gitolite/contrib/VREF/gl-VREF-EMAIL_CHECK
-%attr(755,root,root) %{_datadir}/gitolite/contrib/VREF/gl-VREF-FILETYPE
-%{_datadir}/gitolite/contrib/VREF/gl-VREF-MERGE_CHECK
-%{_datadir}/gitolite/contrib/adc/adc.common-functions
-%{_datadir}/gitolite/contrib/adc/getdesc
-%{_datadir}/gitolite/contrib/adc/htpasswd
-%{_datadir}/gitolite/contrib/adc/pygitolite.py
-%{_datadir}/gitolite/contrib/adc/s3backup
-%{_datadir}/gitolite/contrib/adc/setdesc
-%{_datadir}/gitolite/contrib/adc/su-setperms
-%{_datadir}/gitolite/contrib/adc/svnserve
-%{_datadir}/gitolite/contrib/gitweb
-%{_datadir}/gitolite/contrib/ldap
-
-%files doc
-%defattr(644,root,root,755)
-%doc doc/*.html
+%attr(755,root,root) %{_datadir}/gitolite/gitolite
+%attr(755,root,root) %{_datadir}/gitolite/gitolite-shell
+%{_datadir}/gitolite/VERSION
+%dir %{_datadir}/gitolite/VREF
+%attr(755,root,root) %{_datadir}/gitolite/VREF/*
+%dir %{_datadir}/gitolite/commands
+%attr(755,root,root) %{_datadir}/gitolite/commands/*
+%dir %{_datadir}/gitolite/syntactic-sugar
+%{_datadir}/gitolite/syntactic-sugar/*
+%dir %{_datadir}/gitolite/triggers
+%attr(755,root,root) %{_datadir}/gitolite/triggers/bg
+%attr(755,root,root) %{_datadir}/gitolite/triggers/partial-copy
+%attr(755,root,root) %{_datadir}/gitolite/triggers/renice
+%attr(755,root,root) %{_datadir}/gitolite/triggers/set-default-roles
+%attr(755,root,root) %{_datadir}/gitolite/triggers/upstream
+%dir %{_datadir}/gitolite/triggers/post-compile
+%attr(755,root,root) %{_datadir}/gitolite/triggers/post-compile/*
+%{perl_vendorlib}/Gitolite
diff --git a/gitolite3-README.patch b/gitolite3-README.patch
new file mode 100644
index 0000000..0444781
--- /dev/null
+++ b/gitolite3-README.patch
@@ -0,0 +1,23 @@
+diff -dur gitolite3-3.5.2.orig/README.txt gitolite3-3.5.2/README.txt
+--- gitolite3-3.5.2.orig/README.txt 2013-07-10 08:17:36.000000000 +0200
++++ gitolite3-3.5.2/README.txt 2013-09-12 10:04:36.000000000 +0200
+@@ -71,18 +71,10 @@
+ * make sure your ssh public key from your workstation is available at
+ $HOME/YourName.pub
+
+- * run the following commands:
++ * run the following command:
+
+- git clone git://github.com/sitaramc/gitolite
+- mkdir -p $HOME/bin
+- gitolite/install -to $HOME/bin
+ gitolite setup -pk YourName.pub
+
+- If the last command doesn't run perhaps 'bin' in not in your 'PATH'.
+- You can either add it, or just run:
+-
+- $HOME/bin/gitolite setup -pk YourName.pub
+-
+
+ ADDING USERS AND REPOS
+ ----------------------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitolite3.git/commitdiff/fe36b7303e9e77efa95608e244f0917361158d4b
More information about the pld-cvs-commit
mailing list