X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=isdn4k-utils%2Fisdn4k-utils.nm;h=c176834dc653333c5d8b7f6683cc3d77d9094125;hb=79f79385e2873337ad01d3a9e1dfdb15f99be763;hp=ad636c18f5431124ed82f8d2674b21e90f827139;hpb=c93f54147fef4a95b74d17e74a7c2b86755f65ef;p=people%2Fms%2Fipfire-3.x.git

diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm
index ad636c18f..c176834dc 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    = 5
+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 "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,11 +75,7 @@ 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
@@ -96,6 +92,10 @@ packages
 	package %{name}
 		prerequires += systemd-units
 
+		conflicts
+			filesystem < 002
+		end
+
 		configfiles
 			/etc/capi.conf
 			/etc/capi20.conf