[isdn4k-utils/f20] merge from master

[Than Ngo]

commit 13251b17f8875321f97e5072c6eb844e753899b2
Author: Than Ngo <than at redhat.com>
Date:   Thu Oct 23 18:28:27 2014 +0200

    merge from master

 isdn4k-utils-mkzonedb.patch |   11 ++++++-----
 isdn4k-utils.spec           |   15 +++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/isdn4k-utils-mkzonedb.patch b/isdn4k-utils-mkzonedb.patch
index aa603c8..9e322b9 100644
--- a/isdn4k-utils-mkzonedb.patch
+++ b/isdn4k-utils-mkzonedb.patch
@@ -1,10 +1,11 @@
-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[])
+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[])
+ 	}
          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 ed3c66c..e8e21a4 100644
--- a/isdn4k-utils.spec
+++ b/isdn4k-utils.spec
@@ -6,7 +6,7 @@
 Summary: Utilities for configuring an ISDN subsystem
 Name: isdn4k-utils
 Version: 3.2
-Release: 99%{?dist}
+Release: 98%{?dist}
 License: GPLv2+ and GPL+ and MIT and BSD and zlib
 Group: Applications/System
 Url: http://www.isdn4linux.de/
@@ -56,9 +56,7 @@ Requires: initscripts >= 5.92
 Requires(pre): coreutils, chkconfig, /sbin/service, bzip2
 Conflicts: filesystem < 3
 Conflicts: udev <= 179-1
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
+Requires: systemd-units >= 39-2
 Requires: %{name}-data = %{version}-%{release}
 
 BuildRequires: openjade
@@ -78,7 +76,7 @@ BuildRequires: imake
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: ppp-devel
-BuildRequires: systemd
+BuildRequires: systemd-units >= 39-2
 # for /usr/bin/pod2man
 %if 0%{?fedora} > 18 || 0%{?rhel} > 6
 BuildRequires: perl-podlators
@@ -286,7 +284,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} < 21 || 0%{?rhel} > 6
+%if 0%{?fedora} > 13 || 0%{?rhel} > 6
 	mkdir -p %{buildroot}/usr/lib/udev/rules.d
 	install -m 644 %{SOURCE10} %{buildroot}/usr/lib/udev/rules.d/
 %endif
@@ -344,7 +342,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} < 21 || 0%{?rhel} > 6
+%if 0%{?fedora} > 13 || 0%{?rhel} > 6
 /usr/lib/udev/rules.d/40-isdn.rules
 %endif
 %{_unitdir}/isdn.service
@@ -412,9 +410,6 @@ echo "# config files" >> %{buildroot}/etc/ppp/ioptions
 
 
 %changelog
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-99
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
 * Wed Jul 30 2014 Than Ngo <than at redhat.com> - 3.2-98
 - fixed #1045909, multilib issue
 - fixed #913721, udev rules are installed into wrong directory