forked from pool/systemd
Accepting request 184325 from home:fcrozat:branches:Base:System
- Move systemd-journal-gateway to subpackage to lower dependencies in default install. OBS-URL: https://build.opensuse.org/request/show/184325 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=417
This commit is contained in:
Git OBS Bridge
parent
37527bb454
commit
4060366bbd
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 25 12:35:29 UTC 2013 - fcrozat@suse.com
|
||||
|
||||
- Move systemd-journal-gateway to subpackage to lower dependencies
|
||||
in default install.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 23 01:32:38 UTC 2013 - crrodriguez@opensuse.org
|
||||
|
||||
|
||||
@ -354,6 +354,18 @@ is logged to /var/log/messages. Please check whether that's worth
|
||||
a bug report then.
|
||||
This package marks the installation to not use syslog but only the journal.
|
||||
|
||||
%package journal-gateway
|
||||
Summary: Gateway for serving journal events over the network using HTTP
|
||||
License: LGPL-2.1+
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
%description journal-gateway
|
||||
systemd-journal-gatewayd serves journal events over the network using HTTP.
|
||||
|
||||
%endif
|
||||
|
||||
%prep
|
||||
@ -590,8 +602,6 @@ rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd
|
||||
|
||||
%pre
|
||||
getent group systemd-journal >/dev/null || groupadd -r systemd-journal || :
|
||||
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :
|
||||
getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || :
|
||||
exit 0
|
||||
|
||||
%post
|
||||
@ -740,6 +750,21 @@ fi
|
||||
|
||||
%postun -n nss-myhostname -p /sbin/ldconfig
|
||||
|
||||
%pre journal-gateway
|
||||
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :
|
||||
getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || :
|
||||
%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
|
||||
exit 0
|
||||
|
||||
%post journal-gateway
|
||||
%service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
|
||||
|
||||
%preun journal-gateway
|
||||
%service_del_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
|
||||
|
||||
%postun journal-gateway
|
||||
%service_del_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
|
||||
|
||||
%endif
|
||||
|
||||
%files
|
||||
@ -791,6 +816,7 @@ fi
|
||||
%exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service
|
||||
%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.*
|
||||
%exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service
|
||||
%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
|
||||
%{_prefix}/lib/systemd/system/*.automount
|
||||
%{_prefix}/lib/systemd/system/*.service
|
||||
%{_prefix}/lib/systemd/system/*.slice
|
||||
@ -803,6 +829,7 @@ fi
|
||||
%{_prefix}/lib/systemd/user/*.target
|
||||
%{_prefix}/lib/systemd/user/*.service
|
||||
%exclude %{_prefix}/lib/systemd/systemd-udevd
|
||||
%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd
|
||||
%{_prefix}/lib/systemd/systemd-*
|
||||
%{_prefix}/lib/systemd/systemd
|
||||
%dir %{_prefix}/lib/systemd/catalog
|
||||
@ -880,6 +907,7 @@ fi
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
|
||||
%exclude %{_datadir}/systemd/gatewayd
|
||||
%{_datadir}/systemd
|
||||
|
||||
%if ! 0%{?bootstrap}
|
||||
@ -892,7 +920,7 @@ fi
|
||||
%exclude %{_mandir}/man8/telinit.8*
|
||||
%exclude %{_mandir}/man8/runlevel.8*
|
||||
%exclude %{_mandir}/man*/*udev*.[0-9]*
|
||||
|
||||
%exclude %{_mandir}/man8/systemd-journal-gatewayd.*
|
||||
%{_mandir}/man1/*.1*
|
||||
%{_mandir}/man3/*.3*
|
||||
%{_mandir}/man5/*.5*
|
||||
@ -1056,6 +1084,12 @@ fi
|
||||
%{_sbindir}/nss-myhostname-config
|
||||
/%{_lib}/*nss_myhostname*
|
||||
|
||||
%files journal-gateway
|
||||
%defattr(-, root, root)
|
||||
%{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
|
||||
%{_prefix}/lib/systemd/systemd-journal-gatewayd
|
||||
%{_mandir}/man8/systemd-journal-gatewayd.*
|
||||
%{_datadir}/systemd/gatewayd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 25 12:35:29 UTC 2013 - fcrozat@suse.com
|
||||
|
||||
- Move systemd-journal-gateway to subpackage to lower dependencies
|
||||
in default install.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 23 01:32:38 UTC 2013 - crrodriguez@opensuse.org
|
||||
|
||||
|
||||
40
systemd.spec
40
systemd.spec
@ -349,6 +349,18 @@ is logged to /var/log/messages. Please check whether that's worth
|
||||
a bug report then.
|
||||
This package marks the installation to not use syslog but only the journal.
|
||||
|
||||
%package journal-gateway
|
||||
Summary: Gateway for serving journal events over the network using HTTP
|
||||
License: LGPL-2.1+
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
%description journal-gateway
|
||||
systemd-journal-gatewayd serves journal events over the network using HTTP.
|
||||
|
||||
%endif
|
||||
|
||||
%prep
|
||||
@ -585,8 +597,6 @@ rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd
|
||||
|
||||
%pre
|
||||
getent group systemd-journal >/dev/null || groupadd -r systemd-journal || :
|
||||
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :
|
||||
getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || :
|
||||
exit 0
|
||||
|
||||
%post
|
||||
@ -735,6 +745,21 @@ fi
|
||||
|
||||
%postun -n nss-myhostname -p /sbin/ldconfig
|
||||
|
||||
%pre journal-gateway
|
||||
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :
|
||||
getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || :
|
||||
%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
|
||||
exit 0
|
||||
|
||||
%post journal-gateway
|
||||
%service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
|
||||
|
||||
%preun journal-gateway
|
||||
%service_del_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
|
||||
|
||||
%postun journal-gateway
|
||||
%service_del_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
|
||||
|
||||
%endif
|
||||
|
||||
%files
|
||||
@ -786,6 +811,7 @@ fi
|
||||
%exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service
|
||||
%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.*
|
||||
%exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service
|
||||
%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
|
||||
%{_prefix}/lib/systemd/system/*.automount
|
||||
%{_prefix}/lib/systemd/system/*.service
|
||||
%{_prefix}/lib/systemd/system/*.slice
|
||||
@ -798,6 +824,7 @@ fi
|
||||
%{_prefix}/lib/systemd/user/*.target
|
||||
%{_prefix}/lib/systemd/user/*.service
|
||||
%exclude %{_prefix}/lib/systemd/systemd-udevd
|
||||
%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd
|
||||
%{_prefix}/lib/systemd/systemd-*
|
||||
%{_prefix}/lib/systemd/systemd
|
||||
%dir %{_prefix}/lib/systemd/catalog
|
||||
@ -875,6 +902,7 @@ fi
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
|
||||
%exclude %{_datadir}/systemd/gatewayd
|
||||
%{_datadir}/systemd
|
||||
|
||||
%if ! 0%{?bootstrap}
|
||||
@ -887,7 +915,7 @@ fi
|
||||
%exclude %{_mandir}/man8/telinit.8*
|
||||
%exclude %{_mandir}/man8/runlevel.8*
|
||||
%exclude %{_mandir}/man*/*udev*.[0-9]*
|
||||
|
||||
%exclude %{_mandir}/man8/systemd-journal-gatewayd.*
|
||||
%{_mandir}/man1/*.1*
|
||||
%{_mandir}/man3/*.3*
|
||||
%{_mandir}/man5/*.5*
|
||||
@ -1051,6 +1079,12 @@ fi
|
||||
%{_sbindir}/nss-myhostname-config
|
||||
/%{_lib}/*nss_myhostname*
|
||||
|
||||
%files journal-gateway
|
||||
%defattr(-, root, root)
|
||||
%{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
|
||||
%{_prefix}/lib/systemd/systemd-journal-gatewayd
|
||||
%{_mandir}/man8/systemd-journal-gatewayd.*
|
||||
%{_datadir}/systemd/gatewayd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user