%bcond_without pam # PAM authentication support
%bcond_without qrencode # QRencode support
%bcond_without selinux # without SELinux support
-%bcond_without tcpd # libwrap (tcp_wrappers) support
+%bcond_with efi # EFI boot support [missing files in 220]
%bcond_with tests # "make check" (requires systemd already installed)
Summary: A System and Service Manager
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version: 220
+Version: 221
Release: 0.1
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: 60acd92b04c0f5faa806678abd433014
+# Source0-md5: b4d5a253841cf28a98b7ec99c45e3716
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
Patch10: pld-boot_efi_mount.patch
Patch11: optional-tmp-on-tmpfs.patch
Patch12: uids_gids.patch
-Patch13: root-lib.patch
URL: http://www.freedesktop.org/wiki/Software/systemd
BuildRequires: acl-devel
BuildRequires: attr-devel
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.22.0
BuildRequires: glibc-misc
+%{?with_efi:BuildRequires: gnu-efi}
BuildRequires: gnutls-devel >= 3.1.4
BuildRequires: gobject-introspection-devel >= 1.31.1
BuildRequires: gperf
-BuildRequires: gtk-doc >= 1.18
BuildRequires: intltool >= 0.40.0
BuildRequires: kmod-devel >= 14
BuildRequires: libapparmor-devel
BuildRequires: libseccomp-devel >= 1.0.0
%{?with_selinux:BuildRequires: libselinux-devel >= 2.1.9}
BuildRequires: libtool >= 2:2.2
-%{?with_tcpd:BuildRequires: libwrap-devel}
BuildRequires: libxslt-progs
BuildRequires: lz4-devel
BuildRequires: m4
Summary: libudev API documentation
Summary(pl.UTF-8): Dokumentacja API libudev
Group: Documentation
-Requires: gtk-doc-common
%if "%{_rpmversion}" >= "5"
BuildArch: noarch
%endif
Summary: libgudev API documentation
Summary(pl.UTF-8): Dokumentacja API libgudev
Group: Documentation
-Requires: gtk-doc-common
%if "%{_rpmversion}" >= "5"
BuildArch: noarch
%endif
%patch10 -p1
%patch11 -p1
%patch12 -p1
-%patch13 -p1
cp -p %{SOURCE2} src/systemd_booted.c
-# this file is autogenerated
-%{__rm} src/udev/keyboard-keys-from-name.gperf
-
%build
-%{__gtkdocize}
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{?debug:--enable-debug} \
%{__enable_disable audit} \
%{__enable_disable cryptsetup libcryptsetup} \
+ %{__enable_disable efi gnuefi} \
%{__enable_disable pam} \
%{__enable_disable selinux} \
- %{__enable_disable tcpd tcpwrap} \
%{__enable_disable microhttpd} \
%{__enable_disable qrencode} \
--disable-silent-rules \
- --enable-chkconfig \
--enable-compat-libs \
- --enable-gtk-doc \
- --enable-introspection \
--enable-split-usr \
--enable-lz4 \
- --with-html-dir=%{_gtkdocdir} \
--with-kbd-loadkeys=/usr/bin/loadkeys \
--with-kbd-setfont=/bin/setfont \
--with-sysvinit-path=/etc/rc.d/init.d \
--with-sysvrcnd-path=/etc/rc.d \
- --with-firmware-path=/lib/firmware \
--with-rc-local-script-path-start=/etc/rc.d/rc.local \
--with-rc-local-script-path-stop=/sbin/halt.local \
--with-rootprefix="" \
cp -a %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
cp -a %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-udev-pld.rules
-# disable this abomination
-# http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames
-ln -s /dev/null $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/80-net-name-slot.rules
-
# install udev configs
cp -a %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/udev/links.conf
/lib/systemd/systemd-random-seed save || :
/bin/systemctl --system daemon-reexec || :
/bin/journalctl --update-catalog || :
-# Apply ACL to the journal directory
-/bin/setfacl -Rnm g:logs:rx,d:g:logs:rx /var/log/journal || :
%postun
if [ $1 -ge 1 ]; then
%groupremove systemd-journal
fi
-%triggerpostun -- systemd < 208-1
+%triggerpostun -- systemd < 1:208-1
chgrp -R systemd-journal /var/log/journal
chmod g+s /var/log/journal
+%triggerpostun -- systemd < 1:220-1
+# https://bugs.freedesktop.org/show_bug.cgi?id=89202
+/bin/getfacl -p /var/log/journal/$(cat /etc/machine-id) | grep -v '^#' | sort -u | /bin/setfacl -R --set-file=- /var/log/journal/$(cat /etc/machine-id) || :
+
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
# And symlink what we found to the new-style default.target
ln -s "$target" %{_sysconfdir}/systemd/system/default.target || :
- # Setup hostname
- [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
- if [ -n "$HOSTNAME" -a "$HOSTNAME" != "pldmachine" ]; then
- [ -f /etc/hostname ] && mv -f /etc/hostname /etc/hostname.rpmsave
- echo $HOSTNAME > /etc/hostname
- chmod 644 /etc/hostname
+ # Setup hostname if not yet done so
+ if [ ! -s /etc/hostname ]; then
+ HOSTNAME=
+ [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
+ if [ -n "$HOSTNAME" -a "$HOSTNAME" != "pldmachine" ]; then
+ echo $HOSTNAME > /etc/hostname
+ chmod 644 /etc/hostname
+ fi
fi
# Enable the services we install by default.
%attr(755,root,root) /lib/udev/accelerometer
-%dir /lib/udev/hwdb.d
/lib/udev/hwdb.d/20-acpi-vendor.hwdb
/lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
/lib/udev/hwdb.d/20-net-ifname.hwdb
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/links.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-udev-pld.rules
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/80-net-name-slot.rules
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
%files -n udev-apidocs
%defattr(644,root,root,755)
-%{_gtkdocdir}/libudev
-
-%files -n udev-glib
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgudev-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgudev-1.0.so.0
-%{_libdir}/girepository-1.0/GUdev-1.0.typelib
+#%{_gtkdocdir}/libudev
-%files -n udev-glib-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgudev-1.0.so
-%{_includedir}/gudev-1.0
-%{_pkgconfigdir}/gudev-1.0.pc
-%{_datadir}/gir-1.0/GUdev-1.0.gir
-
-%files -n udev-glib-apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gudev
+#%files -n udev-glib
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/libgudev-1.0.so.*.*.*
+#%attr(755,root,root) %ghost %{_libdir}/libgudev-1.0.so.0
+#%{_libdir}/girepository-1.0/GUdev-1.0.typelib
+#
+#%files -n udev-glib-devel
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/libgudev-1.0.so
+#%{_includedir}/gudev-1.0
+#%{_pkgconfigdir}/gudev-1.0.pc
+#%{_datadir}/gir-1.0/GUdev-1.0.gir
+#
+#%files -n udev-glib-apidocs
+#%defattr(644,root,root,755)
+#%{_gtkdocdir}/gudev
%files -n bash-completion-udev
%defattr(644,root,root,755)