From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 14 Apr 2012 23:14:50 +0000 (+0200)
Subject: isdn4k-utils: Move everything to /usr.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98b1ec855a5585ebddb48a9c33e552f94041d686;p=ipfire-3.x.git

isdn4k-utils: Move everything to /usr.
---

diff --git a/isdn4k-utils/40-isdn.rules b/isdn4k-utils/40-isdn.rules
deleted file mode 100644
index 1a31cb6c9..000000000
--- a/isdn4k-utils/40-isdn.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", GROUP="dialout"
-SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n"
diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm
index 38149ed1c..425cd207e 100644
--- 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    = 7
 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