dosfstools: Update to 3.0.26.

[people/ms/ipfire-3.x.git] / samba / samba.nm

diff --git a/samba/samba.nm b/samba/samba.nm
index dcf1edfff8153a7c7afe9681b4678ac0b82131d5..39f4c840621f8c0ba19c2cd2703fa412e87a3920 100644 (file)
--- a/samba/samba.nm
+++ b/samba/samba.nm
@@ -4,10 +4,9 @@
 ###############################################################################
 
 name       = samba
-version    = 3.6.3
+version    = 3.6.16
 release    = 1
 
-maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
 url        = http://www.samba.org/
 license    = GPLv3+ and LGPLv3+
@@ -53,17 +52,17 @@ build
        DIR_APP = %{DIR_SRC}/%{thisapp}/source3
 
        configure_options += \
-               --prefix=/usr \
+               --prefix=%{prefix} \
                --localstatedir=/var \
-               --with-lockdir=/var/lib/samba \
-               --with-piddir=/var/run \
-               --with-mandir=/usr/share/man \
-               --with-privatedir=/var/lib/samba/private \
+               --with-lockdir=%{sharedstatedir}/samba \
+               --with-piddir=%{rundir} \
+               --with-mandir=%{mandir} \
+               --with-privatedir=%{sharedstatedir}/samba/private \
                --with-logfilebase=/var/log/samba \
-               --with-modulesdir=/usr/lib/samba \
-               --with-configdir=/etc/samba \
-               --with-pammodulesdir=/lib/security \
-               --with-swatdir=/usr/share/swat \
+               --with-modulesdir=%{libdir}/samba \
+               --with-configdir=%{sysconfdir}/samba \
+               --with-pammodulesdir=/%{lib}/security \
+               --with-swatdir=%{datadir}/swat \
                --with-automount \
                --with-libsmbclient \
                --with-libsmbsharemodes \
@@ -81,13 +80,18 @@ build
                all modules
 
        install_cmds
-               mkdir -pv %{BUILDROOT}/etc/samba
-               echo "127.0.0.1 localhost" > %{BUILDROOT}/etc/samba/lmhosts
+               mkdir -pv %{BUILDROOT}%{sysconfdir}/samba
+               echo "127.0.0.1 localhost" > %{BUILDROOT}%{sysconfdir}/samba/lmhosts
+               cp -vf %{DIR_SOURCE}/smb.conf %{BUILDROOT}/%{sysconfdir}/%{name}
        end
 end
 
 packages
        package %{name}
+               prerequires = systemd-units
+               configfiles = /etc/smb.conf
+               requires += %{name}-libs = %{thisver}
+       end
 
        package %{name}-libs
                template LIBS
@@ -96,7 +100,7 @@ packages
        package %{name}-devel
                template DEVEL
 
-               requires += %{name}-libs=%{thisver}
+               requires += %{name}-libs = %{thisver}
        end
 
        package %{name}-debuginfo