rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop plymouth files

Browse Source 
- Conflict with old plymouth
This commit is contained in:
Ray Strode 2012-06-06 20:47:49 +00:00
parent 6979d27f08
commit 1b8a7f0f16
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
systemd.spec
View File

@ -3,7 +3,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 185 Version: 185
Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} Release: 3%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Group: System Environment/Base Group: System Environment/Base
@ -75,6 +75,7 @@ Provides: systemd-units = %{version}-%{release}
Provides: udev = %{version} Provides: udev = %{version}
Obsoletes: udev < 183 Obsoletes: udev < 183
Conflicts: dracut < 019 Conflicts: dracut < 019
Conflicts: plymouth < 0.8.5.1
%description %description
systemd is a system and service manager for Linux, compatible with systemd is a system and service manager for Linux, compatible with
@ -226,6 +227,9 @@ rm -f %{buildroot}%{_prefix}/lib/sysctl.d/coredump.conf
# Let rsyslog read from /proc/kmsg for now # Let rsyslog read from /proc/kmsg for now
sed -i -e 's/\#ImportKernel=yes/ImportKernel=no/' %{buildroot}%{_sysconfdir}/systemd/journald.conf sed -i -e 's/\#ImportKernel=yes/ImportKernel=no/' %{buildroot}%{_sysconfdir}/systemd/journald.conf
# plymouth now ships these, remove them here until they get dropped in the next upstream systemd release
rm -f %{buildroot}%{_prefix}/lib/systemd/system/plymouth-*.service
%pre %pre
getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || : getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || : getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
@ -471,6 +475,10 @@ mv /etc/systemd/system/default.target.save /etc/systemd/system/default.target >/
%attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
%changelog %changelog
* Wed Jun 06 2012 Ray Strode <rstrode@redhat.com> 185-3
- Drop plymouth files
- Conflict with old plymouth
* Tue Jun 05 2012 Kay Sievers - 185-2 * Tue Jun 05 2012 Kay Sievers - 185-2
- selinux udev labeling fix - selinux udev labeling fix
- conflict with older dracut versions for new udev file names - conflict with older dracut versions for new udev file names