Author: freetz Date: Sun Sep 4 10:47:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 068, massive cleanup, dropped check-cdrom script (make use of included utility), more %%files, rel.1
---- Files affected: SPECS: udev.spec (1.79 -> 1.80) ---- Diffs: ================================================================ Index: SPECS/udev.spec diff -u SPECS/udev.spec:1.79 SPECS/udev.spec:1.80 --- SPECS/udev.spec:1.79 Sun Jul 31 17:30:42 2005 +++ SPECS/udev.spec Sun Sep 4 12:47:27 2005 @@ -10,21 +10,20 @@ Summary: A userspace implementation of devfs Summary(pl): Implementacja devfs w przestrzeni użytkownika Name: udev -Version: 064 -Release: 0.2 +Version: 068 +Release: 1 Epoch: 1 License: GPL Group: Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 -# Source0-md5: 589a5fd80ca2c85874e81cc767e6fdeb +# Source0-md5: fd9db7375dae81e8aa634414b5ede0d6 Source1: %{name}.rules Source3: %{name}.conf Source4: start_udev Source5: devmap_name.tar.gz # Source5-md5: f72f557299436af5d6ad66815b80a641 -Source6: %{name}-check-cdrom.sh -Source7: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/uevent_listen.c -# Source7-md5: 7b2b881a8531fd84da7cae9152dc4e39 +Source6: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/uevent_listen.c +# Source6-md5: 7b2b881a8531fd84da7cae9152dc4e39 BuildRequires: device-mapper-devel BuildRequires: libselinux-devel >= 1.17.13 BuildRequires: sed >= 4.0 @@ -40,7 +39,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin -%define extras extras/scsi_id extras/volume_id extras/usb_id extras/dasd_id extras/ata_id extras/chassis_id extras/floppy extras/run_directory +%define extras extras/ata_id extras/cdrom_id extras/chassis_id extras/dasd_id extras/floppy extras/run_directory extras/scsi_id extras/usb_id extras/volume_id %description A userspace implementation of devfs for 2.5 and higher kernels. @@ -101,14 +100,16 @@ USE_LOG=true \ EXTRAS="%{extras}" -%{__cc} %{rpmcflags} %{SOURCE7} -o uevent_listen +%{__cc} %{rpmcflags} %{SOURCE6} -o uevent_listen %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_prefix}/sbin,/udev} install -d $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,scripts} -install -d $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block,net,snd} + +# use of /etc/dev.d/ is no longer recommended +#install -d $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,net,snd} + install -d $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default %{__make} install \ @@ -123,12 +124,9 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/start_udev -install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/check-cdrom.sh - -#mv $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/net/hotplug.dev $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/ -#ln -s ../../udev/scripts/hotplug.dev $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/net/ +install extras/dvb.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts +install extras/raid-devfs.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts -#ln -s %{_sbindir}/wait_for_sysfs $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/00-wait_for_sysfs.hotplug ln -s %{_sbindir}/udevsend $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug %if %{with initrd} @@ -145,34 +143,32 @@ %files %defattr(644,root,root,755) %doc ChangeLog FAQ HOWTO-udev_for_dev README TODO -%doc docs/{overview,udev_vs_devfs,libsysfs.txt,RFC-dev.d} +%doc docs/{overview,udev_vs_devfs,libsysfs.txt} %attr(755,root,root) %{_sbindir}/* %if %{with initrd} %exclude %{_sbindir}/*initrd* %endif %attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_prefix}/sbin/* + %attr(755,root,root) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug -#%config(missingok) %{_sysconfdir}/dev.d/net/hotplug.dev -%attr(755,root,root) %dir %{_sysconfdir}/dev.d -%attr(755,root,root) %dir %{_sysconfdir}/dev.d/default -%attr(755,root,root) %dir %{_sysconfdir}/dev.d/net -%attr(755,root,root) %dir %{_sysconfdir}/dev.d/snd +# use of /etc/dev.d/ is no longer recommended +#%attr(755,root,root) %dir %{_sysconfdir}/dev.d +#%attr(755,root,root) %dir %{_sysconfdir}/dev.d/default +#%attr(755,root,root) %dir %{_sysconfdir}/dev.d/net +#%attr(755,root,root) %dir %{_sysconfdir}/dev.d/snd %attr(755,root,root) %dir %{_sysconfdir}/udev %attr(755,root,root) %dir %{_sysconfdir}/udev/rules.d %attr(755,root,root) %dir %{_sysconfdir}/udev/scripts -#%attr(755,root,root) %{_sysconfdir}/udev/scripts/hotplug.dev -%attr(755,root,root) %{_sysconfdir}/udev/scripts/check-cdrom.sh - %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/udev.conf -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/rules.d/50-udev.rules - -#%config(missingok) %{_sysconfdir}/hotplug.d/default/00-wait_for_sysfs.hotplug - +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/udev/rules.d/50-udev.rules %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/scsi_id.config +%attr(755,root,root) %{_sysconfdir}/udev/scripts/* + %{_mandir}/man8/* %dev(c,1,3) %attr(666,root,root) /dev/null @@ -191,6 +187,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.80 2005/09/04 10:47:27 freetz +- updated to 068, massive cleanup, dropped check-cdrom script (make use of + included utility), more %%files, rel.1 + Revision 1.79 2005/07/31 15:30:42 jpc - fixed permisions for the hotplug symlink non-op really but lets be future-proof (pointed out by arekm) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/udev.spec?r1=1.79&r2=1.80&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
