Accepting request 584489 from devel:tools:scm

- Drop superfluous xinetd snippet, no longer used (bsc#1084460) (forwarded request 584446 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/584489
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=216

git.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Mar  8 12:58:20 CET 2018 - tiwai@suse.de
+
+- Drop superfluous xinetd snippet, no longer used (bsc#1084460)
+
+-------------------------------------------------------------------
+Tue Mar  6 08:50:12 CET 2018 - tiwai@suse.de
+
+- Build with asciidoctor for the recent distros (bsc#1075764)
+
 -------------------------------------------------------------------
 Mon Feb 26 23:38:08 UTC 2018 - schwab@linux-m68k.org
 

git.spec

@@ -38,7 +38,7 @@ Name:           git
 Version:        2.16.2
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Development/Tools/Version Control
 Url:            http://git-scm.com
 
@@ -47,7 +47,6 @@ Source7:        https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.t
 Source1:        apache2-gitweb.conf
 Source2:        sysconfig.git-daemon
 Source3:        git-daemon.service
-Source4:        git.xinetd
 Source5:        usr.share.git-web.gitweb.cgi
 Source6:        susefirewall-git-daemon
 Source8:        %name.keyring
@@ -65,8 +64,12 @@ Patch7:         git-zsh-completion-fixes.diff
 Patch8:         git-asciidoc.patch
 BuildRequires:  apache2
 %if %{with docs}
+%if 0%{?suse_version} > 1320
+BuildRequires:  rubygem(asciidoctor)
+%else
 BuildRequires:  asciidoc
 %endif
+%endif
 BuildRequires:  curl
 BuildRequires:  fdupes
 BuildRequires:  gpg2
@@ -298,6 +301,9 @@ make %{_smp_mflags} CFLAGS="%{optflags}" \
        NO_INSTALL_HARDLINKS=1 \
 %if 0%{?suse_version} > 1320
        DC_SHA1_EXTERNAL=YesPlease \
+%if %{with docs}
+       USE_ASCIIDOCTOR=YesPlease \
+%endif
 %endif
        PYTHON_PATH=%{_bindir}/python3 \
        USE_LIBPCRE2=YesPlease \
@@ -336,8 +342,6 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcgit-daemon
 install -d -m 755 %{buildroot}%{_fillupdir}
 install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.git-daemon
 install -d -m 755 %{buildroot}/srv/git
-install -d -m 755 %{buildroot}/etc/xinetd.d
-install -m 644 %{S:4} %{buildroot}/etc/xinetd.d/git
 mkdir -p %{buildroot}/%{_fwdefdir}
 install -m 644 %{S:6} %{buildroot}/%{_fwdefdir}/git-daemon
 ###
@@ -474,7 +478,6 @@ fi
 %dir /srv/git
 %{_fillupdir}/sysconfig.git-daemon
 %{!?_without_docs: %{_mandir}/man1/git-daemon.1*}
-%config(noreplace) /etc/xinetd.d/git
 %config %{_fwdefdir}/*
 
 %files -n gitk

git.xinetd

@@ -1,16 +0,0 @@
-# default: off
-# description: The git server offers access to git repositories
-service git
-{
-        disable         = yes
-        socket_type     = stream
-        protocol        = tcp
-        wait            = no
-        user            = git-daemon
-        group           = nogroup
-        server          = /usr/bin/git
-        server_args     = daemon --syslog --inetd --base-path=/srv/git
-        type            = UNLISTED
-        port            = 9418
-        log_on_failure  += USERID
-}