pool/samba
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 823154 from home:kukuk:etc

Browse Source 
- Don't install SuSEfirewall2 services, we don't have that package
  anymore

OBS-URL: https://build.opensuse.org/request/show/823154
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=634
This commit is contained in:
David Disseldorp 2020-08-06 09:11:04 +00:00 committed by Git OBS Bridge
parent 6a8073e897
commit 0baf2f4a2e
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samba.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 28 13:25:09 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
- Don't install SuSEfirewall2 services, we don't have that package
anymore
-------------------------------------------------------------------
Thu Jul 2 15:18:42 UTC 2020 - Noel Power <nopower@suse.com>

8
samba.spec
View File

@ -1055,7 +1055,9 @@ install -d -m 0755 -p \
%{buildroot}/%{_sysconfdir}/{pam.d,xinetd.d,logrotate.d} \
%{buildroot}/%{_sysconfdir}/openldap/schema \
%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/{if-{down,up}.d,scripts} \
%if 0%{?suse_version} <= 1500
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services \
%endif
%{buildroot}/%{_sysconfdir}/security \
%{buildroot}/%{_sysconfdir}/slp.reg.d \
%{buildroot}/%{CONFIGDIR} \
@ -1219,6 +1221,7 @@ done
%if 0%{?suse_version} < 1221
touch %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/21-%{cifs_init_script}
%endif
%if 0%{?suse_version} <= 1500
# Install SuSEfirewall2 config files
install -m 0644 config/sysconfig.firewall.netbios-server \
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/netbios-server
@ -1228,6 +1231,7 @@ install -m 0644 config/sysconfig.firewall.samba-server \
install -m 0644 config/sysconfig.firewall.samba-client \
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client
%endif
%endif
# Add logrotate settings for nmbd and smbd only on systems newer than 8.1.
LOGROTATE_FILES="samba samba-winbind"
for file in ${LOGROTATE_FILES}; do
@ -1632,8 +1636,10 @@ exit 0
%config(noreplace) %{CONFIGDIR}/smbusers
%config %{_sysconfdir}/pam.d/samba
%{_sysconfdir}/slp.reg.d
%if 0%{?suse_version} <= 1500
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/netbios-server
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-server
%endif
%dir %{_libdir}/samba
%dir %{_libdir}/samba/vfs
%dir %{_libdir}/samba/ldb
@ -1687,7 +1693,7 @@ exit 0
%dir %{_sysconfdir}/openldap
%dir %{_sysconfdir}/openldap/schema
%attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema
%if 0%{?suse_version} > 1100
%if 0%{?suse_version} <= 1500 && 0%{?suse_version} > 1100
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client
%endif
%{_bindir}/cifsdd