Author: arekm Date: Sun Feb 3 11:47:24 2008 GMT Module: SPECS Tag: HEAD ---- Log message: up to 118; try approach with separating core part to udev-core (which can be installed without messing with /dev/ contents)
---- Files affected: SPECS: udev.spec (1.230 -> 1.231) ---- Diffs: ================================================================ Index: SPECS/udev.spec diff -u SPECS/udev.spec:1.230 SPECS/udev.spec:1.231 --- SPECS/udev.spec:1.230 Mon Oct 29 14:54:57 2007 +++ SPECS/udev.spec Sun Feb 3 12:47:19 2008 @@ -32,13 +32,13 @@ Summary: Device manager for the Linux 2.6 kernel series Summary(pl.UTF-8): Zarządca urządzeń dla Linuksa 2.6 Name: udev -Version: 116 -Release: 1 +Version: 118 +Release: 0.1 Epoch: 1 License: GPL Group: Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 -# Source0-md5: 02c49d93ffda4a104c853c082138b835 +# Source0-md5: 39ab2404464c7026c65eb878827192b9 # rules Source1: %{name}-alsa.rules Source2: %{name}-hotplug_map.rules @@ -59,7 +59,7 @@ Patch0: %{name}-lib64.patch URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRequires: device-mapper-devel -%{?with_selinux:BuildRequires: libselinux-devel >= 1.17.13} +%{?with_selinux:BuildRequires: libselinux-devel >= 1.17.13} BuildRequires: sed >= 4.0 %if %{with initrd} %{?with_dietlibc:BuildRequires: dietlibc-static} @@ -68,14 +68,9 @@ %{?with_klibc:BuildRequires: linux-libc-headers} %{?with_uClibc:BuildRequires: uClibc-static >= 0.9.28} %endif -Requires: coreutils -Requires: libvolume_id = %{epoch}:%{version}-%{release} +Requires: %{name}-core = %{epoch}:%{version}-%{release} Provides: dev = 3.0.0 Obsoletes: dev -Obsoletes: hotplug -Obsoletes: hotplug-input -Obsoletes: hotplug-net -Obsoletes: hotplug-pci Obsoletes: udev-dev Conflicts: kernel < 3:2.6.15 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -86,14 +81,32 @@ %description udev is the device manager for the Linux 2.6 kernel series. Its -primary function is managing device nodes in /dev. It is the -successor of devfs and hotplug. +primary function is managing device nodes in /dev. It is the successor +of devfs and hotplug. %description -l pl.UTF-8 udev jest zarządcą urządzeń dla Linuksa 2.6. Jego główną funkcją jest zarządzanie węzłami urządzeń w katalogu /dev. Jest następcą devfs i hotpluga. +%package core +Summary: A userspace implementation of devfs - core part of udev +Summary(pl.UTF-8): Implementacja devfs w przestrzeni użytkownika - główna część udev +Group: Base +Requires: coreutils +Requires: libvolume_id = %{epoch}:%{version}-%{release} +Obsoletes: hotplug +Obsoletes: hotplug-input +Obsoletes: hotplug-net +Obsoletes: hotplug-pci +Conflicts: kernel < 3:2.6.15 + +%description core +A userspace implementation of devfs - core part of udev. + +%description core -l pl.UTF-8 +Implementacja devfs w przestrzeni użytkownika - główna część udev. + %package initrd Summary: A userspace implementation of devfs - static binary for initrd Summary(pl.UTF-8): Implementacja devfs w przestrzeni użytkownika - statyczna binarka dla initrd @@ -147,7 +160,7 @@ Summary: udev tools Summary(pl.UTF-8): Narzędzia udev Group: Base -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-core = %{epoch}:%{version}-%{release} %description tools udev tools - programs not needed for bootup. @@ -187,8 +200,7 @@ V=1 cp -a udevd initrd-udevd -cp -a udevtrigger initrd-udevtrigger -cp -a udevsettle initrd-udevsettle +cp -a udevadm initrd-udevadm # What is this FIXME business and why is initrd # broken, if it's fine? @@ -285,7 +297,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%triggerpostun -- dev +%triggerpostun core -- dev if [ "$2" = 0 ]; then # need to kill and restart udevd as after obsoleting dev package the # /dev tree will remain empty. umask is needed as otherwise udev will @@ -294,7 +306,7 @@ /sbin/start_udev || exit 0 fi -%triggerpostun -- udev < 108 +%triggerpostun core -- udev < 108 sed -i -e 's#IMPORT{program}="/sbin/#IMPORT{program}="#g' /etc/udev/rules.d/*.rules sed -i -e 's#/lib/udev/#/%{_lib}/udev/#g' /etc/udev/rules.d/*.rules @@ -304,6 +316,12 @@ %if %{with main} %files %defattr(644,root,root,755) +%dev(c,1,3) %attr(666,root,root) /dev/null +%dev(c,5,1) %attr(660,root,console) /dev/console +%dev(c,1,5) %attr(666,root,root) /dev/zero + +%files core +%defattr(644,root,root,755) %doc ChangeLog FAQ README RELEASE-NOTES TODO %doc docs/{overview,udev_vs_devfs,writing_udev_rules} @@ -331,6 +349,7 @@ %attr(755,root,root) %{_sbindir}/start_udev %attr(755,root,root) %{_sbindir}/udevcontrol %attr(755,root,root) %{_sbindir}/udevd +%attr(755,root,root) %{_sbindir}/udevadm %attr(755,root,root) %{_sbindir}/udevsettle %attr(755,root,root) %{_sbindir}/udevtrigger @@ -358,10 +377,6 @@ %{_mandir}/man7/* %{_mandir}/man8/* - -%dev(c,1,3) %attr(666,root,root) /dev/null -%dev(c,5,1) %attr(660,root,console) /dev/console -%dev(c,1,5) %attr(666,root,root) /dev/zero %endif %if %{with initrd} @@ -395,7 +410,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.230 2007-10-29 13:54:57 arvenil +Revision 1.231 2008-02-03 11:47:19 arekm +up to 118; try approach with separating core part to udev-core (which can be installed without messing with /dev/ contents) + +Revision 1.230 2007/10/29 13:54:57 arvenil - removed /etc/udev/scripts dir (not needed anymore by alsa-udev.spec) Revision 1.229 2007/10/24 22:06:10 wrobell ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/udev.spec?r1=1.230&r2=1.231&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
