From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 21 Jun 2012 11:45:58 +0000 (+0000)
Subject: - plymouth services have been moved to plymouth, remove subpackage
X-Git-Tag: auto/th/systemd-185-2~2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=4bceec5f7f10572e7191945e325ce81b8372537e;p=packages%2Fsystemd.git

- plymouth services have been moved to plymouth, remove subpackage

Changed files:
    systemd.spec -> 1.187
---

diff --git a/systemd.spec b/systemd.spec
index 862d5da..41a84fa 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -7,7 +7,6 @@
 %bcond_without	audit		# without audit support
 %bcond_without	cryptsetup	# without cryptsetup support
 %bcond_without	pam		# PAM authentication support
-%bcond_without	plymouth	# do not install plymouth units
 %bcond_without	selinux		# without SELinux support
 %bcond_without	tcpd		# libwrap (tcp_wrappers) support
 
@@ -335,19 +334,6 @@ Ten pakiet zawiera generator usług inet udostępniający funkcjonalność
 serwisu rc-inetd i zastępujący osobny demon inet przez systemd i
 aktywację usług przez gniazda.
 
-%package plymouth
-Summary:	Plymouth support units for systemd
-Summary(pl.UTF-8):	Jednostki wspierające Plymouth dla systemd
-Group:		Base
-Requires:	%{name}-units = %{epoch}:%{version}-%{release}
-Requires:	plymouth
-
-%description plymouth
-Plymouth (graphical boot) support units for systemd.
-
-%description plymouth -l pl.UTF-8
-Jednostki wspierające Plymouth (graficzny start systemu) dla systemd.
-
 %package analyze
 Summary:	Tool for processing systemd profiling information
 Summary(pl.UTF-8):	Narzędzie do przetwarzania informacji profilujących systemd
@@ -650,9 +636,9 @@ patch -p1 -R <%{PATCH10}
 	%{__enable_disable audit} \
 	%{__enable_disable cryptsetup libcryptsetup} \
 	%{__enable_disable pam} \
-	%{__enable_disable plymouth} \
 	%{__enable_disable selinux} \
 	%{__enable_disable tcpd tcpwrap} \
+	--disable-plymouth \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-static \
@@ -887,12 +873,6 @@ fi
 %postun inetd
 %systemd_reload
 
-%post plymouth
-%systemd_reload
-
-%postun plymouth
-%systemd_reload
-
 %triggerpostun -n udev-core -- dev
 if [ "$2" = 0 ]; then
 	# need to kill and restart udevd as after obsoleting dev package the
@@ -1139,10 +1119,6 @@ fi
 %{systemdunitdir}/*.socket
 %{systemdunitdir}/*.target
 %{systemdunitdir}/*.timer
-%if %{with plymouth}
-%exclude %{systemdunitdir}/plymouth*.service
-%exclude %{systemdunitdir}/systemd-ask-password-plymouth.*
-%endif
 %dir %{systemdunitdir}/basic.target.wants
 %dir %{systemdunitdir}/dbus.target.wants
 %dir %{systemdunitdir}/final.target.wants
@@ -1182,29 +1158,6 @@ fi
 %attr(755,root,root) /lib/systemd/system-generators/pld-rc-inetd-generator
 %{systemdunitdir}/rc-inetd.service
 
-%if %{with plymouth}
-%files plymouth
-%defattr(644,root,root,755)
-%{systemdunitdir}/plymouth-halt.service
-%{systemdunitdir}/plymouth-kexec.service
-%{systemdunitdir}/plymouth-poweroff.service
-%{systemdunitdir}/plymouth-quit-wait.service
-%{systemdunitdir}/plymouth-quit.service
-%{systemdunitdir}/plymouth-read-write.service
-%{systemdunitdir}/plymouth-reboot.service
-%{systemdunitdir}/plymouth-start.service
-%{systemdunitdir}/systemd-ask-password-plymouth.path
-%{systemdunitdir}/systemd-ask-password-plymouth.service
-%config(noreplace,missingok) %{systemdunitdir}/halt.target.wants/plymouth-halt.service
-%config(noreplace,missingok) %{systemdunitdir}/kexec.target.wants/plymouth-kexec.service
-%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/plymouth-quit.service
-%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/plymouth-quit-wait.service
-%config(noreplace,missingok) %{systemdunitdir}/poweroff.target.wants/plymouth-poweroff.service
-%config(noreplace,missingok) %{systemdunitdir}/reboot.target.wants/plymouth-reboot.service
-%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/plymouth-read-write.service
-%config(noreplace,missingok) %{systemdunitdir}/sysinit.target.wants/plymouth-start.service
-%endif
-
 %files analyze
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/systemd-analyze