SHA256
1
0
forked from pool/plymouth

Accepting request 728014 from home:qzhao:branches:Base:System

- Update to version 0.9.5-20190814+git0d0f21a:
  * two-step: Deal with buggy firmware which does not pre-rotate the bgrt image
  * configure: bump so name
  * Internationalization: Add zh_HK and zh_TW translations.
  * ply-systemd-units: Drop attach-session functions.
  * fix (bsc#1105688, bsc#1129386, bsc#1134660).

OBS-URL: https://build.opensuse.org/request/show/728014
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=239
This commit is contained in:
Cliff Zhao 2019-09-03 14:08:56 +00:00 committed by Git OBS Bridge
parent f983786aea
commit cde496bac0
4 changed files with 50 additions and 42 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c91205fa5302b2e6f1b8a0f26da56adcf9c997e28e13aaf1cb70ecaa82dc165
size 6335256

3
plymouth-0.9.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c6db79182db4a3cb4334425b2342da615554c6259d16a0d21441ca9605c8575
size 6383533

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao <qzhao@suse.com>
- Update to version 0.9.5-20190814+git0d0f21a:
* two-step: Deal with buggy firmware which does not pre-rotate the bgrt image
* configure: bump so name
* Internationalization: Add zh_HK and zh_TW translations.
* ply-systemd-units: Drop attach-session functions.
* fix (bsc#1105688, bsc#1129386, bsc#1134660).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 5 05:58:21 UTC 2019 - Cliff Zhao <qzhao@suse.com> Mon Aug 5 05:58:21 UTC 2019 - Cliff Zhao <qzhao@suse.com>

View File

@ -26,8 +26,8 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img %define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth Name: plymouth
Version: 0.9.4+git20190612+9359382 Version: 0.9.5
Release: 0 Release: 20190814+git0d0f21a
Summary: Graphical Boot Animation and Logger Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Base Group: System/Base
@ -54,8 +54,11 @@ Patch7: 0003-fix_null_deref.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc
BuildRequires: git
BuildRequires: kernel-headers BuildRequires: kernel-headers
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libtool
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: module-init-tools BuildRequires: module-init-tools
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -71,14 +74,11 @@ BuildRequires: pkgconfig(libsystemd) >= 186
BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(pango) >= 1.21.0 BuildRequires: pkgconfig(pango) >= 1.21.0
BuildRequires: pkgconfig(systemd) >= 186 BuildRequires: pkgconfig(systemd) >= 186
%if %{with x11_renderer} %if %{with x11_renderer}
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
%endif %endif
#BuildRequires: translation-update-upstream
Recommends: %{name}-lang Recommends: %{name}-lang
Requires: %{name}-branding Requires: %{name}-branding
Requires: gnu-unifont-bitmap-fonts Requires: gnu-unifont-bitmap-fonts
Requires: systemd >= 186 Requires: systemd >= 186
@ -98,36 +98,36 @@ place of the text messages that normally get shown. Text
messages are instead redirected to a log file for viewing messages are instead redirected to a log file for viewing
after boot. after boot.
%package -n libply-boot-client4 %package -n libply-boot-client5
Summary: Plymouth core library Summary: Plymouth core library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%description -n libply-boot-client4 %description -n libply-boot-client5
This package contains the libply-boot-client library used by Plymouth. This package contains the libply-boot-client library used by Plymouth.
%package -n libply-splash-core4 %package -n libply-splash-core5
Summary: Plymouth core library Summary: Plymouth core library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%description -n libply-splash-core4 %description -n libply-splash-core5
This package contains the libply-splash-core library This package contains the libply-splash-core library
used by graphical Plymouth splashes. used by graphical Plymouth splashes.
%package -n libply-splash-graphics4 %package -n libply-splash-graphics5
Summary: Plymouth graphics libraries Summary: Plymouth graphics libraries
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
BuildRequires: libpng-devel BuildRequires: libpng-devel
%description -n libply-splash-graphics4 %description -n libply-splash-graphics5
This package contains the libply-splash-graphics library This package contains the libply-splash-graphics library
used by graphical Plymouth splashes. used by graphical Plymouth splashes.
%package -n libply4 %package -n libply5
Summary: Plymouth core library Summary: Plymouth core library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libply-boot-client4 = %{version} Requires: libply-boot-client5 = %{version}
%description -n libply4 %description -n libply5
This package contains the libply library used by Plymouth. This package contains the libply library used by Plymouth.
%package devel %package devel
@ -137,9 +137,9 @@ Requires: %{name} = %{version}
%if %{with x11_renderer} %if %{with x11_renderer}
Requires: %{name}-x11-renderer = %{version} Requires: %{name}-x11-renderer = %{version}
%endif %endif
Requires: libply-boot-client4 = %{version} Requires: libply-boot-client5 = %{version}
Requires: libply-splash-core4 = %{version} Requires: libply-splash-core5 = %{version}
Requires: libply-splash-graphics4 = %{version} Requires: libply-splash-graphics5 = %{version}
Requires: libply4 = %{version} Requires: libply4 = %{version}
Requires: pkgconfig Requires: pkgconfig
@ -363,12 +363,10 @@ This package contains the "bgrt" boot splash theme for
Plymouth. Plymouth.
%prep %prep
%autosetup -p1 %autosetup -S git
#translation-update-upstream autoreconf -ivf -Wno-portabilty
# replace builddate with patch0date # replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c
# Change the default theme # Change the default theme
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults
@ -377,7 +375,6 @@ sed -i -e 's/spinner/SLE/g' src/plymouthd.defaults
%endif %endif
%build %build
autoreconf -fiv
%configure \ %configure \
--enable-systemd-integration \ --enable-systemd-integration \
--enable-tracing \ --enable-tracing \
@ -385,6 +382,8 @@ autoreconf -fiv
--disable-static \ --disable-static \
--disable-gdm-transition \ --disable-gdm-transition \
--disable-upstart-monitoring \ --disable-upstart-monitoring \
--disable-tests \
--disable-libkms \
%if %{without x11_renderer} %if %{without x11_renderer}
--disable-gtk \ --disable-gtk \
%endif %endif
@ -441,14 +440,14 @@ fi
%posttrans %posttrans
%{?regenerate_initrd_posttrans} %{?regenerate_initrd_posttrans}
%post -n libply-boot-client4 -p /sbin/ldconfig %post -n libply-boot-client5 -p /sbin/ldconfig
%postun -n libply-boot-client4 -p /sbin/ldconfig %postun -n libply-boot-client5 -p /sbin/ldconfig
%post -n libply-splash-core4 -p /sbin/ldconfig %post -n libply-splash-core5 -p /sbin/ldconfig
%postun -n libply-splash-core4 -p /sbin/ldconfig %postun -n libply-splash-core5 -p /sbin/ldconfig
%post -n libply-splash-graphics4 -p /sbin/ldconfig %post -n libply-splash-graphics5 -p /sbin/ldconfig
%postun -n libply-splash-graphics4 -p /sbin/ldconfig %postun -n libply-splash-graphics5 -p /sbin/ldconfig
%post -n libply4 -p /sbin/ldconfig %post -n libply5 -p /sbin/ldconfig
%postun -n libply4 -p /sbin/ldconfig %postun -n libply5 -p /sbin/ldconfig
%post theme-spinfinity %post theme-spinfinity
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
set -x set -x
@ -546,7 +545,6 @@ fi
%ghost %{_localstatedir}/lib/plymouth/boot-duration %ghost %{_localstatedir}/lib/plymouth/boot-duration
%{_unitdir}/* %{_unitdir}/*
%ghost %{_localstatedir}/log/boot.log %ghost %{_localstatedir}/log/boot.log
%ghost %{_localstatedir}/spool/plymouth/boot.log
/usr/share/locale/ /usr/share/locale/
%files dracut %files dracut
@ -565,21 +563,21 @@ fi
%{_libdir}/pkgconfig/ply-boot-client.pc %{_libdir}/pkgconfig/ply-boot-client.pc
%{_includedir}/plymouth-1 %{_includedir}/plymouth-1
%files -n libply-boot-client4 %files -n libply-boot-client5
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libply-boot-client.so.4* %{_libdir}/libply-boot-client.so.5*
%files -n libply-splash-core4 %files -n libply-splash-core5
%defattr(-, root, root) %defattr(-, root, root)
%{plymouth_libdir}/libply-splash-core.so.4* %{plymouth_libdir}/libply-splash-core.so.5*
%files -n libply-splash-graphics4 %files -n libply-splash-graphics5
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libply-splash-graphics.so.4* %{_libdir}/libply-splash-graphics.so.5*
%files -n libply4 %files -n libply5
%defattr(-, root, root) %defattr(-, root, root)
%{plymouth_libdir}/libply.so.4* %{plymouth_libdir}/libply.so.5*
%files scripts %files scripts
%defattr(-, root, root) %defattr(-, root, root)