Revert last four commits

Pushed by mistake too early :(
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-11-14 19:37:08 -05:00
parent 7a0ef9c797
commit 38ce1c6b7e
2 changed files with 29 additions and 250 deletions

View File

@ -1,105 +0,0 @@
# -*- Mode: rpm-spec; indent-tabs-mode: nil -*- */
#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# systemd is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
# RPM macros for packages installing systemd unit files
%_unitdir /usr/lib/systemd/system
%_userunitdir /usr/lib/systemd/user
%_presetdir /usr/lib/systemd/system-preset
%_udevhwdbdir /usr/lib/udev/hwdb.d
%_udevrulesdir /usr/lib/udev/rules.d
%_journalcatalogdir /usr/lib/systemd/catalog
%_tmpfilesdir /usr/lib/tmpfiles.d
%_sysusersdir /usr/lib/sysusers.d
%_sysctldir /usr/lib/sysctl.d
%_binfmtdir /usr/lib/binfmt.d
%systemd_requires \
Requires(post): systemd \
Requires(preun): systemd \
Requires(postun): systemd \
%{nil}
%systemd_post() \
if [ $1 -eq 1 ] ; then \
# Initial installation \
systemctl --no-reload preset %{?*} >/dev/null 2>&1 || : \
fi \
%{nil}
%systemd_user_post() %systemd_post --user --global %{?*}
%systemd_preun() \
if [ $1 -eq 0 ] ; then \
# Package removal, not upgrade \
systemctl --no-reload disable --now %{?*} > /dev/null 2>&1 || : \
fi \
%{nil}
%systemd_user_preun() \
if [ $1 -eq 0 ] ; then \
# Package removal, not upgrade \
systemctl --no-reload --user --global disable %{?*} > /dev/null 2>&1 || : \
fi \
%{nil}
%systemd_postun() %{nil}
%systemd_user_postun() %{nil}
%systemd_postun_with_restart() \
if [ $1 -ge 1 ] ; then \
# Package upgrade, not uninstall \
systemctl try-restart %{?*} >/dev/null 2>&1 || : \
fi \
%{nil}
%systemd_user_postun_with_restart() %{nil}
%udev_hwdb_update() \
udevadm hwdb --update >/dev/null 2>&1 || : \
%{nil}
%udev_rules_update() \
udevadm control --reload >/dev/null 2>&1 || : \
%{nil}
%journal_catalog_update() \
journalctl --update-catalog >/dev/null 2>&1 || : \
%{nil}
%tmpfiles_create() \
systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
%{nil}
%sysusers_create() \
systemd-sysusers %{?*} >/dev/null 2>&1 || : \
%{nil}
%sysusers_create_inline() \
echo %{?*} | systemd-sysusers - >/dev/null 2>&1 || : \
%{nil}
%sysctl_apply() \
/usr/lib/systemd/systemd-sysctl %{?*} >/dev/null 2>&1 || : \
%{nil}
%binfmt_apply() \
/usr/lib/systemd/systemd-binfmt %{?*} >/dev/null 2>&1 || : \
%{nil}

View File

@ -13,7 +13,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 227 Version: 227
Release: 11%{?gitcommit:.git%{gitcommitshort}}%{?dist} Release: 7%{?gitcommit:.git%{gitcommitshort}}%{?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+
Summary: A System and Service Manager Summary: A System and Service Manager
@ -34,8 +34,6 @@ Source7: systemd-journal-remote.xml
Source8: systemd-journal-gatewayd.xml Source8: systemd-journal-gatewayd.xml
Source9: 20-yama-ptrace.conf Source9: 20-yama-ptrace.conf
Source10: macros.systemd
# kernel-install patch for grubby, drop if grubby is obsolete # kernel-install patch for grubby, drop if grubby is obsolete
Patch1000: kernel-install-grubby.patch Patch1000: kernel-install-grubby.patch
@ -108,8 +106,6 @@ Obsoletes: nss-myhostname < 0.4
Provides: nss-myhostname = 0.4 Provides: nss-myhostname = 0.4
# systemd-sysv-convert was removed in f20: https://fedorahosted.org/fpc/ticket/308 # systemd-sysv-convert was removed in f20: https://fedorahosted.org/fpc/ticket/308
Obsoletes: systemd-sysv < 206 Obsoletes: systemd-sysv < 206
# self-obsoletes so that dnf will install new subpackages on upgrade (#1260394)
Obsoletes: %{name} < 227-8
Provides: systemd-sysv = 206 Provides: systemd-sysv = 206
Conflicts: initscripts < 9.56.1 Conflicts: initscripts < 9.56.1
Conflicts: fedora-release < 23-0.12 Conflicts: fedora-release < 23-0.12
@ -157,38 +153,6 @@ Obsoletes: libudev-devel < 183
Development headers and auxiliary files for developing applications linking Development headers and auxiliary files for developing applications linking
to libudev or libsystemd. to libudev or libsystemd.
%package udev
Summary: Rule-based device node and kernel event manager
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
# obsolete parent package so that dnf will install new subpackage on upgrade (#1260394)
Obsoletes: %{name} < 227-8
License: LGPLv2+
%description udev
This package contains systemd-udev and the rules and hardware database
needed to manage device nodes. This package is necessary on physical
machines and in virtual machines, but not in containers.
%package container
# Name is the same as in Debian
Summary: Tools for containers and VMs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
# obsolete parent package so that dnf will install new subpackage on upgrade (#1260394)
Obsoletes: %{name} < 227-8
License: LGPLv2+
%description container
Systemd tools to spawn and manage containers and virtual machines.
This package contains systemd-nspawn, machinectl, systemd-machined,
and systemd-importd.
%package journal-remote %package journal-remote
# Name is the same as in Debian # Name is the same as in Debian
Summary: Tools to send journal events over the network Summary: Tools to send journal events over the network
@ -371,8 +335,6 @@ install -Dm0644 %{SOURCE8} %{buildroot}/usr/lib/firewalld/services/
# https://bugzilla.redhat.com/show_bug.cgi?id=1234951 # https://bugzilla.redhat.com/show_bug.cgi?id=1234951
install -Dm0644 %{SOURCE9} %{buildroot}%{_pkgdocdir}/ install -Dm0644 %{SOURCE9} %{buildroot}%{_pkgdocdir}/
install -Dm0644 %{SOURCE10} %{buildroot}%{_rpmconfigdir}/macros.d/macros.systemd
%find_lang %{name} %find_lang %{name}
%check %check
@ -381,14 +343,6 @@ make check VERBOSE=1
# Check for botched translations (https://bugzilla.redhat.com/show_bug.cgi?id=1226566) # Check for botched translations (https://bugzilla.redhat.com/show_bug.cgi?id=1226566)
test -z "$(grep -L xml:lang %{buildroot}%{_datadir}/polkit-1/actions/org.freedesktop.*.policy)" test -z "$(grep -L xml:lang %{buildroot}%{_datadir}/polkit-1/actions/org.freedesktop.*.policy)"
#############################################################################################
%transfiletriggerin -- /usr/lib/systemd/system /etc/systemd/system
systemctl daemon-reload &>/dev/null || :
%transfiletriggerun -- /usr/lib/systemd/system /etc/systemd/system
systemctl daemon-reload &>/dev/null || :
%pre %pre
getent group cdrom >/dev/null 2>&1 || groupadd -r -g 11 cdrom >/dev/null 2>&1 || : getent group cdrom >/dev/null 2>&1 || groupadd -r -g 11 cdrom >/dev/null 2>&1 || :
getent group utmp >/dev/null 2>&1 || groupadd -r -g 22 utmp >/dev/null 2>&1 || : getent group utmp >/dev/null 2>&1 || groupadd -r -g 22 utmp >/dev/null 2>&1 || :
@ -412,6 +366,7 @@ systemd-machine-id-setup >/dev/null 2>&1 || :
/usr/lib/systemd/systemd-random-seed save >/dev/null 2>&1 || : /usr/lib/systemd/systemd-random-seed save >/dev/null 2>&1 || :
systemctl daemon-reexec >/dev/null 2>&1 || : systemctl daemon-reexec >/dev/null 2>&1 || :
systemctl start systemd-udevd.service >/dev/null 2>&1 || : systemctl start systemd-udevd.service >/dev/null 2>&1 || :
udevadm hwdb --update >/dev/null 2>&1 || :
journalctl --update-catalog >/dev/null 2>&1 || : journalctl --update-catalog >/dev/null 2>&1 || :
systemd-tmpfiles --create >/dev/null 2>&1 || : systemd-tmpfiles --create >/dev/null 2>&1 || :
@ -488,6 +443,11 @@ fi
# remove obsolete systemd-readahead file # remove obsolete systemd-readahead file
rm -f /.readahead > /dev/null 2>&1 || : rm -f /.readahead > /dev/null 2>&1 || :
%postun
if [ $1 -ge 1 ] ; then
systemctl daemon-reload > /dev/null 2>&1 || :
fi
%preun %preun
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
systemctl disable \ systemctl disable \
@ -526,16 +486,6 @@ fi
%post compat-libs -p /sbin/ldconfig %post compat-libs -p /sbin/ldconfig
%postun compat-libs -p /sbin/ldconfig %postun compat-libs -p /sbin/ldconfig
%post udev
udevadm hwdb --update >/dev/null 2>&1 || :
%systemd_post systemd-udev-{settle,trigger}.service systemd-udevd-{control,kernel}.socket systemd-udevd.service
%preun udev
%systemd_preun systemd-udev-{settle,trigger}.service systemd-udevd-{control,kernel}.socket systemd-udevd.service
%postun udev
%systemd_postun_with_restart systemd-udev-{settle,trigger}.service systemd-udevd-{control,kernel}.socket systemd-udevd.service
%pre journal-remote %pre journal-remote
getent group systemd-journal-gateway >/dev/null 2>&1 || groupadd -r -g 191 systemd-journal-gateway 2>&1 || : getent group systemd-journal-gateway >/dev/null 2>&1 || groupadd -r -g 191 systemd-journal-gateway 2>&1 || :
getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g systemd-journal-gateway -d %{_localstatedir}/log/journal -s /sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || : getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g systemd-journal-gateway -d %{_localstatedir}/log/journal -s /sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :
@ -573,6 +523,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%dir %{_sysconfdir}/sysctl.d %dir %{_sysconfdir}/sysctl.d
%dir %{_sysconfdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d
%dir %{_sysconfdir}/binfmt.d %dir %{_sysconfdir}/binfmt.d
%dir %{_sysconfdir}/udev
%dir %{_sysconfdir}/udev/rules.d
%dir %{_sysconfdir}/udev/hwdb.d
%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
/etc/inittab /etc/inittab
@ -614,7 +567,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf
%config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf
%config(noreplace) %{_sysconfdir}/systemd/user.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf
@ -624,8 +579,10 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%config(noreplace) %{_sysconfdir}/systemd/resolved.conf %config(noreplace) %{_sysconfdir}/systemd/resolved.conf
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
%config(noreplace) %{_sysconfdir}/systemd/coredump.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf
%config(noreplace) %{_sysconfdir}/udev/udev.conf
%config(noreplace) %{_sysconfdir}/yum/protected.d/systemd.conf %config(noreplace) %{_sysconfdir}/yum/protected.d/systemd.conf
%config(noreplace) %{_sysconfdir}/pam.d/systemd-user %config(noreplace) %{_sysconfdir}/pam.d/systemd-user
%ghost %{_sysconfdir}/udev/hwdb.bin
%{_rpmconfigdir}/macros.d/macros.systemd %{_rpmconfigdir}/macros.d/macros.systemd
%{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd
%{_sysconfdir}/rc.d/init.d/README %{_sysconfdir}/rc.d/init.d/README
@ -646,10 +603,12 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_bindir}/systemd-machine-id-setup %{_bindir}/systemd-machine-id-setup
%{_bindir}/loginctl %{_bindir}/loginctl
%{_bindir}/journalctl %{_bindir}/journalctl
%{_bindir}/machinectl
%{_bindir}/busctl %{_bindir}/busctl
%{_bindir}/networkctl %{_bindir}/networkctl
%{_bindir}/coredumpctl %{_bindir}/coredumpctl
%{_bindir}/systemd-tmpfiles %{_bindir}/systemd-tmpfiles
%{_bindir}/systemd-nspawn
%{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-stdio-bridge
%{_bindir}/systemd-cat %{_bindir}/systemd-cat
%{_bindir}/systemd-cgls %{_bindir}/systemd-cgls
@ -661,40 +620,24 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_bindir}/systemd-path %{_bindir}/systemd-path
%{_bindir}/systemd-sysusers %{_bindir}/systemd-sysusers
%{_bindir}/systemd-firstboot %{_bindir}/systemd-firstboot
%{_bindir}/systemd-hwdb
%{_bindir}/hostnamectl %{_bindir}/hostnamectl
%{_bindir}/localectl %{_bindir}/localectl
%{_bindir}/timedatectl %{_bindir}/timedatectl
%{_bindir}/bootctl %{_bindir}/bootctl
%{_bindir}/udevadm
%{_bindir}/kernel-install %{_bindir}/kernel-install
%{pkgdir}/systemd %{pkgdir}/systemd
%{system_unit_dir} %{system_unit_dir}
%{pkgdir}/user %{pkgdir}/user
%exclude %{system_unit_dir}/*udev*
%exclude %{system_unit_dir}/*/*udev*
%exclude %{system_unit_dir}/*hwdb*
%exclude %{system_unit_dir}/*/*hwdb*
%exclude %{system_unit_dir}/*.machine1.*
%exclude %{system_unit_dir}/*/*.machine1.*
%exclude %{system_unit_dir}/*.import1.*
%exclude %{system_unit_dir}/*/*.import1.*
%exclude %{system_unit_dir}/systemd-machined.service
%exclude %{system_unit_dir}/systemd-importd.service
%exclude %{system_unit_dir}/machine.slice
%exclude %{system_unit_dir}/machines.target
%exclude %{system_unit_dir}/var-lib-machines.mount
%exclude %{system_unit_dir}/*/var-lib-machines.mount
%exclude %{system_unit_dir}/systemd-journal-gatewayd.* %exclude %{system_unit_dir}/systemd-journal-gatewayd.*
%exclude %{system_unit_dir}/systemd-journal-remote.* %exclude %{system_unit_dir}/systemd-journal-remote.*
%exclude %{system_unit_dir}/systemd-journal-upload.* %exclude %{system_unit_dir}/systemd-journal-upload.*
%exclude %{pkgdir}/systemd-udevd
%exclude %{pkgdir}/systemd-machined
%exclude %{pkgdir}/systemd-import
%exclude %{pkgdir}/systemd-importd
%exclude %{pkgdir}/systemd-pull
%exclude %{pkgdir}/systemd-journal-gatewayd %exclude %{pkgdir}/systemd-journal-gatewayd
%exclude %{pkgdir}/systemd-journal-remote %exclude %{pkgdir}/systemd-journal-remote
%exclude %{pkgdir}/systemd-journal-upload %exclude %{pkgdir}/systemd-journal-upload
%{pkgdir}/systemd-* %{pkgdir}/systemd-*
%{_prefix}/lib/udev
%{_prefix}/lib/tmpfiles.d/systemd.conf %{_prefix}/lib/tmpfiles.d/systemd.conf
%{_prefix}/lib/tmpfiles.d/systemd-nologin.conf %{_prefix}/lib/tmpfiles.d/systemd-nologin.conf
%{_prefix}/lib/tmpfiles.d/x11.conf %{_prefix}/lib/tmpfiles.d/x11.conf
@ -703,6 +646,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_prefix}/lib/tmpfiles.d/var.conf %{_prefix}/lib/tmpfiles.d/var.conf
%{_prefix}/lib/tmpfiles.d/etc.conf %{_prefix}/lib/tmpfiles.d/etc.conf
%{_prefix}/lib/tmpfiles.d/home.conf %{_prefix}/lib/tmpfiles.d/home.conf
%{_prefix}/lib/tmpfiles.d/systemd-nspawn.conf
%{_prefix}/lib/tmpfiles.d/journal-nocow.conf %{_prefix}/lib/tmpfiles.d/journal-nocow.conf
%{_prefix}/lib/sysctl.d/50-default.conf %{_prefix}/lib/sysctl.d/50-default.conf
%{_prefix}/lib/sysctl.d/50-coredump.conf %{_prefix}/lib/sysctl.d/50-coredump.conf
@ -712,6 +656,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{pkgdir}/catalog/systemd.catalog %{pkgdir}/catalog/systemd.catalog
%{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install
%{pkgdir}/import-pubring.gpg
%{_sbindir}/init %{_sbindir}/init
%{_sbindir}/reboot %{_sbindir}/reboot
%{_sbindir}/halt %{_sbindir}/halt
@ -719,19 +664,14 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_sbindir}/shutdown %{_sbindir}/shutdown
%{_sbindir}/telinit %{_sbindir}/telinit
%{_sbindir}/runlevel %{_sbindir}/runlevel
%{_sbindir}/udevadm
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/man5/* %{_mandir}/man5/*
%{_mandir}/man7/* %{_mandir}/man7/*
%{_mandir}/man8/*
%exclude %{_mandir}/man*/*udev*
%exclude %{_mandir}/man*/*hwdb*
%exclude %{_mandir}/man5/systemd.link.*
%exclude %{_mandir}/man1/machinectl.*
%exclude %{_mandir}/man8/systemd-machined.*
%exclude %{_mandir}/man8/*mymachines.*
%exclude %{_mandir}/man8/systemd-journal-gatewayd.* %exclude %{_mandir}/man8/systemd-journal-gatewayd.*
%exclude %{_mandir}/man8/systemd-journal-remote.* %exclude %{_mandir}/man8/systemd-journal-remote.*
%exclude %{_mandir}/man8/systemd-journal-upload.* %exclude %{_mandir}/man8/systemd-journal-upload.*
%{_mandir}/man8/*
%{_datadir}/factory/etc/nsswitch.conf %{_datadir}/factory/etc/nsswitch.conf
%{_datadir}/factory/etc/pam.d/other %{_datadir}/factory/etc/pam.d/other
%{_datadir}/factory/etc/pam.d/system-auth %{_datadir}/factory/etc/pam.d/system-auth
@ -743,7 +683,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
%dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions %dir %{_datadir}/polkit-1/actions
@ -752,15 +694,14 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
%{_datadir}/pkgconfig/systemd.pc %{_datadir}/pkgconfig/systemd.pc
%{_datadir}/pkgconfig/udev.pc %{_datadir}/pkgconfig/udev.pc
%{_datadir}/bash-completion/completions/* %{_datadir}/bash-completion/completions/*
%exclude %{_datadir}/bash-completion/completions/udevadm
%exclude %{_datadir}/bash-completion/completions/machinectl
%{_datadir}/zsh/site-functions/* %{_datadir}/zsh/site-functions/*
%exclude %{_datadir}/zsh/site-functions/_udevadm
%exclude %{_datadir}/zsh/site-functions/_machinectl
%{pkgdir}/catalog/systemd.*.catalog %{pkgdir}/catalog/systemd.*.catalog
%{pkgdir}/network/99-default.link
%{pkgdir}/network/80-container-host0.network %{pkgdir}/network/80-container-host0.network
%{pkgdir}/network/80-container-ve.network %{pkgdir}/network/80-container-ve.network
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
@ -773,6 +714,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%files libs %files libs
%{_libdir}/security/pam_systemd.so %{_libdir}/security/pam_systemd.so
%{_libdir}/libnss_myhostname.so.2 %{_libdir}/libnss_myhostname.so.2
%{_libdir}/libnss_mymachines.so.2
%{_libdir}/libnss_resolve.so.2 %{_libdir}/libnss_resolve.so.2
%{_libdir}/libudev.so.* %{_libdir}/libudev.so.*
%{_libdir}/libsystemd.so.* %{_libdir}/libsystemd.so.*
@ -810,60 +752,6 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_libdir}/pkgconfig/libsystemd-id128.pc %{_libdir}/pkgconfig/libsystemd-id128.pc
%{_mandir}/man3/* %{_mandir}/man3/*
%files udev
%dir %{_sysconfdir}/udev
%dir %{_sysconfdir}/udev/rules.d
%dir %{_sysconfdir}/udev/hwdb.d
%config(noreplace) %{_sysconfdir}/udev/udev.conf
%ghost %{_sysconfdir}/udev/hwdb.bin
%{system_unit_dir}/*udev*
%{system_unit_dir}/*/*udev*
%{system_unit_dir}/*hwdb*
%{system_unit_dir}/*/*hwdb*
%{_bindir}/udevadm
%{_sbindir}/udevadm
%{_bindir}/systemd-hwdb
%{pkgdir}/systemd-udevd
%{pkgdir}/network/99-default.link
%{_prefix}/lib/udev
%{_mandir}/man*/*udev*
%{_mandir}/man*/*hwdb*
%{_mandir}/man5/systemd.link.*
%{_datadir}/bash-completion/completions/udevadm
%{_datadir}/zsh/site-functions/_udevadm
%files container
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf
%{_libdir}/libnss_mymachines.so.2
%{_bindir}/machinectl
%{_bindir}/systemd-nspawn
%{pkgdir}/import-pubring.gpg
%{_prefix}/lib/tmpfiles.d/systemd-nspawn.conf
%{system_unit_dir}/*.machine1.*
%{system_unit_dir}/*/*.machine1.*
%{system_unit_dir}/*.import1.*
%{system_unit_dir}/*/*.import1.*
%{system_unit_dir}/systemd-machined.service
%{system_unit_dir}/systemd-importd.service
%{system_unit_dir}/machine.slice
%{system_unit_dir}/machines.target
%{system_unit_dir}/var-lib-machines.mount
%{system_unit_dir}/*/var-lib-machines.mount
%{pkgdir}/systemd-journal-gatewayd
%{pkgdir}/systemd-journal-remote
%{pkgdir}/systemd-journal-upload
%{pkgdir}/systemd-machined
%{pkgdir}/systemd-import
%{pkgdir}/systemd-importd
%{pkgdir}/systemd-pull
%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
%{_datadir}/bash-completion/completions/machinectl
%{_datadir}/zsh/site-functions/_machinectl
%files journal-remote %files journal-remote
%config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf %config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf
%config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf %config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf
@ -883,10 +771,6 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
/usr/lib/firewalld/services/* /usr/lib/firewalld/services/*
%changelog %changelog
* Fri Nov 13 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 227-11
- Split out systemd-container subpackage (#1163412)
- Split out system-udev subpackage
* Thu Nov 12 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 227-7 * Thu Nov 12 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 227-7
- Rename journal-gateway subpackage to journal-remote - Rename journal-gateway subpackage to journal-remote
- Ignore the access mode on /var/log/journal (#1048424) - Ignore the access mode on /var/log/journal (#1048424)