xorg-x11-drv-vmware: Update to 13.0.0.

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

diff --git a/bind/bind.nm b/bind/bind.nm
index 92290af603d06d50bb2e05ddde34e3f1c9373baf..484c5e02819de8e1f4daa9c0ec25145a861abbd9 100644 (file)
--- a/bind/bind.nm
+++ b/bind/bind.nm
@@ -5,7 +5,7 @@
 
 name       = bind
 version    = 9.8.1
-release    = 2
+release    = 3
 
 groups     = Networking/Tools
 url        = http://www.isc.org/products/BIND/
@@ -62,22 +62,21 @@ build
                libidn-devel
                pkg-config
                openssl-devel
+               shadow-utils
        end
 
        configure_options += \
                --with-libtool \
-               --sysconfdir=/etc \
-               --localstatedir=/var \
                --enable-threads \
                --enable-ipv6 \
                --with-pic \
                --disable-static \
                --disable-openssl-version-check \
                --enable-exportlib \
-               --with-export-libdir=/lib/ \
+               --with-export-libdir=/%{lib}/ \
                --with-export-includedir=/usr/include/ \
                --includedir=/usr/include/bind9/ \
-               --with-pkcs11=/usr/lib/pkcs11/PKCS11_API.so \
+               --with-pkcs11=%{libdir}/pkcs11/PKCS11_API.so \
                --with-gssapi=yes \
                --disable-isc-spnego
 
@@ -97,6 +96,9 @@ build
                libtoolize -c -f
                aclocal -I m4 --force
                autoconf -f
+
+               # Create user and group for /run directory.
+               %{create_user}
        end
 
        install
@@ -104,7 +106,7 @@ build
                gzip -9 doc/rfc/*
 
                # Create directory layout.
-               mkdir -pv %{BUILDROOT}/usr/lib/bind
+               mkdir -pv %{BUILDROOT}%{libdir}/bind
                mkdir -pv %{BUILDROOT}/var/named/{slaves,data,dynamic}
                mkdir -pv %{BUILDROOT}/usr/share/man/{man1,man5,man8}
                mkdir -pv %{BUILDROOT}/run/named
@@ -138,21 +140,31 @@ build
                tar -C %{BUILDROOT} -xaf %{DIR_DL}/bind-config-8.tar.bz2
                touch %{BUILDROOT}/etc/rndc.key
                touch %{BUILDROOT}/etc/rndc.conf
-               
+
                mkdir %{BUILDROOT}/etc/named
                install -m 644 bind.keys %{BUILDROOT}/etc/named.iscdlv.key
                install -m 644 %{DIR_SOURCE}/trusted-key.key %{BUILDROOT}/etc/trusted-key.key
 
                # Recreate symlinks for export libraries
-               rm -rf %{BUILDROOT}/lib/lib*-export.so
+               rm -rf %{BUILDROOT}/%{lib}/lib*-export.so
 
-               ln -svf ../../lib/libdns-export.so.81 %{BUILDROOT}/usr/lib/libdns-export.so
-               ln -svf ../../lib/libirs-export.so.80 %{BUILDROOT}/usr/lib/libirs-export.so
-               ln -svf ../../lib/libisccfg-export.so.82 %{BUILDROOT}/usr/lib/libisccfg-export.so
-               ln -svf ../../lib/libisc-export.so.83 %{BUILDROOT}/usr/lib/libisc-export.so
+               ln -svf ../../%{lib}/libdns-export.so.81 %{BUILDROOT}%{libdir}/libdns-export.so
+               ln -svf ../../%{lib}/libirs-export.so.80 %{BUILDROOT}%{libdir}/libirs-export.so
+               ln -svf ../../%{lib}/libisccfg-export.so.82 %{BUILDROOT}%{libdir}/libisccfg-export.so
+               ln -svf ../../%{lib}/libisc-export.so.83 %{BUILDROOT}%{libdir}/libisc-export.so
+
+               # Create /run/named.
+               mkdir -pv %{BUILDROOT}/run/named
+               chown -Rv named.named %{BUILDROOT}/run/named/
        end
 end
 
+create_user
+       getent group named >/dev/null || /usr/sbin/groupadd -r named
+       getent passwd named >/dev/null || /usr/sbin/useradd -r -g named \
+               -d /var/named -c "User for bind DNS server" -s /sbin/nologin named
+end
+
 packages
        package %{name}
                requires
@@ -163,12 +175,7 @@ packages
                prerequires += shadow-utils
 
                script prein
-                       # Create unprivileged user and group.
-                       getent group named > /dev/null || groupadd -r named
-                       getent passwd named > /dev/null || \
-                               useradd -r -g named -d /var/named -s /sbin/nologin \
-                               -c "User for bind DNS server" named
-                       exit 0
+                       %{create_user}
                end
 
                # XXX Add systemd scriptlet if a service file becomes available
@@ -206,4 +213,8 @@ packages
        package %{name}-devel
                template DEVEL
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end