packages: systemd/systemd.spec - separated init subpackage, gtk bcond fixed...

[gotar]

Author: gotar                        Date: Tue Dec  6 21:16:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- separated init subpackage, gtk bcond fixed again

---- Files affected:
packages/systemd:
   systemd.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.65 packages/systemd/systemd.spec:1.66
--- packages/systemd/systemd.spec:1.65	Tue Dec  6 21:16:00 2011
+++ packages/systemd/systemd.spec	Tue Dec  6 22:15:57 2011
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
-# TODO:	- move %_libexecdir/tmpfiles.d/* to /etc/tmpfiles.d?
+# TODO:
 #	- shouldn't ../bin/systemctl symlinks be absolute? -no they shouldn't (think browsing mounted as chroot and seeing all blink due invalid link targets when doing ls)
-#	- separate init subpackage (with symlink), one can switch to
-#	  systemd using init=/bin/systemd with other one installed
 #	- verify %_sysconfdir usage vs literal '/etc'
 #	- %post systemd-sysv-convert
 #
@@ -70,12 +68,7 @@
 Suggests:	python-dbus
 Suggests:	python-modules
 Suggests:	rsyslog-systemd
-Provides:	readahead = 1:1.5.7-3
 Provides:	udev-acl
-Provides:	virtual(init-daemon)
-Obsoletes:	SysVinit
-Obsoletes:	readahead < 1:1.5.7-3
-Obsoletes:	virtual(init-daemon)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_prefix}/lib
@@ -101,6 +94,18 @@
 zależnościach logikę kontroli usług. Może pracować jako zastępca dla
 sysvinit.
 
+%package init
+Summary:	systemd /sbin/init and LSB/SysV compatibility symlinks
+Group:		Base
+Provides:	readahead = 1:1.5.7-3
+Provides:	virtual(init-daemon)
+Obsoletes:	SysVinit
+Obsoletes:	readahead < 1:1.5.7-3
+Obsoletes:	virtual(init-daemon)
+
+%description init
+Install this package when you are ready to final switch to systemd.
+
 %package units
 Summary:	Configuration files, directories and installation tool for systemd
 Group:		Base
@@ -231,9 +236,6 @@
 > $RPM_BUILD_ROOT/var/log/wtmp
 
 %if %{without gtk}
-# to shut up check-files
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/systemadm
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/systemd-gnome-ask-password-agent
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/systemadm.1*
 %endif
 
@@ -322,13 +324,6 @@
 %attr(755,root,root) %{_bindir}/systemd-nspawn
 %attr(755,root,root) %{_bindir}/systemd-stdio-bridge
 %attr(755,root,root) %{_bindir}/systemd-sysv-convert
-%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
 %attr(755,root,root) /lib/systemd/systemd-*
 %dir /lib/systemd/system-generators
 %attr(755,root,root) /lib/systemd/system-generators/systemd-*-generator
@@ -358,7 +353,6 @@
 %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
 %dir %{_datadir}/systemd
 %{_datadir}/systemd/kbd-model-map
-%{_mandir}/man1/init.1
 %{_mandir}/man1/systemd.1*
 %{_mandir}/man1/systemd-*.1*
 %{_mandir}/man3/sd_booted.3*
@@ -386,12 +380,6 @@
 %{_mandir}/man7/sd-daemon.7*
 %{_mandir}/man7/sd-readahead.7*
 %{_mandir}/man7/systemd.special.7*
-%{_mandir}/man8/halt.8*
-%{_mandir}/man8/poweroff.8
-%{_mandir}/man8/reboot.8
-%{_mandir}/man8/runlevel.8*
-%{_mandir}/man8/shutdown.8*
-%{_mandir}/man8/telinit.8*
 %attr(640,root,root) %ghost /var/log/btmp
 %attr(664,root,utmp) %ghost /var/log/wtmp
 
@@ -400,6 +388,22 @@
 %{_mandir}/man8/pam_systemd.8*
 %endif
 
+%files init
+%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
+%{_mandir}/man1/init.1
+%{_mandir}/man8/halt.8*
+%{_mandir}/man8/poweroff.8
+%{_mandir}/man8/reboot.8
+%{_mandir}/man8/runlevel.8*
+%{_mandir}/man8/shutdown.8*
+%{_mandir}/man8/telinit.8*
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libsystemd-daemon.so.*.*.*
@@ -463,6 +467,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2011/12/06 21:15:57  gotar
+- separated init subpackage, gtk bcond fixed again
+
 Revision 1.65  2011/12/06 20:16:00  wiget
 - %config for *.wants content not *.wants dir itself
 - rel. 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.65&r2=1.66&f=u