packages: systemd/systemd.spec - added metapackage to avoid /var/run compat...

[baggins]

Author: baggins                      Date: Wed Feb  1 10:41:24 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added metapackage to avoid /var/run compat pollution

---- Files affected:
packages/systemd:
   systemd.spec (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.101 packages/systemd/systemd.spec:1.102
--- packages/systemd/systemd.spec:1.101	Mon Jan 30 18:11:31 2012
+++ packages/systemd/systemd.spec	Wed Feb  1 11:41:19 2012
@@ -82,6 +82,7 @@
 Suggests:	python-dbus
 Suggests:	python-modules
 Suggests:	service(syslog)
+Suggests:	%{name}-no-compat-tmpfiles
 Provides:	udev-acl
 Conflicts:	upstart
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -197,6 +198,95 @@
 %description -n bash-completion-systemd -l pl.UTF-8
 Bashowe dopełnianie składni dla systemd
 
+%package no-compat-tmpfiles
+Summary:	Force update of packages that provide tmpfiles.d configuration
+Group:		Base
+Requires(post):	sed > 4.0
+Conflicts:	ConsoleKit-dirs < 0.4.5-7
+Conflicts:	NetworkManager < 2:0.9.2.0-3
+Conflicts:	Zope < 2.11.8-2
+Conflicts:	amavisd-new < 1:2.7.0-1
+Conflicts:	apache1-base < 1.3.42-5
+Conflicts:	apache1-mod_fastcgi < 2.4.6-2
+Conflicts:	apache-base < 2.2.21-4
+Conflicts:	apache-mod_bw < 0.92-3
+Conflicts:	apache-mod_fastcgi < 2.4.6-6
+Conflicts:	asterisk < 10.0.1-2
+Conflicts:	autossh-init < 1.4b-3
+Conflicts:	balance < 3.54-2
+Conflicts:	bind < 7:9.8.1.P1-4
+Conflicts:	bopm < 3.1.3-4
+Conflicts:	callweaver < 1.2.1-9
+Conflicts:	cassandra-bin < 0.8.9-2
+Conflicts:	clamav < 0.97.3-3
+Conflicts:	cups < 1:1.5.0-10
+Conflicts:	dbus < 1.4.16-4
+Conflicts:	dovecot < 1:2.0.16-3
+Conflicts:	dspam < 3.9.0-6
+Conflicts:	fail2ban < 0.8.4-4
+Conflicts:	filesystem < 4.0-3
+Conflicts:	gammu-smsd < 1:1.31.0-3
+Conflicts:	gdm < 2:3.2.1.1-9
+Conflicts:	greylistd < 0.8.8-2
+Conflicts:	inn < 2.4.6-7
+Conflicts:	ipsec-tools < 0.8.0-3
+Conflicts:	jabber-common < 0-9
+Conflicts:	laptop-mode-tools < 1.58-2
+Conflicts:	libgpod < 0.8.0-6
+Conflicts:	libvirt-utils < 0.9.9-4
+Conflicts:	lighttpd < 1.4.30-5
+Conflicts:	lirc < 0.9.0-20
+Conflicts:	mailman < 5:2.1.14-4
+Conflicts:	memcached < 1.4.11-2
+Conflicts:	mpd < 0.16.5-4
+Conflicts:	mrtg < 2.17.0-3
+Conflicts:	munin-common < 1.4.5-5
+Conflicts:	nagios-nrpe < 2.13-2
+Conflicts:	ndisc6-rdnssd < 1.0.1-3
+Conflicts:	nscd < 6:2.14.1-5
+Conflicts:	nss_ldapd-nslcd < 0.8.4-2
+Conflicts:	openct < 0.6.20-3
+Conflicts:	openl2tp < 1.8-3
+Conflicts:	openldap-overlay-nssov < 2.4.28-4
+Conflicts:	openldap-servers < 2.4.28-4
+Conflicts:	openvpn < 2.2.2-2
+Conflicts:	pam < 1:1.1.5-3
+Conflicts:	pam-pam_mount < 2.12-3
+Conflicts:	pam-pam_ssh < 1.97-2
+Conflicts:	pcsc-lite < 1.8.1-2
+Conflicts:	php-dirs < 1.2-3
+Conflicts:	policyd < 2.0.10-3
+Conflicts:	pound < 2.6-2
+Conflicts:	pptp < 1.7.2-3
+Conflicts:	proftpd-common < 2:1.3.4a-2
+Conflicts:	pulseaudio-server < 1.1-2
+Conflicts:	quagga < 0.99.20-3
+Conflicts:	radvd < 1.8.5-2
+Conflicts:	rc-scripts < 0.4.5.2-3
+Conflicts:	red5 < 0.9.0-2
+Conflicts:	redis-server < 2.4.2-4
+Conflicts:	smokeping < 2.4.2-10
+Conflicts:	smtp-gated < 1.4.17-2
+Conflicts:	socat < 1.7.2.0-2
+Conflicts:	speech-dispatcher < 0.7.1-2
+Conflicts:	sphinx < 2.0.3-4
+Conflicts:	splashutils < 1.5.4.3-3
+Conflicts:	stunnel < 4.50-2
+Conflicts:	sudo < 1:1.7.8p2-2
+Conflicts:	tenshi < 0.12-2
+Conflicts:	tor < 0.2.2.35-2
+Conflicts:	ucarp < 1.5.2-3
+Conflicts:	udisks < 1.0.4-3
+Conflicts:	util-vserver < 0.30.216-1.pre3002.3
+Conflicts:	vpnc < 0.5.3-2
+Conflicts:	web2ldap < 1.1.0rc1-2
+Conflicts:	wesnoth-server < 1:1.10-2
+Conflicts:	wpa_supplicant < 0.7.3-10
+Conflicts:	xl2tpd < 1.3.0-2
+
+%description no-compat-tmpfiles
+Force update of packages that provide tmpfiles.d configuration
+
 %prep
 %setup -q
 %patch0 -p1
@@ -376,6 +466,9 @@
 	/bin/systemctl daemon-reload > /dev/null 2>&1 || :
 fi
 
+%post no-compat-tmpfiles
+%{__sed} -i -e '/^/# /g' %{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
+
 %files
 %defattr(644,root,root,755)
 %doc DISTRO_PORTING README TODO
@@ -578,12 +671,19 @@
 %defattr(644,root,root,755)
 /etc/bash_completion.d/systemd-bash-completion.sh
 
+%files no-compat-tmpfiles
+%defattr(644,root,root,755)
+# empty package
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2012/02/01 10:41:19  baggins
+- added metapackage to avoid /var/run compat pollution
+
 Revision 1.101  2012/01/30 17:11:31  qboosh
 - udev epoch, BR: xz-devel
 
================================================================

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