Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2021-03-08 15:15:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba" Mon Mar 8 15:15:11 2021 rev:267 rq:876695 version:4.13.4+git.199.be6e11f5ab2 Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2021-02-18 20:48:51.103235451 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new.2378/samba.changes 2021-03-08 15:16:24.101900837 +0100 @@ -1,0 +2,6 @@ +Mon Mar 1 12:09:56 UTC 2021 - Samuel Cabrero <[email protected]> + +- Spec file fixes around systemd and requires; (bsc#1182830); +- Align systemd service unit files with upstream provided ones. + +------------------------------------------------------------------- Old: ---- samba-4.13.4+git.187.5ad4708741a.tar.bz2 New: ---- samba-4.13.4+git.199.be6e11f5ab2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.HGIwMy/_old 2021-03-08 15:16:25.333901787 +0100 +++ /var/tmp/diff_new_pack.HGIwMy/_new 2021-03-08 15:16:25.337901790 +0100 @@ -170,7 +170,7 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.13.4+git.187.5ad4708741a +Version: 4.13.4+git.199.be6e11f5ab2 Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version} @@ -187,7 +187,7 @@ Requires(pre): /usr/sbin/groupadd Requires: system-user-nobody Requires: coreutils -Requires: grep +Requires: /usr/bin/grep %if 0%{?suse_version} > 1220 Requires: %{fillup_prereq} %endif @@ -257,7 +257,6 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: coreutils -%{?systemd_requires} Requires: cifs-utils %description client @@ -397,7 +396,7 @@ Requires(pre): coreutils Requires(pre): /bin/mktemp Requires(pre): /usr/bin/killall -Requires(pre): sed +Requires(pre): /usr/bin/sed %description -n ctdb ctdb is the clustered database used by Samba @@ -1027,6 +1026,8 @@ %if 0%{?suse_version} > 1220 --enable-avahi \ --with-systemd \ + --with-systemddir=%{_unitdir} \ + --systemd-install-services \ %endif --with-shared-modules=%{auth_modules},%{vfs_modules},%{pdb_modules},%{idmap_modules} \ %if %with_mitkrb5 @@ -1174,14 +1175,15 @@ %endif %if 0%{?suse_version} > 1220 for srv_name in nmb smb winbind; do - install -m 0644 -p systemd/${srv_name}.service %{buildroot}/%{_unitdir} ln -s service %{buildroot}/%{_sbindir}/rc${srv_name} done %if %{with_dc} - install -m 0644 -p systemd/samba-ad-dc.service %{buildroot}/%{_unitdir} ln -s service %{buildroot}/%{_sbindir}/rcsamba-ad-dc %endif -install -m 0644 systemd/sysconfig.* %{buildroot}%{_fillupdir} +rm %{buildroot}/%{_sysconfdir}/sysconfig/samba +install -m 0644 systemd/sysconfig.samba %{buildroot}%{_fillupdir} +install -m 0644 systemd/sysconfig.samba-winbind %{buildroot}%{_fillupdir} +install -m 0644 systemd/sysconfig.samba-ad-dc %{buildroot}%{_fillupdir} install -m 0644 -p ../systemd/samba.conf.tmp %{buildroot}/%{_tmpfilesdir}/samba.conf %else for script in ${startScripts}; do @@ -1387,7 +1389,7 @@ fi %service_add_post nmb.service smb.service -%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf +%tmpfiles_create samba.conf %fillup_only %endif @@ -1512,6 +1514,7 @@ %post ad-dc /sbin/ldconfig %service_add_post samba-ad-dc.service +%{fillup_only -ans samba ad-dc} %postun ad-dc /sbin/ldconfig @@ -1547,7 +1550,7 @@ fi %if 0%{?suse_version} > 1220 %service_add_post winbind.service -%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf +%tmpfiles_create samba.conf %{fillup_only -ans samba winbind} %endif @@ -1617,7 +1620,7 @@ %if 0%{?suse_version} > 1220 %{fillup_only -n ctdb} %service_add_post ctdb.service -%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/ctdb.conf || : +%tmpfiles_create ctdb.conf %else %{fillup_and_insserv -n ctdb} %endif @@ -2424,6 +2427,7 @@ %if %{with_dc} %files ad-dc +%{_fillupdir}/sysconfig.samba-ad-dc %{_unitdir}/samba-ad-dc.service %{_bindir}/samba-tool %{_sbindir}/samba ++++++ _service ++++++ --- /var/tmp/diff_new_pack.HGIwMy/_old 2021-03-08 15:16:25.385901827 +0100 +++ /var/tmp/diff_new_pack.HGIwMy/_new 2021-03-08 15:16:25.389901830 +0100 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="revision">factory-4-13-stable</param> <param name="versionformat">@PARENT_TAG@+git.@TAG_OFFSET@.%h</param> - <param name="versionrewrite-pattern">samba(.*)</param> + <param name="versionrewrite-pattern">samba-(.*)</param> <param name="versionrewrite-replacement">\1</param> <param name="filename">samba</param> <param name="exclude">.git</param> ++++++ samba-4.13.4+git.187.5ad4708741a.tar.bz2 -> samba-4.13.4+git.199.be6e11f5ab2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/samba/samba-4.13.4+git.187.5ad4708741a.tar.bz2 /work/SRC/openSUSE:Factory/.samba.new.2378/samba-4.13.4+git.199.be6e11f5ab2.tar.bz2 differ: char 11, line 1
