Merge remote-tracking branch 'arne_f/autoconf'

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

diff --git a/samba/samba.nm b/samba/samba.nm
index b11862d06d903f6ce04f6226623122b213aca82b..6403e4ce50e6bf59cf4553244d8bd9105112d89a 100644 (file)
--- a/samba/samba.nm
+++ b/samba/samba.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = samba
-version    = 3.6.3
+version    = 3.6.4
 release    = 1
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
@@ -37,7 +37,9 @@ build
                automake
                avahi-devel
                cups-devel
+               gettext
                ncurses-devel
+               libacl-devel
                libcap-devel
                openldap-devel
                openssl-devel
@@ -45,22 +47,23 @@ build
                popt-devel
                readline-devel
                which
+               zlib-devel
        end
 
        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 \
@@ -78,21 +81,25 @@ 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
        end
 end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-libs
                template LIBS
        end
-       
+
        package %{name}-devel
                template DEVEL
+
+               requires += %{name}-libs = %{thisver}
        end
-end
 
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end