From bf7a9a54093d9a1ba90c2ed878e872f6ad7c61ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= Date: Tue, 14 Oct 2008 20:59:11 +0000 Subject: [PATCH] - 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 --- git-core.inet | 2 +- git-core.init | 2 +- git-core.spec | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/git-core.inet b/git-core.inet index 29625fe..bf18bd9 100644 --- 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 cfd6594..59d803d 100644 --- 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 7c81c37..877a137 100644 --- 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 -- 2.44.0