packages: udev/udev.spec - rel 4 - merged systemd stuff into core package

[baggins]

Author: baggins                      Date: Sun Feb  5 17:01:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- merged systemd stuff into core package

---- Files affected:
packages/udev:
   udev.spec (1.367 -> 1.368) 

---- Diffs:

================================================================
Index: packages/udev/udev.spec
diff -u packages/udev/udev.spec:1.367 packages/udev/udev.spec:1.368
--- packages/udev/udev.spec:1.367	Mon Jan 30 18:35:52 2012
+++ packages/udev/udev.spec	Sun Feb  5 18:01:30 2012
@@ -33,7 +33,7 @@
 Name:		udev
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
 Version:	175
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL v2+
 Group:		Base
@@ -148,6 +148,7 @@
 Requires:	coreutils
 Requires:	filesystem >= 3.0-45
 Requires:	setup >= 2.6.1-1
+Requires:	systemd-units >= 0.38
 Requires:	uname(release) >= 2.6.32
 Suggests:	%{name}-compat
 Conflicts:	udev < 1:118-1
@@ -158,18 +159,6 @@
 %description core -l pl.UTF-8
 Implementacja devfs w przestrzeni użytkownika - główna część udev.
 
-%package systemd
-Summary:	systemd units for udev
-Summary(pl.UTF-8):	Jednostki systemd do usługi udev
-Group:		Base
-Requires:	%{name}-core = %{epoch}:%{version}-%{release}
-
-%description systemd
-systemd units for udev.
-
-%description systemd -l pl.UTF-8
-Jednostki systemd do usługi udev.
-
 %package libs
 Summary:	Shared library to access udev device information
 Summary(pl.UTF-8):	Biblioteka współdzielona do dostępu do informacji o urządzeniach udev
@@ -429,6 +418,9 @@
 %triggerpostun core -- udev < 165
 /sbin/udevadm info --convert-db
 
+%triggerpostun core -- %{name}-core < 1:175-4
+%systemd_trigger udev-settle.service
+
 %post core
 if [ $1 -gt 1 ]; then
 	if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
@@ -436,28 +428,25 @@
 			/sbin/udevadm control --exit
 			/lib/udev/udevd --daemon
 		fi
+	else
+		SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+		/bin/systemctl --quiet try-restart udev.service || :
 	fi
 fi
+%systemd_post udev-settle.service
  
+%preun core
+%systemd_preun udev-settle.service
+
+%postun core
+%systemd_reload
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
 %post	glib -p /sbin/ldconfig
 %postun	glib -p /sbin/ldconfig
 
-%post systemd
-%systemd_post udev-settle.service
-if [ $1 -gt 1 ] && /bin/systemd_booted; then
-	SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	/bin/systemctl --quiet try-restart udev.service || :
-fi
-
-%preun systemd
-%systemd_preun udev-settle.service
-
-%postun systemd
-%systemd_reload
-
 %files
 %defattr(644,root,root,755)
 %dev(c,1,3) %attr(666,root,root) /dev/null
@@ -553,8 +542,6 @@
 %{_mandir}/man7/udev.7*
 %{_mandir}/man8/*
 
-%files systemd
-%defattr(644,root,root,755)
 %{systemdunitdir}/basic.target.wants/udev-trigger.service
 %{systemdunitdir}/basic.target.wants/udev.service
 %{systemdunitdir}/sockets.target.wants/udev-control.socket
@@ -632,6 +619,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.368  2012/02/05 17:01:30  baggins
+- rel 4
+- merged systemd stuff into core package
+
 Revision 1.367  2012/01/30 17:35:52  arekm
 - file url updated; web url dropped (not working)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev.spec?r1=1.367&r2=1.368&f=u