From d7483766ebec1b17bb0794618587e61bce73a58083ad8aa6988ac00140c403d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 4 Aug 2011 11:15:00 +0000 Subject: [PATCH] - Use /var/run for the cifs state file; (bnc#710304). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=172 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.changes | 5 ++++ samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 35 insertions(+), 30 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 29607e6..acd13d5 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2580 +2581 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 65e737d..0174399 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -415,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 5cb5f00..bbd0cca 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 4 10:40:57 UTC 2011 - lmuelle@suse.de + +- Use /var/run for the cifs state file; (bnc#710304). + ------------------------------------------------------------------- Mon Aug 1 21:28:25 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index de17e31..1f228dd 100644 --- a/samba.spec +++ b/samba.spec @@ -187,7 +187,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package client @@ -227,7 +227,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +254,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %endif @@ -284,7 +284,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %endif @@ -311,7 +311,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if %{make_utils} @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -387,7 +387,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %else @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libnetapi0 @@ -456,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libnetapi-devel @@ -481,7 +481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -502,7 +502,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %else @@ -543,7 +543,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libwbclient0 @@ -562,7 +562,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libwbclient-devel @@ -587,7 +587,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtalloc2 @@ -608,7 +608,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtalloc-devel @@ -635,7 +635,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtdb1 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtdb-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtevent0 @@ -700,7 +700,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtevent-devel @@ -728,7 +728,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libldb1 @@ -751,7 +751,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libldb-devel @@ -778,7 +778,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if %{make_ldapsmb} @@ -802,7 +802,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %endif @@ -1093,7 +1093,7 @@ popd ${RPM_BUILD_ROOT}/%{LOGDIR} \ ${RPM_BUILD_ROOT}/%{PIDDIR} \ ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates \ - ${RPM_BUILD_ROOT}/%{_var}/lock/subsys \ + ${RPM_BUILD_ROOT}/%{_var}/run \ ${RPM_BUILD_ROOT}/%{DOCDIR}-vscan \ ${RPM_BUILD_ROOT}/%{DOCDIR} \ ${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \ @@ -1187,7 +1187,7 @@ done pod2man tools/nmbstatus >${RPM_BUILD_ROOT}/%{_mandir}/man1/nmbstatus.1 # PDF generator %__install -p -m 0755 tools/smbprngenpdf ${RPM_BUILD_ROOT}/%{_bindir}/smbprngenpdf -touch ${RPM_BUILD_ROOT}/var/lock/subsys/%{cifs_init_script} +touch ${RPM_BUILD_ROOT}/var/run/%{cifs_init_script} %__install -m 0644 config/swat.xinetd ${RPM_BUILD_ROOT}/%{_sysconfdir}/xinetd.d/swat %__install -m 0644 config/samba.reg ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d/samba.reg %if 0%{?suse_version} && 0%{?suse_version} < 921 @@ -1761,7 +1761,7 @@ fi %doc %{DOCDIR}/README.%{VENDOR} %{_var}/adm/fillup-templates/samba-client-dhcp.conf %{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client -%ghost %{_var}/lock/subsys/%{cifs_init_script} +%ghost %{_var}/run/%{cifs_init_script} %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 18050e0..03cd7ff 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67f99c6f77859ab53b0aa258b7a55248ebd2b5e1e60952357f2c034d4fa66e9b -size 51348 +oid sha256:dae04225d8f29da03a9bf33c0bcce7acdebc661d118e7996b4376764a545e99d +size 51394