diff --git a/samba.spec b/samba.spec index 06197e0..362de8b 100644 --- a/samba.spec +++ b/samba.spec @@ -6,7 +6,7 @@ %define smbldap_tools_ver 0.9.2 Name: samba -Version: 4.6.7 +Version: 4.8.3 Release: 1mamba Summary: Samba provides seamless file and print services to SMB/CIFS clients Group: System/Servers @@ -247,7 +247,7 @@ PATH=/usr/bin:$PATH \ --enable-fhs \ --with-logfilebase=%{_localstatedir}/log/samba \ --with-pammodulesdir=/%{_lib}/security \ - --with-piddir=/run/ \ + --with-piddir=/run/samba \ --with-ads \ --with-automount \ --with-ldap \ @@ -256,6 +256,9 @@ PATH=/usr/bin:$PATH \ --with-utmp \ --with-sockets-dir=/run/samba \ --with-privatedir=%{_sysconfdir}/samba/private \ + --with-systemd \ + --systemd-install-services \ + --with-systemddir=%{_unitdir} \ --enable-cups \ --bundled-libraries=auto @@ -309,14 +312,14 @@ sed -i "s|/usr/local/samba/var/log|/var/log/samba/log|;\ ##install -D -m 0644 %{S:12} %{buildroot}%{_sysconfdir}/ld.so.conf.d/samba.conf # #systemd -for f in samba nmb smb winbind; do - install -D -m0644 packaging/systemd/$f.service %{buildroot}%{_unitdir}/$f.service -done -sed -i "s|/var/run/|/run/|" packaging/systemd/samba.conf.tmp +#for f in samba nmb smb winbind; do +# install -D -m0644 packaging/systemd/$f.service %{buildroot}%{_unitdir}/$f.service +#done +#sed -i "s|/var/run/|/run/|" packaging/systemd/samba.conf.tmp install -D -m0644 packaging/systemd/samba.conf.tmp %{buildroot}%{_tmpfilesdir}/samba.conf -install -D -m0644 packaging/systemd/samba.conf.tmp %{buildroot}%{_tmpfilesdir}/nmb.conf -install -D -m0644 packaging/systemd/samba.conf.tmp %{buildroot}%{_tmpfilesdir}/smb.conf -install -D -m0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba +#install -D -m0644 packaging/systemd/samba.conf.tmp %{buildroot}%{_tmpfilesdir}/nmb.conf +#install -D -m0644 packaging/systemd/samba.conf.tmp %{buildroot}%{_tmpfilesdir}/smb.conf +#install -D -m0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba install -D -m 0644 examples/LDAP/samba.schema \ %{buildroot}/etc/openldap/schema/samba.schema @@ -400,8 +403,7 @@ exit 0 %systemd_post nmb %systemd_post smb if [ $1 -ge 1 ]; then - %tmpfiles_create nmb.conf - %tmpfiles_create smb.conf + %tmpfiles_create samba.conf # clean old sysv broken links find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \; [ -e %{_initrddir}/nmb ] && { @@ -489,7 +491,7 @@ exit 0 if [ $1 -eq 0 ]; then # remove package systemctl -q stop winbind - sed -i "/*pam_winbind.so/d" %{_sysconfdir}/pam.d/system-auth + sed -i "/.*pam_winbind.so/d" %{_sysconfdir}/pam.d/system-auth fi exit 0 @@ -671,8 +673,7 @@ fi %dir /var/cache/samba %dir %attr(1777,root,root) /var/spool/samba #/%{_lib}/security/pam_smbpass.so -%{_tmpfilesdir}/nmb.conf -%{_tmpfilesdir}/smb.conf +%{_tmpfilesdir}/samba.conf %{_unitdir}/nmb.service %{_unitdir}/smb.service %{_libdir}/libnss_wins.so @@ -705,10 +706,10 @@ fi %{_sbindir}/samba %{_sbindir}/samba_dnsupdate %{_sbindir}/samba_kcc +%{_sbindir}/samba_gpoupdate %{_sbindir}/samba_spnupdate %{_sbindir}/samba_upgradedns %{_unitdir}/samba.service -%{_tmpfilesdir}/samba.conf %dir %{_libdir}/samba/bind9 %{_libdir}/samba/bind9/*.so %dir %{_libdir}/samba/gensec @@ -797,6 +798,9 @@ fi %{_mandir}/man8/winbindd.* %changelog +* Fri Jul 20 2018 Automatic Build System 4.8.3-1mamba +- automatic version update by autodist + * Mon Aug 14 2017 Automatic Build System 4.6.7-1mamba - automatic version update by autodist