Accepting request 718222 from devel:tools:scm

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

git.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 24 09:17:31 UTC 2019 - matthias.gerstner@suse.com
+
+- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
+  firewalld, see [1].
+
+  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
 -------------------------------------------------------------------
 Mon Jul 15 12:02:09 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 

git.spec

@@ -12,12 +12,11 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
 %define gitexecdir %{_libexecdir}/git
-%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 %if 0%{?suse_version} >= 1210
 %bcond_without git_gnome_keyring
 %else
@@ -41,7 +40,6 @@ Source1:        apache2-gitweb.conf
 Source2:        sysconfig.git-daemon
 Source3:        git-daemon.service
 Source5:        usr.share.git-web.gitweb.cgi
-Source6:        susefirewall-git-daemon
 Source7:        https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.sign
 Source8:        %{name}.keyring
 Source9:        %{name}-gui.desktop
@@ -351,8 +349,6 @@ ln -s %{_sbindir}/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
-mkdir -p %{buildroot}/%{_fwdefdir}
-install -m 644 %{SOURCE6} %{buildroot}/%{_fwdefdir}/git-daemon
 ###
 ./.make -C contrib/subtree install
 %{!?_without_docs: ./.make -C contrib/subtree install-doc}
@@ -483,7 +479,6 @@ fi
 %dir /srv/git
 %{_fillupdir}/sysconfig.git-daemon
 %{!?_without_docs: %{_mandir}/man1/git-daemon.1*}
-%config %{_fwdefdir}/*
 
 %files -n gitk
 %{_bindir}/gitk

susefirewall-git-daemon

@@ -1,4 +0,0 @@
-## Name: git-daemon
-## Description: Open ports for git-daemon
-
-TCP="git"