Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2012-11-08 21:52:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2012-10-17 07:21:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2012-11-08 21:52:02.000000000 +0100 @@ -1,0 +2,35 @@ +Tue Nov 6 18:07:29 UTC 2012 - [email protected] + +- Provide the scripts to integrate Plymouth in dracut as a + separate package. + +- Added patch (plymouth-dracut-path.patch) to correct the paths + inside the specific plymouth-dracut scripts + +------------------------------------------------------------------- +Mon Nov 5 17:35:39 UTC 2012 - [email protected] + +- Update to an slightly newer git snapshot to fix regression + from 0.8.8 + +------------------------------------------------------------------- +Thu Nov 1 21:36:22 UTC 2012 - [email protected] + +- Version 0.8.8 + +* main: Try to own socket before anything else +* main: silently succeed if plymouthd is started a second time +* service: start plymouthd unconditionally +* x11: make window fullscreen by default +* x11: only create windows when necessary + +------------------------------------------------------------------- +Thu Nov 1 20:35:34 UTC 2012 - [email protected] + +- plymoith-sd-notforking.patch: Make plymouthd to not use + Service type "forking" + +- ply-sdunitdir.patch: Must install units in %{_unitdir} as + returned by pkg-config not in a hardcoded location. + +------------------------------------------------------------------- Old: ---- plymouth-0.8.7.tar.bz2 New: ---- ply-sdunitdir.patch plymoith-sd-notforking.patch plymouth-0.8.8_git201211022126.tar.xz plymouth-dracut-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.Qyjk2k/_old 2012-11-08 21:52:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Qyjk2k/_new 2012-11-08 21:52:04.000000000 +0100 @@ -22,13 +22,13 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.8.7 +Version: 0.8.8_git201211022126 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0+ Group: System/Base Url: http://freedesktop.org/software/plymouth/releases -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.xz Source1: boot-duration # PATCH-OPENSUSE -- Support the openSUSE initrd Patch1: suse-initrd-support @@ -44,9 +44,13 @@ Patch7: plymouth-udevadm-path.patch # PATCH-OPENSUSE -- Remove tag not understood by systemd v44 Patch8: systemd-no-warning.patch +# PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin +Patch9: plymouth-dracut-path.patch Patch10: 0001-Some-greenish-openSUSE-colors.patch # PATCH-FIX-UPSTREAM -- Plymouth will check itself if it is already running (bnc#780976) Patch11: plymouth-remove-pid-file.patch +Patch12: plymoith-sd-notforking.patch +Patch13: ply-sdunitdir.patch BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool @@ -60,6 +64,7 @@ BuildRequires: pkgconfig(libdrm_nouveau) BuildRequires: pkgconfig(libdrm_radeon) BuildRequires: pkgconfig(libkms) +BuildRequires: pkgconfig(systemd) Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts %ifarch %ix86 x86_64 ppc ppc64 @@ -137,6 +142,15 @@ This package contains utilities that integrate with Plymouth including a boot log viewing application. +%package dracut +Summary: Plymouth related utilities for dracut +Group: System/Base +Supplements: packageand(plymouth:dracut) +Requires: %{name} = %{version} + +%description dracut +This package contains utilities that integrate dracut with Plymouth + %package x11-renderer Summary: Plymouth X11 renderer Group: System/Base @@ -308,9 +322,11 @@ %endif %patch7 -p1 %patch8 -p1 +%patch9 -p0 %patch10 -p1 #patch11 -p1 - +%patch12 +%patch13 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c @@ -334,14 +350,12 @@ --without-gdm-autostart-file \ --with-release-file=/etc/os-release -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install rm -f %{buildroot}/%{_bindir}/rhgb-client -rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd -rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-populate-initrd #Link the plymouth client binary also to /bin until the move to /usr is completed mkdir %{buildroot}/bin @@ -476,7 +490,12 @@ %{_localstatedir}/spool/plymouth %{_mandir}/man?/* %ghost %{_localstatedir}/lib/plymouth/boot-duration -/lib/systemd/system/* +%{_unitdir}/* + +%files dracut +%defattr(-, root, root) +%{_libexecdir}/plymouth/plymouth-populate-initrd +%{_libexecdir}/plymouth/plymouth-generate-initrd %files devel %defattr(-, root, root) ++++++ ply-sdunitdir.patch ++++++ --- configure.ac.orig +++ configure.ac @@ -254,7 +254,7 @@ AM_CONDITIONAL(ENABLE_SYSTEMD_INTEGRATIO if test x$enable_systemd_integration = xyes; then AC_DEFINE(PLY_ENABLE_SYSTEMD_INTEGRATION, 1, [Coordinate boot up with systemd]) - SYSTEMD_UNIT_DIR=/lib/systemd/system + SYSTEMD_UNIT_DIR=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) AC_SUBST(SYSTEMD_UNIT_DIR) fi ++++++ plymoith-sd-notforking.patch ++++++ --- systemd-units/plymouth-halt.service.in.orig +++ systemd-units/plymouth-halt.service.in @@ -6,6 +6,5 @@ DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 [Service] -ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session +ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash -Type=forking --- systemd-units/plymouth-kexec.service.in.orig +++ systemd-units/plymouth-kexec.service.in @@ -6,6 +6,5 @@ DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 [Service] -ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session +ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash -Type=forking --- systemd-units/plymouth-poweroff.service.in.orig +++ systemd-units/plymouth-poweroff.service.in @@ -6,6 +6,5 @@ DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 [Service] -ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session +ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash -Type=forking --- systemd-units/plymouth-reboot.service.in.orig +++ systemd-units/plymouth-reboot.service.in @@ -6,6 +6,5 @@ DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 [Service] -ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session +ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash -Type=forking --- systemd-units/plymouth-start.service.in.orig +++ systemd-units/plymouth-start.service.in @@ -7,8 +7,7 @@ Before=systemd-ask-password-plymouth.ser ConditionKernelCommandLine=!plymouth.enable=0 [Service] -ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session +ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=boot --attach-to-session ExecStartPost=-/sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash -Type=forking KillMode=none SendSIGKILL=no ++++++ plymouth-dracut-path.patch ++++++ --- scripts/plymouth-populate-initrd.in 2012-08-21 01:25:52.000000000 +0200 +++ scripts/plymouth-populate-initrd.in 2012-11-01 18:27:22.760029873 +0100 @@ -372,8 +372,8 @@ [ -z "$INITRDDIR" ] && usage error mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes -inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd -inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth +inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd +inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
