From 8b7cdfada0b061e0927243736ea63359a1e5854d917ec78c587fa70fa6ae942c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 27 Jul 2012 13:08:57 +0000 Subject: [PATCH] Accepting request 129091 from home:tittiatcoke:branches:Base:System the openSUSE theme has now moved to the correct openSUSE-branding package. OBS-URL: https://build.opensuse.org/request/show/129091 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=70 --- branding-suse.tar.xz | 3 -- opensuse-logo.png | 3 -- plymouth.changes | 5 ++++ plymouth.spec | 69 ++------------------------------------------ suse-initrd-support | 3 +- 5 files changed, 9 insertions(+), 74 deletions(-) delete mode 100644 branding-suse.tar.xz delete mode 100644 opensuse-logo.png diff --git a/branding-suse.tar.xz b/branding-suse.tar.xz deleted file mode 100644 index 4fa6e15..0000000 --- a/branding-suse.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96f6ec0461fdd9eae2a3845e97a07aa35a354e63eb9dd5cc10391360fec0de67 -size 1417396 diff --git a/opensuse-logo.png b/opensuse-logo.png deleted file mode 100644 index dedfc4a..0000000 --- a/opensuse-logo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c24719f10b9cee80df29c6c36a809bd818dde764349a8b3922361cb00099e39 -size 70317 diff --git a/plymouth.changes b/plymouth.changes index c96af23..8e6684b 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 26 13:33:28 UTC 2012 - tittiatcoke@gmail.com + +- Move the openSUSE branding to its rightful place + ------------------------------------------------------------------- Fri Jul 20 08:57:25 UTC 2012 - fcrozat@suse.com diff --git a/plymouth.spec b/plymouth.spec index 2521584..0c15999 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -31,8 +31,6 @@ Group: System/Base Url: http://freedesktop.org/software/plymouth/releases Source0: %{name}-%{version}.tar.bz2 Source1: boot-duration -Source2: opensuse-logo.png -Source3: branding-suse.tar.xz # PATCH-OPENSUSE -- Support the openSUSE initrd Patch1: suse-initrd-support # PATCH-OPENSUSE -- Add line numbers to tracing output @@ -237,34 +235,6 @@ Plymouth. It features an extensible, scriptable boot splash language that simplifies the process of designing custom boot splash themes. -%package branding-upstream -Summary: Plymouth default theme -Group: System/Base -Requires: plymouth-theme-solar = %{version} -Requires(pre): %{name} -Supplements: packageand(plymouth:branding-upstream) -Provides: %{name}-branding = %{version} -Conflicts: otherproviders(plymouth-branding) -BuildArch: noarch - -%description branding-upstream -This metapackage tracks the Plymouth default theme from upstream. - -%package branding-openSUSE -Summary: Plymouth openSUSE theme -Group: System/Base -Requires: plymouth-plugin-label = %{version} -Requires: plymouth-plugin-script = %{version} -Requires(post): %{name}-scripts -Supplements: packageand(plymouth:branding-openSUSE) -Provides: %{name}-branding = %{version} -Conflicts: otherproviders(plymouth-branding) -BuildArch: noarch - -%description branding-openSUSE -This metapackage tracks the Plymouth openSUSE branding. - - %package theme-fade-in Summary: Plymouth "Fade-In" theme Group: System/Base @@ -347,7 +317,6 @@ autoreconf -fiv %configure --disable-static \ --enable-systemd-integration \ --enable-tracing --disable-tests \ - --with-logo=%{_datadir}/plymouth/logo.png \ --with-background-start-color-stop=0x1A3D1F \ --with-background-end-color-stop=0x4EA65C \ --with-background-color=0x3391cd \ @@ -384,19 +353,12 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth mkdir -p %{buildroot}%{_localstatedir}/run/plymouth cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth -cp %{SOURCE2} %{buildroot}%{_datadir}/plymouth/logo.png cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouth.conf mkdir -p %{buildroot}/lib/mkinitrd/scripts install -t %{buildroot}/lib/mkinitrd/scripts \ scripts/{setup,boot}-plymouth*.sh -# Unpack the openSUSE branding. This branding is temporarily in this package -# until the official one is created/accepted in the main branding package -pushd %{buildroot}%{_datadir}/plymouth/themes/ -tar -Jxf %{SOURCE3} -popd - %clean rm -rf %{buildroot} @@ -482,22 +444,6 @@ if [ $1 -eq 0 ]; then fi fi -%post branding-openSUSE -if [ $1 -eq 1 -a ! -e /.buildenv ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme -R openSUSE - fi -fi - -%postun branding-openSUSE -if [ $1 -eq 0 ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then - %{_sbindir}/plymouth-set-default-theme -R --reset - fi -fi - %files %defattr(-, root, root) %doc AUTHORS NEWS README @@ -509,7 +455,8 @@ fi %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth -%{_sysconfdir}/plymouth/plymouth.conf +%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf +%config(noreplace) %{_sysconfdir}/plymouth/plymouth.conf %{plymouthdaemon_execdir}/plymouthd %{plymouthclient_execdir}/plymouth /bin/plymouth @@ -521,6 +468,7 @@ fi %{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/plymouthd.defaults +%{_datadir}/plymouth/bizcom.png %ghost %{_localstatedir}/run/plymouth %{_localstatedir}/spool/plymouth %{_mandir}/man?/* @@ -632,15 +580,4 @@ fi %{_datadir}/plymouth/themes/script/script.script %{_datadir}/plymouth/themes/script/script.plymouth -%files branding-upstream -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf -%{_datadir}/plymouth/logo.png - -%files branding-openSUSE -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf -%{_datadir}/plymouth/logo.png -%{_datadir}/plymouth/themes/openSUSE/ - %changelog diff --git a/suse-initrd-support b/suse-initrd-support index e162953..8c2098f 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -57,7 +57,7 @@ Index: plymouth-0.8.4/scripts/setup-plymouth.sh.in =================================================================== --- /dev/null +++ plymouth-0.8.4/scripts/setup-plymouth.sh.in -@@ -0,0 +1,61 @@ +@@ -0,0 +1,60 @@ +#!/bin/bash +# +#%stage: setup @@ -82,7 +82,6 @@ Index: plymouth-0.8.4/scripts/setup-plymouth.sh.in + /usr/share/plymouth/themes/details/details.plymouth \ + /usr/share/plymouth/plymouthd.defaults \ + /usr/share/plymouth/themes/${THEME}/* \ -+ /usr/share/plymouth/logo.png \ + /etc/plymouth/plymouthd.conf \ + /usr/share/fonts/uni/unifont.pcf.gz \ + /etc/fonts/fonts.conf \