Accepting request 718821 from home:mgerstner:branches:network
- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by firewalld, see [1]. [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html OBS-URL: https://build.opensuse.org/request/show/718821 OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=168
This commit is contained in:
committed by
Git OBS Bridge
parent
8e39f54150
commit
28f175add3
@@ -12,7 +12,7 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@ Url: https://syncthing.net/
|
||||
Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz
|
||||
Source1: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz.asc
|
||||
Source2: %{name}.keyring
|
||||
Source3: %{name}.firewall
|
||||
BuildRequires: go >= 1.8
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-rpm-macros
|
||||
@@ -51,8 +50,6 @@ joined to the syncthing relay pool or private.
|
||||
%prep
|
||||
%setup -q -n %{name}
|
||||
|
||||
cp -f %{SOURCE3} %{name}.firewall
|
||||
|
||||
%build
|
||||
export BUILD_USER=abuild
|
||||
export BUILD_HOST=openSUSE
|
||||
@@ -89,8 +86,6 @@ install -Dpm 0644 etc/linux-systemd/system/%{name}-resume.service \
|
||||
install -Dpm 0644 etc/linux-systemd/user/%{name}.service \
|
||||
%{buildroot}%{_userunitdir}/%{name}.service
|
||||
%endif
|
||||
install -Dpm 0644 %{name}.firewall \
|
||||
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
|
||||
|
||||
%pre
|
||||
%service_add_pre %{name}-resume.service
|
||||
@@ -132,7 +127,6 @@ getent passwd strelaysrv >/dev/null || \
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc AUTHORS CONDUCT.md CONTRIBUTING.md README.md
|
||||
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/stcli
|
||||
%{_unitdir}/%{name}@.service
|
||||
|
Reference in New Issue
Block a user