diff --git a/samba.changes b/samba.changes index 9a6dc86..197cd25 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 13 21:13:21 UTC 2017 - dmulder@suse.com + +- Fix ctdb logs to /var/log/log.ctdb instead of /var/log/ctdb; (bsc#1048339). + ------------------------------------------------------------------- Wed Jul 12 22:30:48 UTC 2017 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 2908ecb..5335631 100644 --- a/samba.spec +++ b/samba.spec @@ -26,7 +26,7 @@ %define build_ceph 1 %endif %endif -%define vendor_files_git_vers git.b446743 +%define vendor_files_git_vers git.f8c2b1c Name: samba BuildRequires: autoconf @@ -1627,6 +1627,9 @@ fi %if 0%{?suse_version} > 1220 %service_add_pre ctdb.service %endif +if [ -e %{_sysconfdir}/sysconfig/ctdb ] ; then + sed -i s/CTDB_LOGFILE=/CTDB_LOGGING=file:/g %{_sysconfdir}/sysconfig/ctdb +fi %preun -n ctdb %if 0%{?suse_version} > 1220 diff --git a/vendor-files-git.b446743.tar.bz2 b/vendor-files-git.b446743.tar.bz2 deleted file mode 100644 index 2e04586..0000000 --- a/vendor-files-git.b446743.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1c311e3bea7477b2558acf2bf91aa7ac0c50ec991c20d709855d4fd6e58bf43 -size 54063 diff --git a/vendor-files-git.f8c2b1c.tar.bz2 b/vendor-files-git.f8c2b1c.tar.bz2 new file mode 100644 index 0000000..748ac1c --- /dev/null +++ b/vendor-files-git.f8c2b1c.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e335306f41ce08089cf79bf1eb89109e46c0b7c791f855b4175d4cafb760c36 +size 54952