From 48f067476ddd87c06a4935a31f59b47e1f25fdca37dee172913acb4647bcee3a Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 29 Jun 2012 11:54:05 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=60 --- plymouth.spec | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/plymouth.spec b/plymouth.spec index 4696ecb..2b01d52 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -21,8 +21,6 @@ %define plymouth_libdir %{_libdir} %define plymouth_initrd_file /boot/initrd-plymouth.img -%define with_systemd 0 - Name: plymouth #Version: %{tarversion}_git%{patchversion} Version: 0.8.5.1 @@ -313,19 +311,6 @@ This package contains the "script" boot splash theme for Plymouth. It it is a simple example theme the uses the "script" plugin. -%if with_systemd -%package systemd -Summary: systemd integration for Plymouth -Group: System/Base -Requires: %{name} = %{version} -Requires: systemd -Obsoletes: systemd-plymouth <= 44.10.1 -Provides: systemd-plymouth = 44.10.2 - -%description systemd -This package contains the service files for the systemd integration -%endif - %prep %setup -q %patch1 -p1 @@ -363,9 +348,9 @@ make %{?_smp_mflags} rm -f %{buildroot}/%{_bindir}/rhgb-client rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-populate-initrd -%if with_systemd == 0 + +# For now the systemd integration is still being delivered through the systemd packages rm -f %{buildroot}/lib/systemd -%endif #Link the plymouth client binary also to /bin until the move to /usr is completed mkdir %{buildroot}/bin @@ -639,10 +624,4 @@ fi %{_datadir}/plymouth/logo.png %{_datadir}/plymouth/themes/openSUSE/ -%if with_systemd -%files systemd -%defattr(-, root, root) -/lib/systemd/system/* -%endif - %changelog