diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-06-28 21:38:19 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-06-28 21:38:19 +1000 |
| commit | 7dbe92c97038b62b7ef9576c003a09a87d56edfa (patch) | |
| tree | 70299619de4c548cf1c3a835d9b5f2aef9d0d4ed | |
| parent | db313cbab6838e098c6fbda51c47a1da8ee00780 (diff) | |
| download | samba-7dbe92c97038b62b7ef9576c003a09a87d56edfa.tar.gz samba-7dbe92c97038b62b7ef9576c003a09a87d56edfa.tar.bz2 samba-7dbe92c97038b62b7ef9576c003a09a87d56edfa.zip | |
More work to use %{name} rather than 'samba'
(This used to be commit a18363d72ac58ee27b4ff3b065f3fab50722718a)
| -rw-r--r-- | packaging/Fedora/samba4.init | 2 | ||||
| -rw-r--r-- | packaging/Fedora/samba4.spec | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/packaging/Fedora/samba4.init b/packaging/Fedora/samba4.init index 1e42364452..a04cce92c5 100644 --- a/packaging/Fedora/samba4.init +++ b/packaging/Fedora/samba4.init @@ -5,7 +5,7 @@ # used to provide SMB network services. # # pidfile: /var/run/samba4/smbd.pid -# config: /etc/samba/smb.conf +# config: /etc/samba4/smb.conf SAMBA_NAME=samba4 diff --git a/packaging/Fedora/samba4.spec b/packaging/Fedora/samba4.spec index 9059f14697..ad929f1174 100644 --- a/packaging/Fedora/samba4.spec +++ b/packaging/Fedora/samba4.spec @@ -142,7 +142,7 @@ cd source --with-lockdir=/var/lib/%{name} \ --with-piddir=/var/run \ --with-privatedir=/var/lib/%{name}/private \ - --with-logfilebase=/var/log/samba \ + --with-logfilebase=/var/log/%{name} \ --with-configdir=%{_sysconfdir}/%{name} \ --with-winbindd-socket-dir=/var/run/winbind \ --with-ntp-signd-socket-dir=/var/run/ntp_signd \ @@ -260,7 +260,6 @@ exit 0 %{_datadir}/samba/setup/* %dir /var/lib/%{name}/sysvol %config(noreplace) %{_sysconfdir}/sysconfig/%{name} -%dir %{_sysconfdir}/%{name} %attr(0700,root,root) %dir /var/log/%{name} %attr(0700,root,root) %dir /var/log/%{name}/old @@ -271,6 +270,11 @@ exit 0 %{_datadir}/samba/*.dat %{_libdir}/*.so.* %{_libdir}/samba +%dir %{_sysconfdir}/%{name} +#Need to mark this as being owned by Samba, but it is normally created +#by the provision script, which runs best if there is no existing +#smb.conf +#%config(noreplace) %{_sysconfdir}/%{name}/smb.conf %files winbind %defattr(-,root,root) |