- git-daemon was moved away from PATH in 1.6.0

Changed files:
    git-core.inet -> 1.2
    git-core.init -> 1.3
    git-core.spec -> 1.140

diff --git a/git-core.inet b/git-core.inet
index 29625fe5f7e305d6ce7dddf7bd5cba7559d3b4bb..bf18bd98580a652e393e9b27f1cd002b4102b320 100644 (file)
--- a/git-core.inet
+++ b/git-core.inet
@@ -5,5 +5,5 @@ PORT=9418
 FLAGS=nowait
 USER=root
 SERVER=tcpd
-DAEMON=/usr/bin/git-daemon
+DAEMON=@libdir@/git/git-daemon
 DAEMONARGS="--inetd --syslog --base-path=/var/lib/git"

diff --git a/git-core.init b/git-core.init
index cfd659440a40c2a913d672c6ab4881ecfe857989..59d803d5edda4daf494e523757b44b0a958c32a4 100644 (file)
--- a/git-core.init
+++ b/git-core.init
@@ -33,7 +33,7 @@ start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/git-daemon ]; then
                msg_starting git-daemon
-               daemon --fork git-daemon $DAEMON_OPTS
+               daemon --fork @libdir@/git/git-daemon $DAEMON_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/git-daemon
        else

diff --git a/git-core.spec b/git-core.spec
index 7c81c3767a59186df893f696c2d75ab9620a7c94..877a137edad7fa961508caaf095f7ffa49a46acd 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -334,6 +334,10 @@ install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/git-daemon
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon
 
+# paths cleanup
+sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon 
+sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
+
 # remove unneeded files
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist