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 38149ed1c725a2a74932b0dadd721e7f901bce87..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    = 6
+release    = 8
 thisapp    = %{name}-%{devel_ver}-patched
 
 groups     = Networking/Tools
@@ -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 "CONFIG_FAQDIR='%{datadir}/doc/isdn4k-utils'" >> .config
+               echo "CONFIG_DATADIR='%{datadir}/isdn'" >> .config
                echo "LIBDIR='%{libdir}'" >> .config
-               echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config
-               echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config
+               echo "CONFIG_FIRMWAREDIR='%{datadir}/isdn'" >> .config
+               echo "CONFIG_CARD_SBINDIR='%{sbindir}'" >> .config
                sed -e "s,',,g" .config > .config.h
        end
 
@@ -77,10 +77,6 @@ build
                mkdir -pv %{BUILDROOT}/usr/sbin
                make install CFLAGS="%{CFLAGS}" LIBDIR="%{libdir}" 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/
-
                # Install config files for capi.
                mkdir -pv %{BUILDROOT}/etc
                install -m 644 capiinit/capi.conf %{BUILDROOT}/etc
@@ -96,6 +92,10 @@ packages
        package %{name}
                prerequires += systemd-units
 
+               conflicts
+                       filesystem < 002
+               end
+
                configfiles
                        /etc/capi.conf
                        /etc/capi20.conf