diff --git a/SOURCES/git.service b/SOURCES/git.service deleted file mode 100644 index 07cbe6e..0000000 --- a/SOURCES/git.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Git Repositories Server Daemon -Documentation=man:git-daemon(1) -Wants=git.socket - -[Service] -User=nobody -ExecStart=/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose -StandardInput=socket diff --git a/SOURCES/git@.service b/SOURCES/git@.service new file mode 100644 index 0000000..185ff25 --- /dev/null +++ b/SOURCES/git@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Git Repositories Server Daemon +Documentation=man:git-daemon(1) + +[Service] +User=nobody +ExecStart=-/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose +StandardInput=socket diff --git a/SPECS/git.spec b/SPECS/git.spec index d075b1a..2300f11 100644 --- a/SPECS/git.spec +++ b/SPECS/git.spec @@ -51,7 +51,7 @@ Name: git Version: 1.8.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -64,7 +64,7 @@ Source5: git-gui.desktop Source6: gitweb.conf.in Source10: http://git-core.googlecode.com/files/%{name}-manpages-%{version}.tar.gz Source11: http://git-core.googlecode.com/files/%{name}-htmldocs-%{version}.tar.gz -Source12: git.service +Source12: git@.service Source13: git.socket Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 @@ -523,13 +523,13 @@ rm -rf %{buildroot} %if %{use_systemd} %post daemon -%systemd_post git.service +%systemd_post git@.service %preun daemon -%systemd_preun git.service +%systemd_preun git@.service %postun daemon -%systemd_postun_with_restart git.service +%systemd_postun_with_restart git@.service %endif %files -f bin-man-doc-files @@ -622,7 +622,7 @@ rm -rf %{buildroot} %doc Documentation/*daemon*.txt %if %{use_systemd} %{_unitdir}/git.socket -%{_unitdir}/git.service +%{_unitdir}/git@.service %else %config(noreplace)%{_sysconfdir}/xinetd.d/git %endif @@ -643,6 +643,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jun 19 2015 Petr Stodulka - 1.8.3.1-5 +- Rename the git.service into git@.service + Resolves #1135071 + * Fri Jan 24 2014 Daniel Mach - 1.8.3.1-4 - Mass rebuild 2014-01-24