Hello community,
here is the log from the commit of package plymouth for openSUSE:12.2 checked
in at 2012-07-03 14:01:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/plymouth (Old)
and /work/SRC/openSUSE:12.2/.plymouth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:12.2/plymouth/plymouth.changes 2012-06-29
15:21:50.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.plymouth.new/plymouth.changes 2012-07-03
14:26:04.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jul 2 11:19:04 UTC 2012 - fcro...@suse.com
+
+- Provides systemd units, instead of relying on systemd to ship
+ them (bnc#769397).
+- Ensure plymouth--wait-quit.service conflicts with
+ graphical.target.
+
+-------------------------------------------------------------------
New:
----
stop-graphical.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.DklrEC/_old 2012-07-03 14:26:05.000000000 +0200
+++ /var/tmp/diff_new_pack.DklrEC/_new 2012-07-03 14:26:05.000000000 +0200
@@ -39,6 +39,8 @@
Patch2: plymouth-trace-lines
# PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes
Patch3: plymouth-fix-window-size
+# PATCH-OPENSUSE -- Ensure graphical.target is conflicting with
plymouth-wait-quit.service
+Patch4: stop-graphical.patch
BuildRequires: automake
BuildRequires: kernel-headers
BuildRequires: libtool
@@ -52,12 +54,14 @@
Requires: %{name}-branding
Requires: gnu-unifont-bitmap-fonts
Requires: suspend >= 0.80.20100129.1
-Requires: systemd-plymouth
+Requires: systemd >= 44
Requires(post): plymouth-scripts
Requires(post): mkinitrd
Suggests: plymouth-plugin-label
Provides: bootsplash = 3.4
Obsoletes: bootsplash <= 3.4
+Provides: systemd-plymouth = 44-10.2
+Obsoletes: systemd-plymouth <= 44-10.1
%description
Plymouth provides an attractive graphical boot animation in
@@ -316,6 +320,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
@@ -349,9 +354,6 @@
rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd
rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-populate-initrd
-# For now the systemd integration is still being delivered through the systemd
packages
-rm -rf %{buildroot}/lib/systemd
-
#Link the plymouth client binary also to /bin until the move to /usr is
completed
mkdir %{buildroot}/bin
(cd %{buildroot}/bin; ln -s ../usr/bin/plymouth)
@@ -507,6 +509,7 @@
%{_localstatedir}/spool/plymouth
%{_mandir}/man?/*
%ghost %{_localstatedir}/lib/plymouth/boot-duration
+/lib/systemd/system/*
%files devel
%defattr(-, root, root)
++++++ stop-graphical.patch ++++++
Index: plymouth-0.8.5.1/systemd-units/plymouth-quit-wait.service.in
===================================================================
--- plymouth-0.8.5.1.orig/systemd-units/plymouth-quit-wait.service.in
+++ plymouth-0.8.5.1/systemd-units/plymouth-quit-wait.service.in
@@ -1,6 +1,7 @@
[Unit]
Description=Wait for Plymouth Boot Screen to Quit
After=rc-local.service plymouth-start.service systemd-user-sessions.service
+Conflicts=graphical.target
[Service]
ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
