rpms/udev/devel udev.spec,1.318,1.319
Lennart Poettering
lennart at fedoraproject.org
Tue Jul 13 19:54:32 UTC 2010
Author: lennart
Update of /cvs/pkgs/rpms/udev/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28245
Modified Files:
udev.spec
Log Message:
Update systemd-install lines to use --realize instead of --start (which got renamed in systemd)
Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- udev.spec 13 Jul 2010 19:41:07 -0000 1.318
+++ udev.spec 13 Jul 2010 19:54:32 -0000 1.319
@@ -5,7 +5,7 @@
Summary: A rule-based device node and kernel event manager
Name: udev
Version: 160
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
@@ -23,6 +23,7 @@ Requires(pre): /usr/bin/stat /sbin/pidof
Requires(pre): /usr/bin/getent /usr/sbin/groupadd
Requires: hwdata
Requires: systemd-units
+Requires: pkgconfig
Conflicts: systemd < 3
%ifarch s390 s390x
@@ -40,8 +41,6 @@ BuildRequires: gobject-introspection-dev
BuildRequires: gtk-doc
BuildRequires: usbutils >= 0.82
BuildRequires: libtool >= 2.2.6
-BuildRequires: systemd-units
-BuildRequires: systemd
BuildRequires: pkgconfig
Requires: libselinux >= 0:1.17.9-2 sed
Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
@@ -180,7 +179,7 @@ if [ "$1" -eq 0 -a -f %{_initrddir}/udev
fi
if [ "$1" -eq 0 ]; then
/sbin/chkconfig --del udev-post
- /usr/bin/systemd-install --system --start disable udev.service >/dev/null 2>&1 || :
+ /usr/bin/systemd-install --system --realize disable udev.service >/dev/null 2>&1 || :
fi
exit 0
@@ -216,7 +215,7 @@ if test -f /proc/1/exe -a -d /proc/1/roo
fi
fi
/sbin/chkconfig --add udev-post
-/usr/bin/systemd-install --system --start enable udev.service >/dev/null 2>&1 || :
+/usr/bin/systemd-install --system --realize=minimal enable udev.service >/dev/null 2>&1 || :
exit 0
@@ -303,7 +302,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pkgconfig/udev.pc
%attr(0755,root,root) /sbin/start_udev
-%define systemdsystemunitdir %(/lib/systemd/system)
+%define systemdsystemunitdir /lib/systemd/system
%attr(0644,root,root) %{systemdsystemunitdir}/udev-retry.service
%attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service
%attr(0644,root,root) %{systemdsystemunitdir}/udev.service
@@ -347,6 +346,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
%changelog
+* Tue Jul 13 2010 Lennart Poettering <lpoetter at redhat.com> - 160-3
+- Update systemd-install lines to use --realize instead of --start (which got renamed in systemd)
+
* Tue Jul 13 2010 Lennart Poettering <lpoetter at redhat.com> - 160-2
- Don't require systemd .pc file, to break build dependency cycle
More information about the scm-commits
mailing list