diff --git a/systemd.spec b/systemd.spec index ddade66..f7514ed 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,13 +27,13 @@ Name: systemd Epoch: 2 Version: 248 -Release: 4mamba +Release: 5mamba Summary: A system and service manager compatible with SysV and LSB init scripts Group: System/Configuration Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: https://freedesktop.org/wiki/Software/systemd +URL: https://systemd.io/ Source: https://github.com/systemd/systemd.git/v%{version}/systemd-%{version}.tar.bz2 #Source: http://www.freedesktop.org/software/systemd/systemd-%{version}.tar.xz Source1: udev-initscript @@ -104,10 +104,10 @@ BuildRequires: vala-tools BuildRequires: meson BuildRequires: ninja BuildRequires: iptables-devel >= 1.8.3 +BuildRequires: docbook-xsl >= 1.79.2-3mamba Conflicts: sysvinit Conflicts: initscripts-sysv5 Requires: sysvinit-tools -Requires: udev = %{?epoch:%epoch:}%{version}-%{release} Requires: kbd Requires: dbus >= 1.13.2 Provides: laptop-mode-tools @@ -116,26 +116,18 @@ Provides: /sbin/halt Provides: /sbin/poweroff Provides: /sbin/reboot Provides: /sbin/shutdown +Requires: liblockdev +Requires(post): pwdutils +Requires: libsystemd = %{?epoch:%epoch:}%{version}-%{release} +Requires: udev = %{?epoch:%epoch:}%{version}-%{release} +Provides: systemd-core +Obsoletes: systemd-core <= 2:248-4mamba %description systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux cgroups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. -%package core -Summary: systemd core files that may be used both by udev and systemd -Group: System/Libraries -Requires: liblockdev -Requires(post): pwdutils -Requires: libsystemd = %{?epoch:%epoch:}%{version}-%{release} - -%description core -systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. -systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux cgroups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. -It can work as a drop-in replacement for sysvinit. - -This package contains systemd core files that may be used both by udev and systemd. - %package -n libsystemd Summary: systemd libraries Group: System/Libraries @@ -144,7 +136,6 @@ Group: System/Libraries systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux cgroups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - This package contains the systemd libraries. %package -n libsystemd-devel @@ -152,39 +143,26 @@ Summary: Devel package for %{name} Group: Development/Libraries Requires: libsystemd = %{?epoch:%epoch:}%{version}-%{release} Provides: systemd-devel -Obsoletes: systemd-devel < 248 +Obsoletes: systemd-devel < 2:248 %description -n libsystemd-devel systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux cgroups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - This package contains static libraries and header files needed for development. -%package tools -Summary: %{name} GTK tools -Group: Graphical Desktop/Applications/Configuration -Requires: %{name}-core = %{?epoch:%epoch:}%{version}-%{release} - -%description tools -systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. -systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux cgroups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. -It can work as a drop-in replacement for sysvinit. - -This package contains the systemd GTK tools. - %package -n udev Summary: A userspace tool to manage a dynamic devices directory Group: System/Kernel and Hardware Conflicts: devfsd Conflicts: udev173 -Obsoletes: devfsd < 248 -Obsoletes: hotplug < 248 +Obsoletes: devfsd < 2:248 +Obsoletes: hotplug < 2:248 Provides: udev-static -Obsoletes: udev-static < 248 +Obsoletes: udev-static < 2:248 Requires(post):/usr/sbin/groupadd Requires(post):setup -Requires: %{name}-core = %{?epoch:%epoch:}%{version}-%{release} +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: libudev = %{?epoch:%epoch:}%{version}-%{release} Requires: initscripts >= 1.1.18 @@ -211,7 +189,7 @@ Summary: Development files for udev Group: Development/Libraries Requires: libudev = %{?epoch:%epoch:}%{version}-%{release} Provides: udev-devel -Obsoletes: udev-devel < 248 +Obsoletes: udev-devel < 2:248 %description -n libudev-devel Udev allows Linux users to have a dynamic /dev directory and it provides the ability to have persistent device names. @@ -325,12 +303,12 @@ install -d -m0755 %{buildroot}%{_prefix}/lib/repart.d %include %{SOURCE10} -%pre core +%pre [ -e %{_sysconfdir}/mtab -a ! -L %{_sysconfdir}/mtab ] && rm -f %{_sysconfdir}/mtab [ -L /var/lib/systemd/timesync ] && rm -f /var/lib/systemd/timesync : -%post core +%post if [ $1 -ge 1 ]; then # causes systemd not to boot since 219 sed -i "/\/proc\/bus\/usb/d" /etc/fstab @@ -400,7 +378,7 @@ if [ $1 -eq 1 ]; then fi : -%postun core +%postun if [ $1 -eq 0 ]; then grep "^hosts:.* myhostname" /etc/nsswitch.conf &>/dev/null && \ sed -i "s| myhostname||" /etc/nsswitch.conf @@ -408,7 +386,7 @@ if [ $1 -eq 0 ]; then fi : -%triggerun core -- systemd-core <= 2:248-2mamba +%triggerun -- systemd-core <= 2:248-2mamba # From Fedora # This is for upgrades from previous versions before systemd-resolved became the default. systemctl --no-reload preset systemd-resolved.service &>/dev/null || : @@ -424,12 +402,12 @@ if systemctl -q is-enabled systemd-resolved.service &>/dev/null; then fi : -%triggerpostun core -- systemd-core < 2:248 +%triggerpostun -- systemd-core < 2:248 # /bin and /sbin are removed during old filesystem postun [ -e /lib/systemd ] || ln -s ../usr/lib/systemd /lib/systemd : -%posttrans core +%posttrans if [ $1 -ge 1 ]; then [ ! -L /lib -a ! -L /lib/systemd ] && { @@ -550,7 +528,7 @@ groupadd kvm -g %{group_kvm} 2>/dev/null groupadd render -g %{group_render} 2>/dev/null : -%triggerpostun core -- udev < 2:248 +%triggerpostun -n udev -- udev < 2:248 # /bin and /sbin are removed during old filesystem postun [ -e /lib/udev ] || ln -s ../usr/lib/udev /lib/udev : @@ -621,25 +599,7 @@ systemctl daemon-reload &>/dev/null || : %transfiletriggerun -- %{_unitdir} /etc/systemd/system systemctl daemon-reload &>/dev/null || : -%files -%defattr(-,root,root) -%{_initrddir}/README -%{_sbindir}/halt -%{_sbindir}/init -%{_sbindir}/poweroff -%{_sbindir}/reboot -%{_sbindir}/runlevel -%{_sbindir}/shutdown -%{_sbindir}/telinit -%{_mandir}/man1/init.1* -%{_mandir}/man8/reboot.8* -%{_mandir}/man8/halt.8* -%{_mandir}/man8/poweroff.8* -%{_mandir}/man8/runlevel.8* -%{_mandir}/man8/shutdown.8* -%{_mandir}/man8/telinit.8* - -%files core -f %{name}.lang +%files -f %{name}.lang %defattr(-,root,root) %dir %{_sysconfdir}/kernel/install.d %dir %{_sysconfdir}/systemd @@ -669,6 +629,14 @@ systemctl daemon-reload &>/dev/null || : %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh +%{_initrddir}/README +%{_sbindir}/halt +%{_sbindir}/init +%{_sbindir}/poweroff +%{_sbindir}/reboot +%{_sbindir}/runlevel +%{_sbindir}/shutdown +%{_sbindir}/telinit %{_prefix}/lib/pam.d/systemd-user %{_bindir}/busctl %{_bindir}/bootctl @@ -764,6 +732,9 @@ systemctl daemon-reload &>/dev/null || : %{_mandir}/man1/userdbctl.1* %{_mandir}/man5/*.5* %{_mandir}/man7/*.7* +%{_mandir}/man1/init.1* +%{_mandir}/man8/30-systemd-environment-d-generator.8* +%{_mandir}/man8/halt.8* %{_mandir}/man8/kernel-install.8* %{_mandir}/man8/libnss_myhostname.so.2.8* %{_mandir}/man8/libnss_mymachines.so.2.8* @@ -774,9 +745,13 @@ systemctl daemon-reload &>/dev/null || : %{_mandir}/man8/nss-resolve.8* %{_mandir}/man8/pam_systemd.8* %{_mandir}/man8/pam_systemd_home.8* +%{_mandir}/man8/poweroff.8* %{_mandir}/man8/rc-local.service.8* +%{_mandir}/man8/reboot.8* +%{_mandir}/man8/runlevel.8* +%{_mandir}/man8/shutdown.8* %{_mandir}/man8/systemd-*.8* -%{_mandir}/man8/30-systemd-environment-d-generator.8* +%{_mandir}/man8/telinit.8* %files -n libsystemd %defattr(-,root,root) @@ -841,6 +816,10 @@ systemctl daemon-reload &>/dev/null || : %{_libdir}/pkgconfig/libudev.pc %changelog +* Sat May 15 2021 Silvan Calarco 248-5mamba +- merge systemd-core into systemd single package +- build require docbook-xsl >= 1.79.2-3mamba to fix man pages stylesheet issues + * Sat Apr 24 2021 Silvan Calarco 248-4mamba - make sure /etc/resolv.conf link is created on first install