[git/f21] Rename git.service into git at .service and bump release
Pierre-YvesChibon
pingou at fedoraproject.org
Sat Oct 25 06:10:47 UTC 2014
commit b8d9224e0350964a64067f8760ad0dc12fa211db
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Fri Oct 24 13:14:45 2014 +0200
Rename git.service into git at .service and bump release
Conflicts:
git.spec
git.service | 9 ---------
git.spec | 16 ++++++++++------
git at .service | 8 ++++++++
3 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/git.spec b/git.spec
index 4a3e5c9..cd82651 100644
--- a/git.spec
+++ b/git.spec
@@ -44,7 +44,7 @@
Name: git
Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fast Version Control System
License: GPLv2
Group: Development/Tools
@@ -57,7 +57,7 @@ Source5: git-gui.desktop
Source6: gitweb.conf.in
Source10: http://www.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.gz
Source11: http://www.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.gz
-Source12: git.service
+Source12: git at .service
Source13: git.socket
Patch0: git-1.8-gitweb-home-link.patch
# https://bugzilla.redhat.com/490602
@@ -511,13 +511,13 @@ rm -rf %{buildroot}
%if %{use_systemd}
%post daemon
-%systemd_post git.service
+%systemd_post git at .service
%preun daemon
-%systemd_preun git.service
+%systemd_preun git at .service
%postun daemon
-%systemd_postun_with_restart git.service
+%systemd_postun_with_restart git at .service
%endif
%files -f bin-man-doc-files
@@ -610,7 +610,7 @@ rm -rf %{buildroot}
%doc Documentation/*daemon*.txt
%if %{use_systemd}
%{_unitdir}/git.socket
-%{_unitdir}/git.service
+%{_unitdir}/git at .service
%else
%config(noreplace)%{_sysconfdir}/xinetd.d/git
%endif
@@ -631,6 +631,10 @@ rm -rf %{buildroot}
# No files for you!
%changelog
+* Sat Oct 25 2014 Pierre-Yves Chibon <pingou at pingoured.fr> - 2.1.0-2
+- Rename the git.service into git at .service fixing
+ https://bugzilla.redhat.com/980574
+
* Mon Aug 18 2014 Ondrej Oprala <ooprala at redhat.com - 2.1.0-1
- 2.1.0
diff --git a/git at .service b/git at .service
new file mode 100644
index 0000000..185ff25
--- /dev/null
+++ b/git at .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
More information about the scm-commits
mailing list