From 653b51464c9b9c8a8e417944996a3a98cb647e4705cdea32715221f837848f60 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 28 Feb 2014 17:16:33 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=525
---
 0001-make-209-working-on-older-dist.patch | 71 +++++++++++++++++++++++
 systemd.changes                           |  7 +++
 systemd.spec                              |  4 ++
 3 files changed, 82 insertions(+)

diff --git a/0001-make-209-working-on-older-dist.patch b/0001-make-209-working-on-older-dist.patch
index 4c66289a..63fbd03b 100644
--- a/0001-make-209-working-on-older-dist.patch
+++ b/0001-make-209-working-on-older-dist.patch
@@ -6,3 +6,74 @@
  RemainAfterExit=yes
 +ExecStartPre=@MKDIR_P@ /run/tmpfiles.d
  ExecStart=@KMOD@ static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+--- systemd-209/configure.ac
++++ systemd-209/configure.ac	2014-02-28 17:14:14.866235643 +0000
+@@ -300,9 +300,9 @@ AC_ARG_ENABLE(kmod, AS_HELP_STRING([--di
+ if test "x$enable_kmod" != "xno"; then
+         PKG_CHECK_EXISTS([ libkmod ], have_kmod=yes, have_kmod=no)
+         if test "x$have_kmod" = "xyes"; then
+-                PKG_CHECK_MODULES(KMOD, [ libkmod >= 15 ],
++                PKG_CHECK_MODULES(KMOD, [ libkmod >= 14 ],
+                         [AC_DEFINE(HAVE_KMOD, 1, [Define if kmod is available])],
+-                        AC_MSG_ERROR([*** kmod version >= 15 not found]))
++                        AC_MSG_ERROR([*** kmod version >= 14 not found]))
+         fi
+         if test "x$have_kmod" = xno -a "x$enable_kmod" = xyes; then
+                 AC_MSG_ERROR([*** kmod support requested, but libraries not found])
+--- systemd-209/configure
++++ systemd-209/configure	2014-02-28 17:13:50.770735397 +0000
+@@ -15999,12 +15999,12 @@ if test -n "$KMOD_CFLAGS"; then
+     pkg_cv_KMOD_CFLAGS="$KMOD_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 15 \""; } >&5
+-  ($PKG_CONFIG --exists --print-errors " libkmod >= 15 ") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 14 \""; } >&5
++  ($PKG_CONFIG --exists --print-errors " libkmod >= 14 ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_KMOD_CFLAGS=`$PKG_CONFIG --cflags " libkmod >= 15 " 2>/dev/null`
++  pkg_cv_KMOD_CFLAGS=`$PKG_CONFIG --cflags " libkmod >= 14 " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -16016,12 +16016,12 @@ if test -n "$KMOD_LIBS"; then
+     pkg_cv_KMOD_LIBS="$KMOD_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 15 \""; } >&5
+-  ($PKG_CONFIG --exists --print-errors " libkmod >= 15 ") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 14 \""; } >&5
++  ($PKG_CONFIG --exists --print-errors " libkmod >= 14 ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_KMOD_LIBS=`$PKG_CONFIG --libs " libkmod >= 15 " 2>/dev/null`
++  pkg_cv_KMOD_LIBS=`$PKG_CONFIG --libs " libkmod >= 14 " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -16042,18 +16042,18 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        KMOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libkmod >= 15 " 2>&1`
++	        KMOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libkmod >= 14 " 2>&1`
+         else
+-	        KMOD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libkmod >= 15 " 2>&1`
++	        KMOD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libkmod >= 14 " 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$KMOD_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "*** kmod version >= 15 not found" "$LINENO" 5
++	as_fn_error $? "*** kmod version >= 14 not found" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-	as_fn_error $? "*** kmod version >= 15 not found" "$LINENO" 5
++	as_fn_error $? "*** kmod version >= 14 not found" "$LINENO" 5
+ else
+ 	KMOD_CFLAGS=$pkg_cv_KMOD_CFLAGS
+ 	KMOD_LIBS=$pkg_cv_KMOD_LIBS
diff --git a/systemd.changes b/systemd.changes
index 5d338186..764818b3 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 28 17:15:38 UTC 2014 - werner@suse.de
+
+- Make patch
+  0001-make-209-working-on-older-dist.patch
+  more smart that is make configure script les restrictive
+
 -------------------------------------------------------------------
 Fri Feb 28 16:59:25 UTC 2014 - werner@suse.de
 
diff --git a/systemd.spec b/systemd.spec
index edd5d4c0..dc657f86 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -108,7 +108,11 @@ Requires:       %{udevpkgname} >= 172
 Recommends:     %{name}-bash-completion
 Requires:       dbus-1 >= 1.4.0
 Requires:       kbd
+%if 0%{?suse_version} <= 1310
 Requires:       kmod >= 14
+%else
+Requires:       kmod >= 15
+%endif
 Requires:       pam-config >= 0.79-5
 Requires:       pwdutils
 Requires:       systemd-presets-branding