From 4372adb35417c85d5f8887d6d3558e75665af4aa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Jun 29 2010 01:55:15 +0000 Subject: new snapshot --- diff --git a/.cvsignore b/.cvsignore index 1ef4206..ee62b95 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -systemd-0.20100622gita3723b.tar.xz +systemd-0.20100629git4176e5.tar.xz diff --git a/sources b/sources index ad54ec9..9342a30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cfa09da995eaa512f0d5458aeb111e89 systemd-0.20100622gita3723b.tar.xz +ff823b781f3b4690dd66d700fcfbedec systemd-0.20100629git4176e5.tar.xz diff --git a/systemd.spec b/systemd.spec index fba5f43..f6dcdf1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,11 +1,11 @@ -%global git_date 20100622 -%global git_version a3723b +%global git_date 20100629 +%global git_version 4176e5 Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Version: 0 -Release: 0.6.%{git_date}git%{git_version}%{?dist} +Release: 0.7.%{git_date}git%{git_version}%{?dist} License: GPLv2+ Group: System Environment/Base Summary: A System and Session Manager @@ -23,6 +23,7 @@ BuildRequires: gtk2-devel BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool +Requires: systemd-units = %{version}-%{release} Requires: dbus Requires: udev Requires: pkgconfig @@ -46,6 +47,14 @@ 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 units +Group: System Environment/Base +Summary: Configuration files, directories and installation tool for systemd + +%description units +Basic configuration files, directories and installation tool for the systemd +system and session manager. + %package gtk Group: System Environment/Base Summary: Graphical frontend for systemd @@ -58,7 +67,9 @@ Graphical front-end for systemd. Group: System Environment/Base Summary: systemd System V init tools Requires: %{name} = %{version}-%{release} -Conflicts: sysvinit +Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 +Provides: SysVinit = 2.86-24, sysvinit = 2.86-24 +#Obsoletes: upstart <= 0.6.99 Conflicts: upstart %description sysvinit @@ -91,18 +102,21 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_sysconfdir}/systemd -%{_sysconfdir}/xdg/systemd %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_sysconfdir}/rc.d/init.d/reboot /bin/systemd /bin/systemctl /bin/systemd-notify -%{_bindir}/systemd-install -/lib/systemd +/lib/systemd/systemd-* /lib/udev/rules.d/*.rules /%{_lib}/security/pam_systemd.so -%{_mandir}/man?/*.* +%{_mandir}/man1/systemd.* +%{_mandir}/man1/systemctl.* +%{_mandir}/man1/systemd-notify.* +%{_mandir}/man3/* +%{_mandir}/man5/* +%{_mandir}/man7/* +%{_mandir}/man8/pam_systemd.* %{_datadir}/systemd %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service @@ -110,9 +124,19 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pkgconfig/systemd.pc %{_docdir}/systemd +%files units +%defattr(-,root,root,-) +%{_sysconfdir}/systemd +%{_sysconfdir}/xdg/systemd +%dir /lib/systemd +/lib/systemd/system +%{_bindir}/systemd-install +%{_mandir}/man1/systemd-install.* + %files gtk %defattr(-,root,root,-) %{_bindir}/systemadm +%{_mandir}/man1/systemadm.* %files sysvinit %defattr(-,root,root,-) @@ -123,13 +147,24 @@ rm -rf $RPM_BUILD_ROOT /sbin/shutdown /sbin/telinit /sbin/runlevel +%{_mandir}/man1/init.* +%{_mandir}/man8/halt.* +%{_mandir}/man8/reboot.* +%{_mandir}/man8/shutdown.* +%{_mandir}/man8/poweroff.* +%{_mandir}/man8/telinit.* +%{_mandir}/man8/runlevel.* %changelog +* Tue Jun 29 2010 Lennart Poettering - 0-0.7.20100622gita3723b +- New snapshot +- Split off -units package where other packages can depend on without pulling in the whole of systemd + * Tue Jun 22 2010 Lennart Poettering - 0-0.6.20100622gita3723b - Add missing libtool dependency. * Tue Jun 22 2010 Lennart Poettering - 0-0.5.20100622gita3723b -- Update snapshot. +- Update snapshot * Mon Jun 14 2010 Rahul Sundaram - 0-0.4.20100614git393024 - Pull the latest snapshot that fixes a segfault. Resolves rhbz#603231