Hello community, here is the log from the commit of package git checked in at Mon Oct 6 17:51:19 CEST 2008. -------- --- git/git.changes 2008-09-26 17:17:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/git/git.changes 2008-10-06 15:55:29.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 6 15:53:47 CEST 2008 - tiwai@suse.de + +- fix git-daemon init script to start (bnc#432610) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.F22560/_old 2008-10-06 17:50:52.000000000 +0200 +++ /var/tmp/diff_new_pack.F22560/_new 2008-10-06 17:50:52.000000000 +0200 @@ -20,7 +20,7 @@ Name: git BuildRequires: asciidoc curl-devel fdupes libopenssl-devel sgml-skel xmlto Version: 1.6.0.2 -Release: 2 +Release: 3 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later Group: Development/Tools/Version Control @@ -146,7 +146,6 @@ Summary: Simple Server for Git Repositories Group: Development/Tools/Version Control Requires: git-core = %{version} -Provides: git-core:/usr/bin/git-daemon PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq %description daemon @@ -377,6 +376,8 @@ /etc/bash_completion.d/git.sh %changelog +* Mon Oct 06 2008 tiwai@suse.de +- fix git-daemon init script to start (bnc#432610) * Fri Sep 26 2008 schwab@suse.de - Fix manual pages. * Thu Sep 25 2008 tiwai@suse.de ++++++ git-daemon.init ++++++ --- git/git-daemon.init 2008-06-16 15:44:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/git/git-daemon.init 2008-10-06 15:53:26.000000000 +0200 @@ -32,11 +32,24 @@ # Description: server for git repositories ### END INIT INFO -git_daemon=/usr/bin/git-daemon -test -x $git_daemon || { echo "$git_daemon not installed"; +git=/usr/bin/git +test -x $git|| { echo "GIT not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } +if test -x /usr/lib64/git/git-daemon; then + git_daemon=/usr/lib64/git/git-daemon +elif test -x /usr/lib/git/git-daemon; then + git_daemon=/usr/lib/git/git-daemon +else + echo "git-daemon not installed" + if [ "$1" = "stop" ]; then + exit 0 + else + exit 5 + fi +fi + # Check for existence of needed config file and read it git_daemon_config=/etc/sysconfig/git-daemon test -r $git_daemon_config || { echo "$git_daemon_config not existing"; @@ -56,7 +69,7 @@ case "$1" in start) echo -n "Starting git-daemon " - /sbin/start_daemon "$git_daemon" \ + /sbin/start_daemon $git daemon \ --syslog \ --detach \ --reuseaddr \ @@ -70,7 +83,7 @@ ;; stop) echo -n "Shutting down git-daemon " - /sbin/killproc -TERM $git_daemon + /sbin/killproc -p /var/run/git-daemon.pid $git_daemon -TERM rc_status -v ;; try-restart|condrestart) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org