SPECS (UDEV-124): udev.spec - merged from HEAD: - added scripts (and subp...

[hawk]

Author: hawk                         Date: Mon Mar 16 16:03:20 2009 GMT
Module: SPECS                         Tag: UDEV-124
---- Log message:
- merged from HEAD:
  - added scripts (and subpackage) for initramfs-tools
  - BR uClibc-static with working ppoll

---- Files affected:
SPECS:
   udev.spec (1.240.2.4 -> 1.240.2.5) 

---- Diffs:

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.240.2.4 SPECS/udev.spec:1.240.2.5
--- SPECS/udev.spec:1.240.2.4	Thu Mar 12 22:01:57 2009
+++ SPECS/udev.spec	Mon Mar 16 17:03:14 2009
@@ -33,7 +33,7 @@
 Summary(pl.UTF-8):	Zarządca urządzeń dla Linuksa 2.6
 Name:		udev
 Version:	124
-Release:	4
+Release:	4.1
 Epoch:		1
 License:	GPL
 Group:		Base
@@ -56,6 +56,10 @@
 Source30:	%{name}-usb.distmap
 Source31:	%{name}-usb.handmap
 Source32:	%{name}.blacklist
+# initramfs
+Source40:	%{name}-initramfs-bottom
+Source41:	%{name}-initramfs-hook
+Source42:	%{name}-initramfs-premount
 Patch0:		%{name}-vol_id-cdrom.patch
 URL:		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRequires:	device-mapper-devel
@@ -66,7 +70,7 @@
 %{?with_glibc:BuildRequires:	glibc-static}
 %{?with_klibc:BuildRequires:	klibc-static}
 %{?with_klibc:BuildRequires:	linux-libc-headers}
-%{?with_uClibc:BuildRequires:	uClibc-static >= 0.9.28}
+%{?with_uClibc:BuildRequires:	uClibc-static >= 3:0.9.29-23}
 %endif
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 Provides:	dev = 3.0.0
@@ -106,6 +110,19 @@
 %description core -l pl.UTF-8
 Implementacja devfs w przestrzeni użytkownika - główna część udev.
 
+%package initramfs
+Summary:	A userspace implementation of devfs - support scripts for initramfs-tools
+Summary(pl.UTF-8):	Implementacja devfs w przestrzeni użytkownika - skrypty dla initramfs-tools
+Group:		Base
+Requires:	%{name}-core = %{epoch}:%{version}-%{release}
+Requires:	initramfs-tools
+
+%description initramfs
+A userspace implementation of devfs - support scripts for initramfs-tools.
+
+%description initramfs -l pl.UTF-8
+Implementacja devfs w przestrzeni użytkownika - skrypty dla initramfs-tools.
+
 %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
@@ -228,7 +245,8 @@
 
 %if %{with main}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,udev/rules.d} \
-	$RPM_BUILD_ROOT/lib/udev/devices
+	$RPM_BUILD_ROOT/lib/udev/devices \
+	$RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/init-{bottom,premount}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -275,6 +293,11 @@
 # install misc
 install %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/udev_blacklist.conf
 
+# install support for initramfs-tools
+install %{SOURCE40} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/init-bottom/udev
+install %{SOURCE41} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/udev
+install %{SOURCE42} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/init-premount/udev
+
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_sbindir}
 install initrd-* $RPM_BUILD_ROOT%{_sbindir}
@@ -377,6 +400,12 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_prefix}/sbin/udev_import_usermap
 
+%files initramfs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/init-bottom/udev
+%attr(755,root,root) %{_datadir}/initramfs-tools/hooks/udev
+%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/init-premount/udev
+
 %files -n libvolume_id
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libvolume_id.so.*.*.*
@@ -398,6 +427,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.240.2.5  2009/03/16 16:03:14  hawk
+- merged from HEAD:
+  - added scripts (and subpackage) for initramfs-tools
+  - BR uClibc-static with working ppoll
+
 Revision 1.240.2.4  2009/03/12 21:01:57  charles
 - added -vol_id-cdrom.patch (for cdrom tray close bug)
 - rel. up
@@ -1192,3 +1226,46 @@
 
 Revision 1.1  2003/08/16 12:39:03  arekm
 - initial pld release
+***************
+*** 50,55 ****
+  Source11:	start_udev
+  # misc
+  Source20:	%{name}.blacklist
+  URL:		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
+  BuildRequires:	device-mapper-devel
+  %{?with_selinux:BuildRequires:	libselinux-devel >= 1.17.13}
+--- 50,59 ----
+  Source11:	start_udev
+  # misc
+  Source20:	%{name}.blacklist
+  URL:		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
+  BuildRequires:	device-mapper-devel
+  %{?with_selinux:BuildRequires:	libselinux-devel >= 1.17.13}
+***************
+*** 116,121 ****
+  Implementacja devfs w przestrzeni użytkownika - statyczna binarka dla
+  initrd.
+  
+  %package libs
+  Summary:	Shared libudev library
+  Summary(pl.UTF-8):	Biblioteka współdzielona libudev
+--- 120,138 ----
+  Implementacja devfs w przestrzeni użytkownika - statyczna binarka dla
+  initrd.
+  
++ %package initramfs
++ Summary:	A userspace implementation of devfs - support scripts for initramfs-tools
++ Summary(pl.UTF-8):	Implementacja devfs w przestrzeni użytkownika - skrypty dla initramfs-tools
++ Group:		Base
++ Requires:	%{name}-core = %{epoch}:%{version}-%{release}
++ Requires:	initramfs-tools
++ 
++ %description initramfs
++ A userspace implementation of devfs - support scripts for initramfs-tools.
++ 
++ %description initramfs -l pl.UTF-8
++ Implementacja devfs w przestrzeni użytkownika - skrypty dla initramfs-tools.
++ 
+  %package libs
+  Summary:	Shared libudev library
+  Summary(pl.UTF-8):	Biblioteka współdzielona libudev
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/udev.spec?r1=1.240.2.4&r2=1.240.2.5&f=u