rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

- Do not ship plymouth units, they are shipped by plymouth package

Browse Source 
now (bnc#769397).

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=280
This commit is contained in:
Frederic Crozat 2012-07-02 12:13:41 +00:00 committed by Git OBS Bridge
parent 87d51f505a
commit f6296a9bbc
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 2 11:32:23 UTC 2012 - fcrozat@suse.com
- Do not ship plymouth units, they are shipped by plymouth package
now (bnc#769397).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 7 13:14:40 UTC 2012 - fcrozat@suse.com Thu Jun 7 13:14:40 UTC 2012 - fcrozat@suse.com

23
systemd.spec
View File

@ -82,7 +82,6 @@ Patch31: lock-opensuse.patch
Patch33: crypt-loop-file.patch Patch33: crypt-loop-file.patch
Patch36: sysctl-modules.patch Patch36: sysctl-modules.patch
Patch38: dm-lvm-after-local-fs-pre-target.patch Patch38: dm-lvm-after-local-fs-pre-target.patch
Patch39: correct_plymouth_paths_and_conflicts.patch
Patch41: 0001-add-sparse-support-to-detect-endianness-bug.patch Patch41: 0001-add-sparse-support-to-detect-endianness-bug.patch
# Upstream First - Policy: # Upstream First - Policy:
@ -125,15 +124,6 @@ Provides: sysvinit:/sbin/init
%description sysvinit %description sysvinit
Drop-in replacement of System V init tools. Drop-in replacement of System V init tools.
%package plymouth
Summary: Plymouth support for systemd
Group: System/Base
Requires: %{name} = %{version}
Requires: plymouth
%description plymouth
Plymouth integration for systemd
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
@ -152,7 +142,6 @@ Plymouth integration for systemd
%patch33 -p1 %patch33 -p1
%patch36 -p1 %patch36 -p1
%patch38 -p1 %patch38 -p1
%patch39 -p1
%patch40 -p1 %patch40 -p1
%patch41 -p1 %patch41 -p1
%patch42 -p1 %patch42 -p1
@ -166,6 +155,7 @@ autoreconf -fiv
find . -name "*.[1-8]" -exec touch '{}' \; find . -name "*.[1-8]" -exec touch '{}' \;
touch src/systemadm.c touch src/systemadm.c
export V=1 export V=1
# disable plymouth at configure time, units are shipped in plymouth package now
%configure \ %configure \
--with-distro=suse \ --with-distro=suse \
--docdir=%{_docdir}/systemd \ --docdir=%{_docdir}/systemd \
@ -173,6 +163,7 @@ export V=1
--with-pamlibdir=/%{_lib}/security \ --with-pamlibdir=/%{_lib}/security \
--enable-split-usr \ --enable-split-usr \
--disable-gtk \ --disable-gtk \
--disable-plymouth \
CFLAGS="%{optflags}" CFLAGS="%{optflags}"
make %{?_smp_mflags} make %{?_smp_mflags}
@ -350,10 +341,6 @@ rm -rf %{buildroot}
%{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions
%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
%{_datadir}/systemd %{_datadir}/systemd
# 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 # Packaged in gtk subpackage
%exclude %{_mandir}/man1/systemadm.1* %exclude %{_mandir}/man1/systemadm.1*
# Packaged in sysvinit subpackage # Packaged in sysvinit subpackage
@ -404,12 +391,6 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libsystemd-id128.pc %{_libdir}/pkgconfig/libsystemd-id128.pc
%{_libdir}/pkgconfig/libsystemd-journal.pc %{_libdir}/pkgconfig/libsystemd-journal.pc
%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 %files sysvinit
%defattr(-,root,root,-) %defattr(-,root,root,-)
/sbin/init /sbin/init