Accepting request 332679 from Base:System

OBS-URL: https://build.opensuse.org/request/show/332679
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=49

plymouth.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 21 12:15:11 UTC 2015 - idonmez@suse.com
+
+- Use is_opensuse to simplify if/else block 
+
+-------------------------------------------------------------------
+Fri Sep  4 09:41:01 UTC 2015 - idonmez@suse.com
+
+- Add a direct dependency on systemd, since we need to know the
+  path to systemd-tty-ask-password-agent, fixes part of bsc#943312
+
 -------------------------------------------------------------------
 Sat Nov 08 17:05:00 UTC 2014 - Led <ledest@gmail.com>
 

plymouth.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plymouth
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -70,6 +70,7 @@ BuildRequires:  libtool
 BuildRequires:  libudev-devel
 BuildRequires:  libxslt
 BuildRequires:  module-init-tools
+BuildRequires:  systemd >= 186
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
 BuildRequires:  pkgconfig(libdrm)
@@ -366,10 +367,10 @@ sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
 
 # Change the default theme
 
-%if %{suse_version} == 1315
-sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
-%else
+%if 0%{?is_opensuse}
 sed -i -e 's/spinner/openSUSE/g' src/plymouthd.defaults
+%else
+sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
 %endif
 
 %build