From cde496bac08a35a88c74f1126ceb28b110a0ba10d41279ed9635e88a76a26aba Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Tue, 3 Sep 2019 14:08:56 +0000 Subject: [PATCH] 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 --- plymouth-0.9.4+git20190612+9359382.tar.xz | 3 - plymouth-0.9.5.tar.xz | 3 + plymouth.changes | 10 +++ plymouth.spec | 76 +++++++++++------------ 4 files changed, 50 insertions(+), 42 deletions(-) delete mode 100644 plymouth-0.9.4+git20190612+9359382.tar.xz create mode 100644 plymouth-0.9.5.tar.xz diff --git a/plymouth-0.9.4+git20190612+9359382.tar.xz b/plymouth-0.9.4+git20190612+9359382.tar.xz deleted file mode 100644 index 3eb2197..0000000 --- a/plymouth-0.9.4+git20190612+9359382.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c91205fa5302b2e6f1b8a0f26da56adcf9c997e28e13aaf1cb70ecaa82dc165 -size 6335256 diff --git a/plymouth-0.9.5.tar.xz b/plymouth-0.9.5.tar.xz new file mode 100644 index 0000000..ff38dde --- /dev/null +++ b/plymouth-0.9.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c6db79182db4a3cb4334425b2342da615554c6259d16a0d21441ca9605c8575 +size 6383533 diff --git a/plymouth.changes b/plymouth.changes index 2911ffb..feec75d 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 15 03:56:10 UTC 2019 - Cliff Zhao + +- 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 diff --git a/plymouth.spec b/plymouth.spec index 462a7dc..c0d790e 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -26,8 +26,8 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.9.4+git20190612+9359382 -Release: 0 +Version: 0.9.5 +Release: 20190814+git0d0f21a Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later Group: System/Base @@ -54,8 +54,11 @@ Patch7: 0003-fix_null_deref.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets +BuildRequires: gcc +BuildRequires: git BuildRequires: kernel-headers BuildRequires: libtool +BuildRequires: libtool BuildRequires: libxslt BuildRequires: module-init-tools BuildRequires: pkgconfig @@ -71,14 +74,11 @@ BuildRequires: pkgconfig(libsystemd) >= 186 BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(pango) >= 1.21.0 BuildRequires: pkgconfig(systemd) >= 186 - %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif -#BuildRequires: translation-update-upstream Recommends: %{name}-lang - Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts 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 after boot. -%package -n libply-boot-client4 +%package -n libply-boot-client5 Summary: Plymouth core library 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. -%package -n libply-splash-core4 +%package -n libply-splash-core5 Summary: Plymouth core library Group: Development/Libraries/C and C++ -%description -n libply-splash-core4 +%description -n libply-splash-core5 This package contains the libply-splash-core library used by graphical Plymouth splashes. -%package -n libply-splash-graphics4 +%package -n libply-splash-graphics5 Summary: Plymouth graphics libraries Group: Development/Libraries/C and C++ BuildRequires: libpng-devel -%description -n libply-splash-graphics4 +%description -n libply-splash-graphics5 This package contains the libply-splash-graphics library used by graphical Plymouth splashes. -%package -n libply4 +%package -n libply5 Summary: Plymouth core library 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. %package devel @@ -137,9 +137,9 @@ Requires: %{name} = %{version} %if %{with x11_renderer} Requires: %{name}-x11-renderer = %{version} %endif -Requires: libply-boot-client4 = %{version} -Requires: libply-splash-core4 = %{version} -Requires: libply-splash-graphics4 = %{version} +Requires: libply-boot-client5 = %{version} +Requires: libply-splash-core5 = %{version} +Requires: libply-splash-graphics5 = %{version} Requires: libply4 = %{version} Requires: pkgconfig @@ -363,12 +363,10 @@ This package contains the "bgrt" boot splash theme for Plymouth. %prep -%autosetup -p1 -#translation-update-upstream - +%autosetup -S git +autoreconf -ivf -Wno-portabilty # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c - # Change the default theme %if 0%{?is_opensuse} 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 %build -autoreconf -fiv %configure \ --enable-systemd-integration \ --enable-tracing \ @@ -385,6 +382,8 @@ autoreconf -fiv --disable-static \ --disable-gdm-transition \ --disable-upstart-monitoring \ + --disable-tests \ + --disable-libkms \ %if %{without x11_renderer} --disable-gtk \ %endif @@ -441,14 +440,14 @@ fi %posttrans %{?regenerate_initrd_posttrans} -%post -n libply-boot-client4 -p /sbin/ldconfig -%postun -n libply-boot-client4 -p /sbin/ldconfig -%post -n libply-splash-core4 -p /sbin/ldconfig -%postun -n libply-splash-core4 -p /sbin/ldconfig -%post -n libply-splash-graphics4 -p /sbin/ldconfig -%postun -n libply-splash-graphics4 -p /sbin/ldconfig -%post -n libply4 -p /sbin/ldconfig -%postun -n libply4 -p /sbin/ldconfig +%post -n libply-boot-client5 -p /sbin/ldconfig +%postun -n libply-boot-client5 -p /sbin/ldconfig +%post -n libply-splash-core5 -p /sbin/ldconfig +%postun -n libply-splash-core5 -p /sbin/ldconfig +%post -n libply-splash-graphics5 -p /sbin/ldconfig +%postun -n libply-splash-graphics5 -p /sbin/ldconfig +%post -n libply5 -p /sbin/ldconfig +%postun -n libply5 -p /sbin/ldconfig %post theme-spinfinity if [ $1 -eq 1 ]; then set -x @@ -546,7 +545,6 @@ fi %ghost %{_localstatedir}/lib/plymouth/boot-duration %{_unitdir}/* %ghost %{_localstatedir}/log/boot.log -%ghost %{_localstatedir}/spool/plymouth/boot.log /usr/share/locale/ %files dracut @@ -565,21 +563,21 @@ fi %{_libdir}/pkgconfig/ply-boot-client.pc %{_includedir}/plymouth-1 -%files -n libply-boot-client4 +%files -n libply-boot-client5 %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) -%{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) -%{_libdir}/libply-splash-graphics.so.4* +%{_libdir}/libply-splash-graphics.so.5* -%files -n libply4 +%files -n libply5 %defattr(-, root, root) -%{plymouth_libdir}/libply.so.4* +%{plymouth_libdir}/libply.so.5* %files scripts %defattr(-, root, root)