- up to 18, units, gtk subpackages

Changed files:
    systemd.spec -> 1.17

diff --git a/systemd.spec b/systemd.spec
index 4dfe48ddb802863721c052c2a5a26c1279c900ce..c02adde160f07006aef8bb1e4397ef3c853078e6 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,42 +1,48 @@
-#
 # TODO:
 # - gtk BRs: libnotify 0.7 and gtk+3
 # - subpackages: bash-autocompletion, dbus(?), gtk, others?
 # - more BRs
 #
-
+# Conditional build:
 %bcond_with    gtk     # build gtk tools
 
-Summary:       systemd - a system and service manager for Linux
+Summary:       A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
-Version:       15
+Version:       18
 Release:       0.1
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2
-# Source0-md5: 36011aa8593862ca78e3e909f6143570
+# Source0-md5: 42a47d6fa60b7f3fe92fa22027713b32
 URL:           http://www.freedesktop.org/wiki/Software/systemd
+BuildRequires: audit-libs-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: cryptsetup-luks-devel
 BuildRequires: dbus-devel
-BuildRequires: audit-libs-devel
+BuildRequires: docbook-style-xsl
+BuildRequires: gtk+2-devel
 BuildRequires: libcap-devel
-%if %{with gtk}
-BuildRequires: libnotify-devel >= 0.7.0
-%endif
+%{?with_gtk:BuildRequires:     libnotify-devel >= 0.7}
 BuildRequires: libselinux-devel
 BuildRequires: libtool
 BuildRequires: libwrap-devel
+BuildRequires: libxslt
 BuildRequires: pam-devel
+BuildRequires: pkgconfig
 BuildRequires: udev-devel >= 160
 BuildRequires: vala >= 0.11
+Requires:      %{name}-units = %{version}-%{release}
+Requires:      dbus >= 1.3.2
+Requires:      rc-scripts
+Requires:      udev-core >= 160
 Provides:      SysVinit = 2.86-23
+Provides:      readahead = 1:1.5.7-3
 Provides:      virtual(init-daemon)
-Obsoletes:     SysVinit
+Obsoletes:     SysVinit < 2.86-23
+Obsoletes:     readahead < 1:1.5.7-3
 Obsoletes:     virtual(init-daemon)
-Obsoletes:     vserver-SysVinit
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,6 +66,26 @@ implementuje starannie opracowaną transakcjonalną, bazującą na
 zależnościach logikę kontroli usług. Może pracować jako zastępca dla
 sysvinit.
 
+%package units
+Summary:       Configuration files, directories and installation tool for systemd
+Group:         Base
+Requires:      pkgconfig
+Requires(post):        coreutils
+Requires(post):        gawk
+
+%description units
+Basic configuration files, directories and installation tool for the
+systemd system and service manager.
+
+%package gtk
+Summary:       Graphical frontend for systemd
+Group:         Base
+Requires:      %{name} = %{version}-%{release}
+Requires:      polkit
+
+%description gtk
+Graphical front-end for systemd.
+
 %prep
 %setup -q
 
@@ -78,10 +104,25 @@ sysvinit.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+find $RPM_BUILD_ROOT '(' -name '*.a' -o -name '*.la' ')' | xargs rm -v
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+
+# no -devel (yet)
+rm -f $RPM_BUILD_ROOT%{_npkgconfigdir}/systemd.pc
+
+%if %{without gtk}
+# to shut up check-files
+rm -f $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
+rm -f $RPM_BUILD_ROOT%{_bindir}/systemadm
+rm -f $RPM_BUILD_ROOT%{_bindir}/systemd-gnome-ask-password-agent
+rm -f $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/systemadm.1*
+%endif
+
 # Create SysV compatibility symlinks. systemctl/systemd are smart
 # enough to detect in which way they are called.
 install -d $RPM_BUILD_ROOT/sbin
@@ -93,30 +134,39 @@ ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/shutdown
 ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit
 ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel
 
+# We create all wants links manually at installation time to make sure
+# they are not owned and hence overriden by rpm after the used deleted
+# them.
+rm -r $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /bin/systemctl daemon-reexec > /dev/null 2>&1 || :
-if [ $1 -eq 1 ] ; then
-       # Try to read default runlevel from the old inittab if it exists
-       runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null)
-       if [ -z "$runlevel" ] ; then
-               target="/lib/systemd/system/runlevel$runlevel.target"
-       else
-               target="/lib/systemd/system/runlevel3.target"
-       fi
-
-       # And symlink what we found to the new-style default.target
-       /bin/ln -sf "$target" /etc/systemd/system/default.target > /dev/null 2>&1 || :
-       #/bin/systemctl enable SERVICES > /dev/null 2>&1 || :
+
+%post units
+if [ $1 -ne 1 ]; then
+       exit 0
 fi
 
