forked from pool/systemd
Accepting request 60463 from Base:System
Accepted submit request 60463 from user kay_sievers OBS-URL: https://build.opensuse.org/request/show/60463 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=30
This commit is contained in:
Ruediger Oertel
Git OBS Bridge
commit
850db7549b
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ce6db8b30923c2508bd8bcfe957399939b23f958248a6460a6207396f0023fdf
|
||||
size 755192
|
||||
oid sha256:47448a4380dcff4bfae57c306f1fac6a3d989b233efd6aff013df635a2c7dc06
|
||||
size 756049
|
||||
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 8 19:10:06 CET 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- plymouth: move plymouth out of TARGET_FEDORA
|
||||
- build-sys: fix AC_COMPILE_IFELSE tests
|
||||
- build-sys: ensure selinux configure check follows logic of
|
||||
other optional features
|
||||
- build-sys: autodetect and use pkg-config for libselinux
|
||||
- dbus: use ControlGroup as property name to match config option
|
||||
- pam: optionally reset cgroup memberships for login sessions
|
||||
- load-fragment: properly parse Nice= value
|
||||
- automount: use unit_pending_inactive() where appropriate
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 8 17:40:29 CET 2011 - jeffm@suse.de
|
||||
|
||||
- Removed unecessary workaround for plymouth startup.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 4 21:24:11 CET 2011 - jeffm@suse.de
|
||||
|
||||
- Split plymouth support into systemd-plymouth package.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 22 14:42:34 CET 2011 - kay.sievers@novell.com
|
||||
|
||||
@ -84,6 +108,11 @@ Sat Jan 8 19:25:40 CET 2011 - kay.sievers@novell.com
|
||||
- util: invoke sync() implicitly on freeze()
|
||||
- tmpfiles: do no follow symlinks when cleaning up dirs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 28 22:08:28 CET 2010 - jeffm@suse.de
|
||||
|
||||
- Add support for building plymouth support with openSUSE
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 27 22:15:41 CET 2010 - kay.sievers@novell.com
|
||||
|
||||
|
||||
31
systemd.spec
31
systemd.spec
@ -21,7 +21,7 @@
|
||||
Name: systemd
|
||||
Url: http://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 17
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: GPLv2+
|
||||
Group: System/Base
|
||||
Summary: A System and Session Manager
|
||||
@ -42,7 +42,7 @@ Requires: util-linux >= 2.18.91
|
||||
Conflicts: mkinitrd < 2.6.0-5
|
||||
Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2
|
||||
Source1: systemd-rpmlintrc
|
||||
Patch42: 0001-Add-bootsplash-handling-for-password-dialogs.patch
|
||||
Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch
|
||||
|
||||
%description
|
||||
Systemd is a system and service manager, compatible with SysV and LSB
|
||||
@ -69,17 +69,28 @@ Group: System/Base
|
||||
Summary: System V init tools
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: sbin_init
|
||||
Conflicts: sysvinit
|
||||
Obsoletes: sysvinit
|
||||
Conflicts: upstart
|
||||
|
||||
%description sysvinit
|
||||
Drop-in replacement of System V init tools.
|
||||
|
||||
%package plymouth
|
||||
License: GPLv2+
|
||||
Group: System/Base
|
||||
Summary: Plymouth support for systemd
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: plymouth
|
||||
|
||||
%description plymouth
|
||||
Plymouth integration for systemd
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch42 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
# prevent pre-generated and distributed files from re-building
|
||||
find . -name "*.[1-8]" -exec touch '{}' \;
|
||||
touch src/systemadm.c
|
||||
@ -116,6 +127,8 @@ ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/localfs.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/crypto-early.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/crypto.service
|
||||
|
||||
(cd $RPM_BUILD_ROOT && find . -name '*plymouth*') > files.plymouth
|
||||
|
||||
%post
|
||||
/bin/systemctl daemon-reexec >/dev/null 2>&1 || :
|
||||
|
||||
@ -177,6 +190,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
|
||||
%{_datadir}/systemd
|
||||
%{_datadir}/pkgconfig/systemd.pc
|
||||
# Packaged in plymouth subpackage
|
||||
%exclude /lib/systemd/system/plymouth-*.service
|
||||
%exclude /lib/systemd/system/*.wants/plymouth-*.service
|
||||
%exclude /lib/systemd/system/systemd-ask-password-plymouth.*
|
||||
# Packaged in gtk subpackage
|
||||
%exclude %{_mandir}/man1/systemadm.1*
|
||||
# Packaged in sysvinit subpackage
|
||||
@ -207,6 +224,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/systemd-gnome-ask-password-agent
|
||||
%{_mandir}/man1/systemadm.1*
|
||||
|
||||
%files plymouth
|
||||
%defattr(-,root,root,-)
|
||||
/lib/systemd/system/plymouth-*.service
|
||||
/lib/systemd/system/*.wants/plymouth-*.service
|
||||
/lib/systemd/system/systemd-ask-password-plymouth.*
|
||||
|
||||
%files sysvinit
|
||||
%defattr(-,root,root,-)
|
||||
/sbin/init
|
||||
|
||||
Loading…
Reference in New Issue
Block a user