From c6317c67bdd3d3d81180b041e71c056cddd5cc0dbf4881b696451e59bf277a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 4 Sep 2015 09:41:42 +0000 Subject: [PATCH 1/5] - Add a direct dependency on systemd, since we need to know the path to systemd-tty-ask-password-agent, fixes part of bsc#943312 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=161 --- plymouth.changes | 6 ++++++ plymouth.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index c4fbc75..4d55cf4 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/plymouth.spec b/plymouth.spec index a5957fc..62ab6be 100644 --- a/plymouth.spec +++ b/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,10 +70,10 @@ BuildRequires: libtool BuildRequires: libudev-devel BuildRequires: libxslt BuildRequires: module-init-tools +BuildRequires: systemd >= 186 BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(systemd) >= 186 Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts Requires: systemd >= 186 From 7d65fec212295a4946f755d0548bed31d31c087fe7640c3926eb249bdf15a310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 4 Sep 2015 09:49:44 +0000 Subject: [PATCH 2/5] - OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=162 --- plymouth.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/plymouth.spec b/plymouth.spec index 62ab6be..3413018 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -74,6 +74,7 @@ BuildRequires: systemd >= 186 BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(systemd) Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts Requires: systemd >= 186 From 2cd47c3a8db8d9055c77b22461cf8407ae3987696aaffcff414952433226c656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 4 Sep 2015 09:55:06 +0000 Subject: [PATCH 3/5] - OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=163 --- plymouth.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plymouth.spec b/plymouth.spec index 3413018..30fb8d3 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -74,7 +74,7 @@ BuildRequires: systemd >= 186 BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(systemd) >= 186 Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts Requires: systemd >= 186 From a6935ef222e6cdc19b15795b4ced2f28103c1b2cf3e0640482576f45036a4e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 21 Sep 2015 12:15:27 +0000 Subject: [PATCH 4/5] - Use is_opensuse to simplify if/else block OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=164 --- plymouth.changes | 5 +++++ plymouth.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 4d55cf4..4c53e1b 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/plymouth.spec b/plymouth.spec index 30fb8d3..db1f7ca 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -367,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 %{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 From f1acb19f9a3f1d2c5fa73af77df9abdb6957ce5fe657185c076d69ef8d76f494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 21 Sep 2015 13:22:23 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=165 --- plymouth.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plymouth.spec b/plymouth.spec index db1f7ca..24f8c8b 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -367,7 +367,7 @@ sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c # Change the default theme -%if %{is_opensuse} +%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