packages: udev/udev.spec - mv to new rpm macros

[cactus]

Author: cactus                       Date: Sun Dec  4 01:31:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mv to new rpm macros

---- Files affected:
packages/udev:
   udev.spec (1.361 -> 1.362) 

---- Diffs:

================================================================
Index: packages/udev/udev.spec
diff -u packages/udev/udev.spec:1.361 packages/udev/udev.spec:1.362
--- packages/udev/udev.spec:1.361	Sat Dec  3 21:50:27 2011
+++ packages/udev/udev.spec	Sun Dec  4 02:31:42 2011
@@ -71,7 +71,7 @@
 BuildRequires:	pciutils
 BuildRequires:	pkgconfig
 BuildRequires:	python-modules
-BuildRequires:	rpmbuild(macros) >= 1.446
+BuildRequires:	rpmbuild(macros) >= 1.623
 BuildRequires:	sed >= 4.0
 BuildRequires:	usbutils >= 0.82
 BuildRequires:	zlib-devel
@@ -358,7 +358,7 @@
 	--enable-shared \
 	--enable-static \
 	--with-pci-ids-path=%{_sysconfdir}/pci.ids \
-	--with-systemdsystemunitdir=/lib/systemd/system \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
 	--with%{!?with_selinux:out}-selinux
 %{__make}
 
@@ -433,11 +433,11 @@
 %postun	glib -p /sbin/ldconfig
 
 %post systemd
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-/bin/systemctl start udev.service >/dev/null 2>&1 || :
+%systemd_post
+%systemd_enable udev.service
 
 %postun systemd
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%systemd_postun udev.service
 
 %files
 %defattr(644,root,root,755)
@@ -536,15 +536,15 @@
 
 %files systemd
 %defattr(644,root,root,755)
-/lib/systemd/system/basic.target.wants/udev-trigger.service
-/lib/systemd/system/basic.target.wants/udev.service
-/lib/systemd/system/sockets.target.wants/udev-control.socket
-/lib/systemd/system/sockets.target.wants/udev-kernel.socket
-/lib/systemd/system/udev-control.socket
-/lib/systemd/system/udev-kernel.socket
-/lib/systemd/system/udev-settle.service
-/lib/systemd/system/udev-trigger.service
-/lib/systemd/system/udev.service
+%{systemdunitdir}/basic.target.wants/udev-trigger.service
+%{systemdunitdir}/basic.target.wants/udev.service
+%{systemdunitdir}/sockets.target.wants/udev-control.socket
+%{systemdunitdir}/sockets.target.wants/udev-kernel.socket
+%{systemdunitdir}/udev-control.socket
+%{systemdunitdir}/udev-kernel.socket
+%{systemdunitdir}/udev-settle.service
+%{systemdunitdir}/udev-trigger.service
+%{systemdunitdir}/udev.service
 
 %files libs
 %defattr(644,root,root,755)
@@ -613,6 +613,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.362  2011/12/04 01:31:42  cactus
+- mv to new rpm macros
+
 Revision 1.361  2011/12/03 20:50:27  wiget
 - %files cleanup
 
================================================================

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