packages: systemd/systemd.spec - mask SysV random service - it's replaced b...

[gotar]

Author: gotar                        Date: Wed Dec  7 12:16:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mask SysV random service - it's replaced by systemd-random-seed-{load,save}.service
- fixed path of removed mounts

---- Files affected:
packages/systemd:
   systemd.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.68 packages/systemd/systemd.spec:1.69
--- packages/systemd/systemd.spec:1.68	Wed Dec  7 00:22:20 2011
+++ packages/systemd/systemd.spec	Wed Dec  7 13:15:57 2011
@@ -204,6 +204,7 @@
 ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit
 
 ln -s ../modules $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/modules.conf
+ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/random.service
 
 # All wants links are created at %post to make sure they are not owned
 # and hence overriden by rpm if the user deletes them (missingok?)
@@ -211,9 +212,9 @@
 
 # do not cover /media (system-specific removable mountpoints) for now
 # needs %post code to convert existing /media structure to tmpfiles
-%{__rm} -f $RPM_BUILD_ROOT/lib/systemd/local-fs.target.wants/media.mount
+%{__rm} $RPM_BUILD_ROOT/lib/systemd/system/local-fs.target.wants/media.mount
 # do not cover /var/run until packages need rpm-provided-only subdirectories
-%{__rm} -f $RPM_BUILD_ROOT/lib/systemd/local-fs.target.wants/var-run.mount
+%{__rm} $RPM_BUILD_ROOT/lib/systemd/system/local-fs.target.wants/var-run.mount
 
 # Make sure these directories are properly owned:
 #	- halt,kexec,poweroff,reboot: generic ones used by ConsoleKit-systemd,
@@ -228,8 +229,8 @@
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 
 install -d $RPM_BUILD_ROOT/var/log
-> $RPM_BUILD_ROOT/var/log/btmp
-> $RPM_BUILD_ROOT/var/log/wtmp
+:> $RPM_BUILD_ROOT/var/log/btmp
+:> $RPM_BUILD_ROOT/var/log/wtmp
 
 %if %{without gtk}
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/systemadm.1*
@@ -463,6 +464,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2011/12/07 12:15:57  gotar
+- mask SysV random service - it's replaced by systemd-random-seed-{load,save}.service
+- fixed path of removed mounts
+
 Revision 1.68  2011/12/06 23:22:20  gotar
 - systemd-init R: systemd (no strict EVR as there are symlinks only),
 - removed /lib/systemd/system/default.target.wants directory, no package
================================================================

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