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

Update plymouth.spec: obsolete plymouth render plugin for Xwindows, Since this plugin will not be used in the production environment and this modify will highly decrease the compilation of build requirements.

OBS-URL: https://build.opensuse.org/request/show/720040
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=235
This commit is contained in:
Cliff Zhao 2019-07-31 11:52:42 +00:00 committed by Git OBS Bridge
parent e095954318
commit 912da92afa
2 changed files with 32 additions and 6 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jul 31 11:36:57 UTC 2019 - Cliff Zhao <qzhao@suse.com>
- Update plymouth.spec: obsolete plymouth render plugin for
Xwindows, Since this plugin will not be used in the production
environment, and this modify will highly decrease the compilation
of build requirements.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 8 06:48:38 UTC 2019 - Cliff Zhao <qzhao@suse.com> Mon Jul 8 06:48:38 UTC 2019 - Cliff Zhao <qzhao@suse.com>

View File

@ -16,6 +16,11 @@
# #
# plymouth's Xwindow backend render will import many new gtk functions in build period,
# this will increase the compilation complexity. and the Xwindow render is not used in
# the production envronment.
%define support_Xwindow_backend 0
%define plymouthdaemon_execdir %{_sbindir} %define plymouthdaemon_execdir %{_sbindir}
%define plymouthclient_execdir %{_bindir} %define plymouthclient_execdir %{_bindir}
%define plymouth_libdir %{_libdir} %define plymouth_libdir %{_libdir}
@ -62,12 +67,16 @@ BuildRequires: update-desktop-files
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libsystemd) >= 186 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 0%{?support_Xwindow_backend} > 0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
%endif
#BuildRequires: translation-update-upstream #BuildRequires: translation-update-upstream
Recommends: %{name}-lang Recommends: %{name}-lang
@ -126,7 +135,9 @@ This package contains the libply library used by Plymouth.
Summary: Libraries and headers for writing Plymouth splash plugins Summary: Libraries and headers for writing Plymouth splash plugins
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: %{name} = %{version}
%if 0%{?support_Xwindow_backend} == 0
Requires: %{name}-x11-renderer = %{version} Requires: %{name}-x11-renderer = %{version}
%endif
Requires: libply-boot-client4 = %{version} Requires: libply-boot-client4 = %{version}
Requires: libply-splash-core4 = %{version} Requires: libply-splash-core4 = %{version}
Requires: libply-splash-graphics4 = %{version} Requires: libply-splash-graphics4 = %{version}
@ -146,14 +157,16 @@ Supplements: packageand(plymouth:dracut)
%description dracut %description dracut
This package contains utilities that integrate dracut with Plymouth This package contains utilities that integrate dracut with Plymouth
%package x11-renderer %if 0%{?support_Xwindow_backend} == 0
#%package x11-renderer
Summary: Plymouth X11 renderer Summary: Plymouth X11 renderer
Group: System/Base Group: System/Base
Requires: %{name} = %{version} Requires: %{name} = %{version}
%description x11-renderer #%description x11-renderer
This package provides the X11 renderer which allows to test plymouth This package provides the X11 renderer which allows to test plymouth
behavior on environments with a valid DISPLAY. behavior on environments with a valid DISPLAY.
%endif
%package scripts %package scripts
Summary: Plymouth related scripts Summary: Plymouth related scripts
@ -381,6 +394,9 @@ autoreconf -fiv
--without-rhgb-compat-link \ --without-rhgb-compat-link \
--with-boot-tty=/dev/tty7 \ --with-boot-tty=/dev/tty7 \
--with-shutdown-tty=/dev/tty1 \ --with-shutdown-tty=/dev/tty1 \
%if 0%{?support_Xwindow_backend} == 0
--disable-gtk \
%endif
--with-release-file=%{_sysconfdir}/os-release --with-release-file=%{_sysconfdir}/os-release
make %{?_smp_mflags} make %{?_smp_mflags}
@ -573,9 +589,11 @@ fi
%{_sbindir}/plymouth-set-default-theme %{_sbindir}/plymouth-set-default-theme
%{_libexecdir}/plymouth/plymouth-update-initrd %{_libexecdir}/plymouth/plymouth-update-initrd
%files x11-renderer %if 0%{?support_Xwindow_backend} == 0
%defattr(-,root,root,-) #%files x11-renderer
%{_libdir}/plymouth/renderers/x11* #%defattr(-,root,root,-)
#%{_libdir}/plymouth/renderers/x11*
%endif
%files plugin-label %files plugin-label
%defattr(-, root, root) %defattr(-, root, root)