Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

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

diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm
index 0f7d161da5633e7787546887d6100b4ed30ee07d..c176834dc653333c5d8b7f6683cc3d77d9094125 100644 (file)
--- a/isdn4k-utils/isdn4k-utils.nm
+++ b/isdn4k-utils/isdn4k-utils.nm
@@ -6,7 +6,7 @@
 name       = isdn4k-utils
 version    = 3.2
 devel_ver  = CVS-2010-05-01
-release    = 3
+release    = 8
 thisapp    = %{name}-%{devel_ver}-patched
 
 groups     = Networking/Tools
@@ -16,7 +16,7 @@ summary    = Utilities for configuring an ISDN subsystem.
 
 description
        The isdn4k-utils package contains a collection of utilities needed
-       for configuring and running an ISDN subsystem. 
+       for configuring and running an ISDN subsystem.
 end
 
 source_dl  = ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/
@@ -38,7 +38,7 @@ build
                -D_LARGEFILE_SOURCE
 
        prepare_cmds
-               # remove useless files 
+               # remove useless files
                find -type d -name CVS | xargs rm -rf
 
                # enable capi20.new
@@ -59,11 +59,11 @@ build
                sed -e "s/^CONFIG_XISDNLOAD=.*/#&/" -i .config
                echo "CONFIG_GENMAN=y" >> .config
                echo "CONFIG_FAQ=y" >> .config
-               echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >> .config
-               echo "CONFIG_DATADIR='/usr/share/isdn'" >> .config
-               echo "LIBDIR='/usr/lib'" >> .config 
-               echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config 
-               echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config 
+               echo "CONFIG_FAQDIR='%{datadir}/doc/isdn4k-utils'" >> .config
+               echo "CONFIG_DATADIR='%{datadir}/isdn'" >> .config
+               echo "LIBDIR='%{libdir}'" >> .config
+               echo "CONFIG_FIRMWAREDIR='%{datadir}/isdn'" >> .config
+               echo "CONFIG_CARD_SBINDIR='%{sbindir}'" >> .config
                sed -e "s,',,g" .config > .config.h
        end
 
@@ -75,16 +75,16 @@ build
 
        install
                mkdir -pv %{BUILDROOT}/usr/sbin
-               make install CFLAGS="%{CFLAGS}" DESTDIR="%{BUILDROOT}"
-
-               # Install udev rules for isdn.
-               mkdir -pv %{BUILDROOT}/lib/udev/rules.d/
-               install -m 644 %{DIR_SOURCE}/40-isdn.rules %{BUILDROOT}/lib/udev/rules.d/
+               make install CFLAGS="%{CFLAGS}" LIBDIR="%{libdir}" DESTDIR="%{BUILDROOT}"
 
                # Install config files for capi.
                mkdir -pv %{BUILDROOT}/etc
                install -m 644 capiinit/capi.conf %{BUILDROOT}/etc
                install -m 644 %{DIR_SOURCE}/capi20.conf %{BUILDROOT}/etc
+
+               # Install ipppd configuration files.
+               mkdir -pv %{BUILDROOT}/etc/ppp
+               touch %{BUILDROOT}/etc/ppp/ioptions
        end
 end
 
@@ -92,6 +92,16 @@ packages
        package %{name}
                prerequires += systemd-units
 
+               conflicts
+                       filesystem < 002
+               end
+
+               configfiles
+                       /etc/capi.conf
+                       /etc/capi20.conf
+                       /etc/ppp/ioptions
+               end
+
                script postin
                        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
                end
@@ -114,4 +124,8 @@ packages
        package %{name}-devel
                template DEVEL
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end