Accepting request 923005 from home:scabrero:branches:network:samba:STABLE

-  Adjust spec to use pam macros; (bsc#1191046).
- Adjust spec for size
  * allow some Recommends instead Requires to be configured
    for cifs-utils, samba-libs-python3 & samba-gpupdate;
    (bsc#1182847).
  * remove fam, undocumented and unneeded.

OBS-URL: https://build.opensuse.org/request/show/923005
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=650

samba-4.15.0+git.178.87c21e30fda.tar.bz2

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

samba-4.15.0+git.185.378416e547c.tar.bz2

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

samba.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Sep 30 15:57:14 UTC 2021 - Noel Power <nopower@suse.com>
+
+-  Adjust spec to use pam macros; (bsc#1191046).
+
+-------------------------------------------------------------------
+Wed Sep 29 08:58:28 UTC 2021 - Noel Power <nopower@suse.com>
+
+- Adjust spec for size
+  * allow some Recommends instead Requires to be configured
+    for cifs-utils, samba-libs-python3 & samba-gpupdate;
+    (bsc#1182847).
+  * remove fam, undocumented and unneeded.
+
 -------------------------------------------------------------------
 Thu Sep 23 11:41:44 UTC 2021 - Samuel Cabrero <scabrero@suse.de>
 

samba.spec

@@ -86,11 +86,6 @@ BuildRequires:  perl-Parse-Yapp
 %if 0%{?suse_version} > 1300
 BuildRequires:  libarchive-devel
 %endif
-%if 0%{?suse_version} > 1210
-BuildRequires:  gamin-devel
-%else
-BuildRequires:  fam-devel
-%endif
 BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
 %if 0%{?suse_version} > 1100
@@ -189,7 +184,7 @@ BuildRequires:  liburing-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        4.15.0+git.178.87c21e30fda
+Version:        4.15.0+git.185.378416e547c
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -273,7 +268,7 @@ Requires:       /sbin/chkconfig
 %endif
 Requires(post): /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
-Requires:       cifs-utils
+Recommends:       cifs-utils
 Requires:       coreutils
 
 %description client
@@ -323,10 +318,7 @@ Summary:        Samba libraries
 License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       krb5
-%if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1315
+Recommends:     samba-libs-python3 = %{version}
-Requires:       libfam0-gamin
-%endif
-Requires:       samba-libs-python3 = %{version}
 
 %description libs
 The samba-libs package contains the libraries needed by programs that
@@ -407,7 +399,8 @@ Requires(pre):  /usr/sbin/groupadd
 Requires:       coreutils
 Requires:       libtevent-util0 >= %{version}
 Requires:       samba-client >= %{version}
-Requires:       samba-gpupdate = %{version}
+Recommends:     samba-gpupdate = %{version}
+
 Requires(post): /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
@@ -992,7 +985,7 @@ CONFIGURE_OPTIONS="\
 	--enable-ceph-reclock \
 %endif
 	--with-pam \
-	--with-pammodulesdir=/%{_lib}/security \
+	--with-pammodulesdir=%_pam_moduledir\
 	--with-piddir=%{PIDDIR} \
 	--with-relro \
 %if 0%{?suse_version} > 1220
@@ -1015,6 +1008,7 @@ CONFIGURE_OPTIONS="\
 %endif
 %endif
 	--bundled-libraries=NONE,socket_wrapper,cmocka,${bundled_libraries_extra} \
+	--without-fam \
 "
 ./configure ${CONFIGURE_OPTIONS}
 make %{build_make_smp_mflags} \
@@ -1031,7 +1025,8 @@ popd
 
 %install
 install -d -m 0755 -p \
-	%{buildroot}/%{_sysconfdir}/{pam.d,xinetd.d,logrotate.d} \
+	%{buildroot}/%_pam_confdir \
+	%{buildroot}/%{_sysconfdir}/{xinetd.d,logrotate.d} \
 	%{buildroot}/%{_sysconfdir}/openldap/schema \
 	%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/{if-{down,up}.d,scripts} \
 %if 0%{?suse_version} <= 1500
@@ -1180,7 +1175,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
-install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba
+install -m 0644 config/samba.pamd-common %{buildroot}/%_pam_confdir/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
 for script in samba-winbindd; do
@@ -1229,7 +1224,7 @@ install -m 0644 docu/manpages.html ../../docs/htmldocs/manpages.html
 install -m 0644 ../../docs-xml/output/htmldocs/manpages/* ../../docs/htmldocs/
 popd
 # winbind stuff
-install -m 0644 examples/pam_winbind/pam_winbind.conf %{buildroot}/%{_sysconfdir}/security/pam_winbind.conf
+install -m 0644 examples/pam_winbind/pam_winbind.conf %{buildroot}/%_pam_secconfdir/pam_winbind.conf
 # install nsswitch-headers (for squid, etc. #FIXME)
 install -d -m 0755 \
 	%{buildroot}/%{_includedir}/samba/nsswitch \
@@ -1624,7 +1619,7 @@ exit 0
 %ghost %{CONFIGDIR}/smbpasswd
 %endif
 %config(noreplace) %{CONFIGDIR}/smbusers
-%config %{_sysconfdir}/pam.d/samba
+%config %_pam_confdir/samba
 %{_sysconfdir}/slp.reg.d
 %if 0%{?suse_version} <= 1500
 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/netbios-server
@@ -1993,7 +1988,7 @@ exit 0
 
 %files winbind -f filelist-samba-winbind
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/security/pam_winbind.conf
+%config(noreplace) %_pam_secconfdir/pam_winbind.conf
 %if 0%{?suse_version} < 1221
 %attr(0754,root,root) %config %{INITDIR}/winbind
 %else
@@ -2006,7 +2001,7 @@ exit 0
 %{_bindir}/wbinfo
 %{_sbindir}/rcwinbind
 %{_sbindir}/winbindd
-/%{_lib}/security/pam_winbind.so
+%_pam_moduledir/pam_winbind.so
 %{_libdir}/libnss_winbind.so.*
 %{_libdir}/samba/idmap
 %{_libdir}/samba/nss_info