This commit is contained in:
Raymond Wooninck
Git OBS Bridge
parent
f4a55bd31e
commit
ac02e540f5
3
branding-suse.tar.xz
Normal file
3
branding-suse.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d181283ca5593658334217083abb7676b7a6c0b89da94104c71cb9708a5a263e
|
||||
size 1426812
|
||||
@ -1,19 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 29 09:36:32 UTC 2012 - tittiatcoke@gmail.com
|
||||
Thu Apr 5 14:44:25 UTC 2012 - tittiatcoke@gmail.com
|
||||
|
||||
- Ensure that both grub and grub2 are adjusted with regards to the
|
||||
splash parameter. Running grub2-mkconfig to have the right
|
||||
configuration.
|
||||
- Installation of themes are not causing any reset of the selected
|
||||
default theme anymore. Now this only happens when a theme is
|
||||
installed and the default theme is set to TEXT.
|
||||
- Updated the initrd patch to include the necessary files to have
|
||||
text support (e.g. LUKS passphrase question, etc)
|
||||
|
||||
- Temporarily added a openSUSE plymouth theme
|
||||
(plymouth-branding-openSUSE) to have a better integration with
|
||||
12.2.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 25 09:03:44 UTC 2012 - tittiatcoke@gmail.com
|
||||
|
||||
- Update to the official release of 0.8.4
|
||||
* Bugfix: Use /dev/fb0 instead of /dev/fb, this resolves the
|
||||
issue of not showing the splash during shutdown
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 9 12:11:44 UTC 2012 - tittiatcoke@gmail.com
|
||||
|
||||
@ -35,6 +35,7 @@ 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
|
||||
@ -45,6 +46,7 @@ BuildRequires: automake
|
||||
BuildRequires: kernel-headers
|
||||
BuildRequires: libtool
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xz
|
||||
BuildRequires: pkgconfig(libdrm)
|
||||
BuildRequires: pkgconfig(libdrm_intel)
|
||||
BuildRequires: pkgconfig(libdrm_nouveau)
|
||||
@ -222,6 +224,19 @@ Conflicts: otherproviders(plymouth-branding)
|
||||
%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-script = %{version}
|
||||
Supplements: packageand(plymouth:branding-openSUSE)
|
||||
Provides: %{name}-branding = %{version}
|
||||
BuildArch: noarch
|
||||
Conflicts: otherproviders(plymouth-branding)
|
||||
|
||||
%description branding-openSUSE
|
||||
This metapackage tracks the Plymouth openSUSE branding.
|
||||
|
||||
|
||||
%package theme-fade-in
|
||||
Summary: Plymouth "Fade-In" theme
|
||||
Group: System/Base
|
||||
@ -339,6 +354,12 @@ 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}
|
||||
|
||||
@ -442,6 +463,26 @@ if [ $1 -eq 0 ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
%post branding-openSUSE
|
||||
if [ $1 -eq 1 ]; then
|
||||
export LIB=%{_libdir}
|
||||
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
|
||||
%{_sbindir}/plymouth-set-default-theme SuSE
|
||||
if [ -x /sbin/mkinitrd ]; then
|
||||
/sbin/mkinitrd
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
%postun branding-openSUSE
|
||||
if [ $1 -eq 0 ]; then
|
||||
export lib=%{_libdir}
|
||||
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "SuSE" ]; then
|
||||
%{_sbindir}/plymouth-set-default-theme --reset
|
||||
/sbin/mkinitrd
|
||||
fi
|
||||
fi
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%doc AUTHORS NEWS README
|
||||
@ -575,4 +616,10 @@ fi
|
||||
%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/SuSE/
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,13 +1,6 @@
|
||||
---
|
||||
configure.ac | 1
|
||||
scripts/boot-plymouth.chroot.sh | 7 ++++++
|
||||
scripts/boot-plymouth.sh | 8 +++++++
|
||||
scripts/setup-plymouth.sh.in | 41 ++++++++++++++++++++++++++++++++++++++++
|
||||
4 files changed, 57 insertions(+)
|
||||
|
||||
--- plymouth-0.8.3_git201110131555.orig/configure.ac
|
||||
+++ plymouth-0.8.3_git201110131555/configure.ac
|
||||
@@ -440,6 +440,7 @@ AC_CONFIG_FILES([Makefile
|
||||
--- plymouth-0.8.4/configure.ac 2012-02-06 22:01:36.000000000 +0100
|
||||
+++ new/configure.ac 2012-04-03 10:28:00.658536991 +0200
|
||||
@@ -440,6 +440,7 @@
|
||||
themes/spinner/Makefile
|
||||
themes/script/Makefile
|
||||
images/Makefile
|
||||
@ -16,7 +9,7 @@
|
||||
scripts/plymouth-populate-initrd
|
||||
scripts/plymouth-set-default-theme
|
||||
--- /dev/null
|
||||
+++ plymouth-0.8.3_git201110131555/scripts/boot-plymouth.chroot.sh
|
||||
+++ new/scripts/boot-plymouth.chroot.sh 2012-04-03 10:28:00.659536992 +0200
|
||||
@@ -0,0 +1,7 @@
|
||||
+#!/bin/bash
|
||||
+#%stage: setup
|
||||
@ -26,7 +19,7 @@
|
||||
+
|
||||
+plymouth update-root-fs --new-root-dir=/root
|
||||
--- /dev/null
|
||||
+++ plymouth-0.8.3_git201110131555/scripts/boot-plymouth.sh
|
||||
+++ new/scripts/boot-plymouth.sh 2012-04-03 10:28:00.659536992 +0200
|
||||
@@ -0,0 +1,10 @@
|
||||
+#!/bin/bash
|
||||
+#%stage: boot
|
||||
@ -39,8 +32,8 @@
|
||||
+
|
||||
+plymouth show-splash
|
||||
--- /dev/null
|
||||
+++ plymouth-0.8.3_git201110131555/scripts/setup-plymouth.sh.in
|
||||
@@ -0,0 +1,41 @@
|
||||
+++ new/scripts/setup-plymouth.sh.in 2012-04-03 11:11:44.656337240 +0200
|
||||
@@ -0,0 +1,68 @@
|
||||
+#!/bin/bash
|
||||
+#
|
||||
+#%stage: setup
|
||||
@ -70,6 +63,7 @@
|
||||
+
|
||||
+PLUGINS="${PLUGIN_PATH}/details.so \
|
||||
+ ${PLUGIN_PATH}/text.so \
|
||||
+ ${PLUGIN_PATH}/label.so \
|
||||
+ ${PLUGIN_PATH}/${MODULE}.so \
|
||||
+ ${PLUGIN_PATH}/renderers/drm.so \
|
||||
+ ${PLUGIN_PATH}/renderers/frame-buffer.so"
|
||||
@ -82,3 +76,29 @@
|
||||
+ mkdir -p $tmp_mnt/$(dirname $plugin)
|
||||
+ cp_bin $plugin $tmp_mnt/$plugin
|
||||
+done
|
||||
+
|
||||
+# copy files for font rendering
|
||||
+_libdir=`rpm --eval '%{_lib}'`
|
||||
+if [ "$_libdir" == "lib64" ];
|
||||
+ then
|
||||
+ _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'`
|
||||
+ _pangomod="/etc/pango/pango64.modules"
|
||||
+ else
|
||||
+ _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'`
|
||||
+ _pangomod="/etc/pango/pango.modules"
|
||||
+fi
|
||||
+
|
||||
+FONTS="/usr/share/fonts/truetype/DejaVuSerif.ttf \
|
||||
+ /usr/share/fonts/truetype/DejaVuSans.ttf \
|
||||
+ /etc/fonts/fonts.conf \
|
||||
+ /etc/fonts/conf.d/60-latin.conf \
|
||||
+ ${_pangomod} \
|
||||
+ ${_pangodir}/pango-basic-fc.so \
|
||||
+ /usr/${_libdir}/libpango-1.0.so.0 \
|
||||
+ /usr/${_libdir}/libpangoft2-1.0.so.0 \
|
||||
+ /usr/${_libdir}/libpangocairo-1.0.so.0 "
|
||||
+
|
||||
+for font in $FONTS; do
|
||||
+ install -D $font $tmp_mnt/$font
|
||||
+done
|
||||
+mkdir -p $tmp_mnt/var/cache/fontconfig
|
||||
|
||||
Loading…
Reference in New Issue
Block a user