rpm/git
SHA256
1
0
Fork 0
forked from pool/git
Code Pull Requests Activity

Accepting request 162393 from devel:tools:scm

Browse Source 
- Add missing $HOME for git-daemon script that may result in a
  fatal error at start (bnc#812893) (forwarded request 162392 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/162393
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=107
This commit is contained in:
Stephan Kulow 2013-04-05 11:22:52 +00:00 committed by Git OBS Bridge
parent 21fc25c24c
commit 7c0d2207a4
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-daemon.init
View File

@ -69,6 +69,7 @@ rc_reset
case "$1" in case "$1" in
start) start)
echo -n "Starting git-daemon " echo -n "Starting git-daemon "
export HOME="$GIT_DAEMON_BASE_PATH"
/sbin/startproc -p $pidfile $git_daemon \ /sbin/startproc -p $pidfile $git_daemon \
--syslog \ --syslog \
--detach \ --detach \

12
git.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Apr 3 12:58:06 CEST 2013 - tiwai@suse.de
- Add missing $HOME for git-daemon script that may result in a
fatal error at start (bnc#812893)
-------------------------------------------------------------------
Thu Mar 28 13:10:15 UTC 2013 - jengelh@inai.de
- Enable PCRE and make it possible to use the
"grep.patternType=perl" config option
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 27 22:42:15 UTC 2013 - lchiquitto@suse.com Wed Mar 27 22:42:15 UTC 2013 - lchiquitto@suse.com

24
git.spec
View File

@ -20,22 +20,13 @@
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Name: git Name: git
BuildRequires: asciidoc
BuildRequires: curl
BuildRequires: fdupes
BuildRequires: libcurl-devel
BuildRequires: libexpat-devel
BuildRequires: libopenssl-devel
BuildRequires: perl-Error
BuildRequires: python
BuildRequires: sgml-skel
BuildRequires: xmlto
Version: 1.8.2 Version: 1.8.2
Release: 0 Release: 0
Summary: Fast, scalable, distributed revision control system Summary: Fast, scalable, distributed revision control system
License: GPL-2.0 License: GPL-2.0
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Url: http://git-scm.com Url: http://git-scm.com
Source0: http://git-core.googlecode.com/files/%name-%{version}.tar.gz Source0: http://git-core.googlecode.com/files/%name-%{version}.tar.gz
Source1: apache2-gitweb.conf Source1: apache2-gitweb.conf
Source2: sysconfig.git-daemon Source2: sysconfig.git-daemon
@ -50,6 +41,17 @@ Patch4: git-prevent_xss-default.diff
# fix broken bash copmletion with colored egrep (bnc#779536) # fix broken bash copmletion with colored egrep (bnc#779536)
Patch5: git-bash-completion-egrep-color-fix.diff Patch5: git-bash-completion-egrep-color-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asciidoc
BuildRequires: curl
BuildRequires: fdupes
BuildRequires: libcurl-devel
BuildRequires: libexpat-devel
BuildRequires: libopenssl-devel
BuildRequires: pcre-devel
BuildRequires: perl-Error
BuildRequires: python
BuildRequires: sgml-skel
BuildRequires: xmlto
Requires: git-core = %{version} Requires: git-core = %{version}
Recommends: git-svn git-cvs git-email gitk git-gui git-web Recommends: git-svn git-cvs git-email gitk git-gui git-web
Suggests: git-daemon Suggests: git-daemon
@ -133,6 +135,7 @@ PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq
A really simple TCP git daemon. In the default configuration it allows A really simple TCP git daemon. In the default configuration it allows
read only access to repositories in /srv/git/ that contain the read only access to repositories in /srv/git/ that contain the
'git-daemon-export-ok' file. 'git-daemon-export-ok' file.
%package -n gitk %package -n gitk
Summary: Git revision tree visualiser Summary: Git revision tree visualiser
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
@ -203,6 +206,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
DESTDIR=$RPM_BUILD_ROOT \ DESTDIR=$RPM_BUILD_ROOT \
NO_CROSS_DIRECTORY_HARDLINKS=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \
NO_INSTALL_HARDLINKS=1 \ NO_INSTALL_HARDLINKS=1 \
USE_LIBPCRE=1 \
V=1 \ V=1 \
prefix=%{_prefix} mandir=%{_mandir} \ prefix=%{_prefix} mandir=%{_mandir} \
gitexecdir=%{gitexecdir} \ gitexecdir=%{gitexecdir} \