-%preun
-if [ $1 -eq 0 ] ; then
-       #/bin/systemctl disable SERVICES > /dev/null 2>&1 || :
-       /bin/rm -f /etc/systemd/system/default.target > /dev/null 2>&1 || :
+# Try to read default runlevel from the old inittab if it exists
+runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null)
+if [ -z "$runlevel" ] ; then
+       runlevel=3
 fi
+target="/lib/systemd/system/runlevel$runlevel.target"
+
+# And symlink what we found to the new-style default.target
+ln -sf "$target" %{_sysconfdir}/systemd/system/default.target > /dev/null 2>&1 || :
+#/bin/systemctl enable SERVICES > /dev/null 2>&1 || :
+
+%preun units
+if [ $1 -ne 0 ]; then
+       exit 0
+fi
+#/bin/systemctl disable SERVICES > /dev/null 2>&1 || :
+rm -f %{_sysconfdir}/systemd/system/default.target > /dev/null 2>&1 || :
 
 %postun
 if [ $1 -ge 1 ] ; then
@@ -126,45 +176,36 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc DISTRO_PORTING README TODO
-%attr(755,root,root) /bin/systemctl
+/etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+%dir %{_sysconfdir}/systemd
+%{_sysconfdir}/tmpfiles.d/systemd.conf
+%{_sysconfdir}/tmpfiles.d/x11.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system.conf
+%dir /etc/xdg/systemd
+/etc/xdg/systemd/user
 %attr(755,root,root) /bin/systemd
 %attr(755,root,root) /bin/systemd-ask-password
-%attr(755,root,root) %{_bindir}/systemd-cgls
 %attr(755,root,root) /bin/systemd-notify
 %attr(755,root,root) /bin/systemd-tty-ask-password-agent
-/sbin/halt
-/sbin/init
-/sbin/poweroff
-/sbin/reboot
-/sbin/runlevel
-/sbin/shutdown
-/sbin/telinit
-/lib/systemd/
-/etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-%{_sysconfdir}/systemd
-%{_sysconfdir}/tmpfiles.d
-%{_sysconfdir}/xdg/systemd
+%attr(755,root,root) %{_bindir}/systemd-cgls
+%attr(755,root,root) /sbin/halt
+%attr(755,root,root) /sbin/init
+%attr(755,root,root) /sbin/poweroff
+%attr(755,root,root) /sbin/reboot
+%attr(755,root,root) /sbin/runlevel
+%attr(755,root,root) /sbin/shutdown
+%attr(755,root,root) /sbin/telinit
+%dir /lib/systemd
+/lib/systemd/systemd-*
+%dir /lib/systemd/system-generators
+/lib/systemd/system-generators/systemd-cryptsetup-generator
 /lib/udev/rules.d/99-systemd.rules
-/%{_lib}/security/pam_systemd.la
 %attr(755,root,root) /%{_lib}/security/pam_systemd.so
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Automount.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Device.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Job.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Mount.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Path.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Service.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Snapshot.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Socket.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Swap.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Target.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Timer.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Unit.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
 %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
+%{_datadir}/systemd
 %{_mandir}/man1/init.1
-%{_mandir}/man1/systemadm.1*
-%{_mandir}/man1/systemctl.1*
 %{_mandir}/man1/systemd-cgls.1*
 %{_mandir}/man1/systemd-notify.1*
 %{_mandir}/man1/systemd.1*
@@ -194,7 +235,6 @@ fi
 %{_mandir}/man5/systemd.target.5*
 %{_mandir}/man5/systemd.timer.5*
 %{_mandir}/man5/systemd.unit.5*
-%{_mandir}/man5/tmpfiles.d.5*
 %{_mandir}/man5/vconsole.conf.5*
 %{_mandir}/man7/daemon.7*
 %{_mandir}/man7/sd-daemon.7*
@@ -207,5 +247,25 @@ fi
 %{_mandir}/man8/runlevel.8*
 %{_mandir}/man8/shutdown.8*
 %{_mandir}/man8/telinit.8*
+
+%files units
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/systemd
+%dir %{_sysconfdir}/systemd/system
+%dir %{_sysconfdir}/tmpfiles.d
+%dir /lib/systemd
+/lib/systemd/system
+%attr(755,root,root) /bin/systemctl
+%attr(755,root,root) /bin/systemd-tmpfiles
+%{_mandir}/man5/tmpfiles.d.5*
+%{_mandir}/man1/systemctl.1*
+%{_mandir}/man8/systemd-tmpfiles.8*
+
+%if %{with gtk}
+%files gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/systemadm
+%attr(755,root,root) %{_bindir}/systemd-gnome-ask-password-agent
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
-%{_datadir}/systemd
+%{_mandir}/man1/systemadm.1*
+%endif