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

Accepting request 1060504 from home:npower:branches:network:samba:STABLE

Browse Source 
- libdsdb-module-samba4 should be packaged as part of samba-libs and
  not samba-ad-dc-libs. Additionally no need for it to be
  removed conditionally.

- Clean up logic for PAM migration settings in spec file.

OBS-URL: https://build.opensuse.org/request/show/1060504
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=676
This commit is contained in:
Paulo Alcantara 2023-01-23 18:37:29 +00:00 committed by Git OBS Bridge
parent 8f416c0e61
commit 48abfeb6df
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
samba-4.17.4+git.303.89e23854eb7.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1b46368d7558c16ba4ccfc461fb684bbac84beac53b4fa26f5ff1d8a3b107d4
size 34354436

3
samba-4.17.4+git.314.7b07e3c51a6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a0f8130d4281a36a17fbc0bd43ffe89d2bab7febffae9984469a0a2194f1c3c
size 34359415

12
samba.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Jan 23 09:24:07 UTC 2023 - Noel Power <nopower@suse.com>
- libdsdb-module-samba4 should be packaged as part of samba-libs and
not samba-ad-dc-libs. Additionally no need for it to be
removed conditionally.
-------------------------------------------------------------------
Thu Jan 12 15:24:55 UTC 2023 - Noel Power <nopower@suse.com>
- Clean up logic for PAM migration settings in spec file.
-------------------------------------------------------------------
Wed Jan 4 14:05:15 UTC 2023 - Stefan Schubert <schubi@suse.com>

26
samba.spec
View File

@ -24,8 +24,10 @@
%{!?_pam_moduledir:%global _pam_moduledir /%{_lib}/security}
%if 0%{?suse_version} > 1500
%{!?_pam_vendordir:%global _pam_vendordir %{_prefix}/lib/pam.d}
%global samba_pamdir %_pam_vendordir
%else
%{!?_pam_confdir:%global _pam_confdir %{_sysconfdir}/pam.d}
%global samba_pamdir %_pam_confdir
%endif
%{!?_pam_secconfdir:%global _pam_secconfdir %{_sysconfdir}/security}
@ -157,7 +159,7 @@ BuildRequires: liburing-devel
%endif
BuildRequires: sysuser-tools
Version: 4.17.4+git.303.89e23854eb7
Version: 4.17.4+git.314.7b07e3c51a6
Release: 0
URL: https://www.samba.org/
Obsoletes: samba-32bit < %{version}
@ -716,13 +718,8 @@ popd
%install
%if 0%{?suse_version} > 1500
install -d -m 0755 -p \
%{buildroot}/%_pam_vendordir
%else
install -d -m 0755 -p \
%{buildroot}/%_pam_confdir
%endif
%{buildroot}/%samba_pamdir
install -d -m 0755 -p \
%{buildroot}/%{_sysconfdir}/{xinetd.d,logrotate.d} \
@ -760,8 +757,7 @@ make %{?_smp_mflags} install \
rm \
%{buildroot}/%{_mandir}/man8/samba.8* \
%{buildroot}/%{_mandir}/man8/samba_downgrade_db.8* \
%{buildroot}/%{_unitdir}/samba-ad-dc.service \
%{buildroot}/%{_libdir}/samba/libdsdb-module-samba4.so
%{buildroot}/%{_unitdir}/samba-ad-dc.service
%endif
# CTDB
@ -837,11 +833,7 @@ install -m 0755 tools/update-apparmor-samba-profile \
# PDF generator
install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf
install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
%if 0%{?suse_version} > 1500
install -m 0644 config/samba.pamd-common %{buildroot}/%_pam_vendordir/samba
%else
install -m 0644 config/samba.pamd-common %{buildroot}/%_pam_confdir/samba
%endif
install -m 0644 config/samba.pamd-common %{buildroot}/%samba_pamdir/samba
install -m 0644 config/dhcp.conf %{buildroot}/%{_fillupdir}/samba-client-dhcp.conf
install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_fillupdir}/sysconfig.dhcp-samba-client
@ -1134,9 +1126,9 @@ exit 0
%ghost %{CONFIGDIR}/smbpasswd
%config(noreplace) %{CONFIGDIR}/smbusers
%if 0%{?suse_version} > 1500
%_pam_vendordir/samba
%samba_pamdir/samba
%else
%config %_pam_confdir/samba
%config %samba_pamdir/samba
%endif
%{_sysconfdir}/slp.reg.d
%dir %{_libdir}/samba
@ -1527,6 +1519,7 @@ exit 0
%{_libdir}/samba/libREG-FULL-samba4.so
%{_libdir}/samba/libRPC-SERVER-LOOP-samba4.so
%{_libdir}/samba/libRPC-WORKER-samba4.so
%{_libdir}/samba/libdsdb-module-samba4.so
%if ! %{with_mitkrb5}
%{_libdir}/samba/libasn1-samba4.so
%{_libdir}/samba/libcom-err-samba4.so
@ -1865,7 +1858,6 @@ exit 0
%files ad-dc-libs
%defattr(-,root,root)
%{_libdir}/samba/libdb-glue-samba4.so
%{_libdir}/samba/libdsdb-module-samba4.so
%{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so
%{_libdir}/samba/libscavenge-dns-records-samba4.so
%{_libdir}/samba/libprocess-model-samba4.so