Raymond Wooninck 2012-06-29 11:54:05 +00:00 committed by Git OBS Bridge
parent 7c671412fb
commit 48f067476d

View File

@ -21,8 +21,6 @@
%define plymouth_libdir %{_libdir} %define plymouth_libdir %{_libdir}
%define plymouth_initrd_file /boot/initrd-plymouth.img %define plymouth_initrd_file /boot/initrd-plymouth.img
%define with_systemd 0
Name: plymouth Name: plymouth
#Version: %{tarversion}_git%{patchversion} #Version: %{tarversion}_git%{patchversion}
Version: 0.8.5.1 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" Plymouth. It it is a simple example theme the uses the "script"
plugin. 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 %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
@ -363,9 +348,9 @@ make %{?_smp_mflags}
rm -f %{buildroot}/%{_bindir}/rhgb-client rm -f %{buildroot}/%{_bindir}/rhgb-client
rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd
rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-populate-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 rm -f %{buildroot}/lib/systemd
%endif
#Link the plymouth client binary also to /bin until the move to /usr is completed #Link the plymouth client binary also to /bin until the move to /usr is completed
mkdir %{buildroot}/bin mkdir %{buildroot}/bin
@ -639,10 +624,4 @@ fi
%{_datadir}/plymouth/logo.png %{_datadir}/plymouth/logo.png
%{_datadir}/plymouth/themes/openSUSE/ %{_datadir}/plymouth/themes/openSUSE/
%if with_systemd
%files systemd
%defattr(-, root, root)
/lib/systemd/system/*
%endif
%changelog %changelog