From 4f24633fada6eb5311c15acaa800539f2bbccfff2f0b5f5979eefd48c3d34ba1 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 1 Jul 2014 09:00:10 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=697
---
 systemd-mini.spec | 10 +---------
 systemd.spec      |  6 ------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/systemd-mini.spec b/systemd-mini.spec
index 132c4e4f..db05c2af 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -31,9 +31,7 @@
 %else
 %define has_efi 0
 %endif
-##%bcond_with udevsettle
-%define suse_version 1320
-%bcond_without udevsettle
+%bcond_with udevsettle
 
 Name:           systemd-mini
 Url:            http://www.freedesktop.org/wiki/Software/systemd
@@ -1185,11 +1183,9 @@ cp %{SOURCE7} m4/
 %patch1019 -p0
 %patch1020 -p0
 %patch1021 -p1
-%if 0%{?suse_version} > 1310
 %if %{with udevsettle}
 %patch1022 -p1
 %endif
-%endif
 %patch1023 -p0
 %patch1024 -p0
 %patch1025 -p1
@@ -1206,19 +1202,15 @@ cp %{SOURCE7} m4/
 %patch1036 -p1
 %patch1037 -p1
 %patch1038 -p0
-%if 0%{?suse_version} > 1310
 %if %{with udevsettle}
 %patch1039 -p0
 %endif
-%endif
 %patch1040 -p1
-%if 0%{?suse_version} > 1310
 %if %{with udevsettle}
 %patch1041 -p0
 %patch1042 -p0
 %patch1043 -p0
 %endif
-%endif
 
 # ensure generate files are removed
 rm -f units/emergency.service
diff --git a/systemd.spec b/systemd.spec
index 6e5f23b7..711d0f1b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1178,11 +1178,9 @@ cp %{SOURCE7} m4/
 %patch1019 -p0
 %patch1020 -p0
 %patch1021 -p1
-%if 0%{?suse_version} > 1310
 %if %{with udevsettle}
 %patch1022 -p1
 %endif
-%endif
 %patch1023 -p0
 %patch1024 -p0
 %patch1025 -p1
@@ -1199,19 +1197,15 @@ cp %{SOURCE7} m4/
 %patch1036 -p1
 %patch1037 -p1
 %patch1038 -p0
-%if 0%{?suse_version} > 1310
 %if %{with udevsettle}
 %patch1039 -p0
 %endif
-%endif
 %patch1040 -p1
-%if 0%{?suse_version} > 1310
 %if %{with udevsettle}
 %patch1041 -p0
 %patch1042 -p0
 %patch1043 -p0
 %endif
-%endif
 
 # ensure generate files are removed
 rm -f units/emergency.service