[isdn4k-utils] drop 40-isdn.rules entirely, it's fixed in kernel fix isdn4k-utils-mkzonedb.patch

[Than Ngo]

commit cdd54207ab2e6768f59efd4b63c2c02f4c37a3c1
Author: Than Ngo <than at redhat.com>
Date:   Thu Jul 31 12:06:48 2014 +0200

    drop 40-isdn.rules entirely, it's fixed in kernel
    fix isdn4k-utils-mkzonedb.patch

 isdn4k-utils-mkzonedb.patch |   11 +++++------
 isdn4k-utils.spec           |   10 ++++++----
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/isdn4k-utils-mkzonedb.patch b/isdn4k-utils-mkzonedb.patch
index 9e322b9..aa603c8 100644
--- a/isdn4k-utils-mkzonedb.patch
+++ b/isdn4k-utils-mkzonedb.patch
@@ -1,11 +1,10 @@
-diff -up isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.me isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c
---- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.me	2014-07-30 16:16:17.000000000 +0200
-+++ isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c	2014-07-30 16:15:22.000000000 +0200
-@@ -361,7 +361,7 @@ int main (int argc, char *argv[])
- 	}
+diff -up isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.crash isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c
+--- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.crash	2014-07-31 11:31:57.000000000 +0200
++++ isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c	2014-07-31 11:35:12.000000000 +0200
+@@ -362,6 +362,7 @@ int main (int argc, char *argv[])
          if (verbose)
              stdoutisatty = isatty(fileno(stdout));
--	
+ 
 +	if (!rf || !df) usage(argv);
  	read_rzfile(rf);
  	make_table();
diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec
index e8e21a4..4d3a368 100644
--- a/isdn4k-utils.spec
+++ b/isdn4k-utils.spec
@@ -56,7 +56,9 @@ Requires: initscripts >= 5.92
 Requires(pre): coreutils, chkconfig, /sbin/service, bzip2
 Conflicts: filesystem < 3
 Conflicts: udev <= 179-1
-Requires: systemd-units >= 39-2
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 Requires: %{name}-data = %{version}-%{release}
 
 BuildRequires: openjade
@@ -76,7 +78,7 @@ BuildRequires: imake
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: ppp-devel
-BuildRequires: systemd-units >= 39-2
+BuildRequires: systemd
 # for /usr/bin/pod2man
 %if 0%{?fedora} > 18 || 0%{?rhel} > 6
 BuildRequires: perl-podlators
@@ -284,7 +286,7 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc
 echo "# config files" >> %{buildroot}/etc/ppp/ioptions
 
 # install 40-isdn.rules, it's dropped from udev in F14 and later
-%if 0%{?fedora} > 13 || 0%{?rhel} > 6
+%if 0%{?fedora} < 21 || 0%{?rhel} > 6
 	mkdir -p %{buildroot}/usr/lib/udev/rules.d
 	install -m 644 %{SOURCE10} %{buildroot}/usr/lib/udev/rules.d/
 %endif
@@ -342,7 +344,7 @@ echo "# config files" >> %{buildroot}/etc/ppp/ioptions
 %defattr(644,root,root,755)
 %doc COPYING README isdnlog/README.*
 %doc isdnlog/tools/zone/de/01033/zred.dtag.bz2
-%if 0%{?fedora} > 13 || 0%{?rhel} > 6
+%if 0%{?fedora} < 21 || 0%{?rhel} > 6
 /usr/lib/udev/rules.d/40-isdn.rules
 %endif
 %{_unitdir}/isdn.service