Accepting request 916125 from home:qzhao:branches:Base:System
Fix file /usr/bin from install of plymouth-0.9.5~git20210406.e554475-1.1.x86_64 conflicts with file from package filesystem-84.87-4.1.x86_64. OBS-URL: https://build.opensuse.org/request/show/916125 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=305
This commit is contained in:
parent
0b1ec851de
commit
8f792f6b45
@ -21,10 +21,6 @@
|
||||
%bcond_with x11_renderer
|
||||
|
||||
%global soversion 5
|
||||
%define plymouthdaemon_execdir %{_sbindir}
|
||||
%define plymouthclient_execdir %{_bindir}
|
||||
%define plymouth_libdir %{_libdir}
|
||||
%define plymouth_initrd_file /boot/initrd-plymouth.img
|
||||
|
||||
Name: plymouth
|
||||
Version: 0.9.5~git20210406.e554475
|
||||
@ -525,23 +521,18 @@ if [ $1 -eq 0 ]; then
|
||||
fi
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc AUTHORS NEWS README
|
||||
%dir %{_sysconfdir}/plymouth
|
||||
%ghost %{_sysconfdir}/plymouth/plymouthd.conf
|
||||
%dir %{_datadir}/plymouth
|
||||
%dir %{_datadir}/plymouth/themes
|
||||
%dir %{_datadir}/plymouth/themes/details
|
||||
%dir %{_datadir}/plymouth/themes/text
|
||||
%dir %{_localstatedir}/lib/plymouth
|
||||
%dir %{_sharedstatedir}/plymouth
|
||||
%dir %{_libdir}/plymouth
|
||||
%dir %{_libdir}/plymouth/renderers
|
||||
%dir %{_sysconfdir}/plymouth
|
||||
%ghost %{_sysconfdir}/plymouth/plymouthd.conf
|
||||
/etc/logrotate.d/bootlog
|
||||
%{plymouthdaemon_execdir}/plymouthd
|
||||
%{plymouthclient_execdir}/plymouth
|
||||
%if !0%{?usrmerged}
|
||||
/bin/plymouth
|
||||
%endif
|
||||
%{_sysconfdir}/logrotate.d/bootlog
|
||||
%{_bindir}/plymouth
|
||||
%{_sbindir}/plymouthd
|
||||
%{_libdir}/plymouth/details.so
|
||||
%{_libdir}/plymouth/text.so
|
||||
%{_libdir}/plymouth/renderers/drm*
|
||||
@ -557,7 +548,8 @@ fi
|
||||
%{_unitdir}/*
|
||||
%ghost %{_localstatedir}/log/boot.log
|
||||
%{_libexecdir}/plymouth/plymouthd-fd-escrow
|
||||
%{_bindir}
|
||||
%doc AUTHORS NEWS README
|
||||
%license COPYING
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
@ -569,8 +561,8 @@ fi
|
||||
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||
|
||||
%files devel
|
||||
%{plymouth_libdir}/libply.so
|
||||
%{plymouth_libdir}/libply-splash-core.so
|
||||
%{_libdir}/libply.so
|
||||
%{_libdir}/libply-splash-core.so
|
||||
%{_libdir}/libply-boot-client.so
|
||||
%{_libdir}/libply-splash-graphics.so
|
||||
%{_libdir}/pkgconfig/ply-splash-core.pc
|
||||
@ -582,13 +574,13 @@ fi
|
||||
%{_libdir}/libply-boot-client.so.%{soversion}*
|
||||
|
||||
%files -n libply-splash-core%{soversion}
|
||||
%{plymouth_libdir}/libply-splash-core.so.%{soversion}*
|
||||
%{_libdir}/libply-splash-core.so.%{soversion}*
|
||||
|
||||
%files -n libply-splash-graphics%{soversion}
|
||||
%{_libdir}/libply-splash-graphics.so.%{soversion}*
|
||||
|
||||
%files -n libply%{soversion}
|
||||
%{plymouth_libdir}/libply.so.%{soversion}*
|
||||
%{_libdir}/libply.so.%{soversion}*
|
||||
|
||||
%files scripts
|
||||
%dir %{_libexecdir}/plymouth
|
||||
|
Loading…
Reference in New Issue
Block a user