X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.spec;h=1df59ecdb879155fda8c40e3d70f3ca5f3f79db9;hp=0b142f0942a93cba6a0549194a12b7f1bef145ab;hb=6d472fe777b237d5843dda9e685f225e2c7341b4;hpb=1659326d724e5f94d94d43243e087c54f8508e2b diff --git a/udev.spec b/udev.spec index 0b142f094..1df59ecdb 100644 --- a/udev.spec +++ b/udev.spec @@ -11,25 +11,30 @@ # Note, it is not recommend if you use klibc to enable logging. %define log 0 -# if we want to build DBUS support in or not. -# 0 - no DBUS support -# 1 - DBUS support -%define dbus 0 - # if we want to enable debugging support in udev. If it is enabled, lots of # stuff will get sent to the debug syslog. # 0 - debugging disabled # 1 - debugging enabled %define debug 0 -# if we want to use the LSB version of the init script or the Redhat one -# 0 - use Redhat version: etc/init.d/udev -# 1 - use LSB version: etc/init.d/udev.init.LSB -%define lsb 0 +# if we want to build the DBUS "extra" package or not +# 0 - no DBUS support +# 1 - DBUS support +%define dbus 0 + +# if we want to build the SELinux "extra" package or not +# 0 - no SELinux support +# 1 - SELinux support +%define selinux 0 + +# if we want to build the scsi_id "extra" package or not +# 0 - do not build the package +# 1 - build it +%define scsi_id 1 Summary: A userspace implementation of devfs Name: udev -Version: 016_bk +Version: 023_bk Release: 1 License: GPL Group: Utilities/System @@ -57,29 +62,37 @@ make CC="gcc $RPM_OPT_FLAGS" \ %else USE_LOG=false \ %endif -%if %{dbus} - USE_DBUS=true \ -%else - USE_DBUS=false \ -%endif %if %{debug} DEBUG=true \ %else DEBUG=false \ %endif - -# now build udevd on it's own, as it can't handle being built with klibc -make CC="gcc $RPM_OPT_FLAGS" udevd - + EXTRAS=" \ +%if %{scsi_id} + extras/scsi_id \ +%endif +%if %{dbus} + extras/dbus \ +%endif +%if %{selinux} + extras/selinux \ +%endif +" %install make DESTDIR=$RPM_BUILD_ROOT install \ + EXTRAS=" \ +%if %{scsi_id} + extras/scsi_id \ +%endif %if %{dbus} - USE_DBUS=true + extras/dbus \ %endif -%if %{lsb} - USE_LSB=true +%if %{selinux} + extras/selinux \ %endif +" + %post /sbin/chkconfig --add udev @@ -93,25 +106,54 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc COPYING README TODO ChangeLog +%doc COPYING README TODO ChangeLog HOWTO* docs/* +%doc etc/udev/udev.rules.{examples,gentoo,redhat} +%doc etc/udev/udev.permissions.{gentoo,redhat} %attr(755,root,root) /sbin/udev -%attr(755,root,root) /sbin/udevinfo +%attr(755,root,root) /usr/bin/udevinfo %attr(755,root,root) /sbin/udevsend %attr(755,root,root) /sbin/udevd -%attr(755,root,root) /udev/ -%attr(755,root,root) /etc/udev/ -%attr(755,root,root) %dir +%attr(755,root,root) /usr/bin/udevtest +%attr(755,root,root) /sbin/udevstart +%attr(755,root,root) %dir /udev/ +%attr(755,root,root) %dir /etc/udev/ %config(noreplace) %attr(0644,root,root) /etc/udev/udev.conf %config(noreplace) %attr(0644,root,root) /etc/udev/udev.rules %config(noreplace) %attr(0644,root,root) /etc/udev/udev.permissions -%if %{dbus} - %config(noreplace) %attr(0644,root,root) /etc/dbus-1/system.d/udev_sysbus_policy.conf -%endif %attr(-,root,root) /etc/hotplug.d/default/udev.hotplug %attr(755,root,root) /etc/init.d/udev %attr(0644,root,root) %{_mandir}/man8/udev*.8* +%if %{dbus} + %config(noreplace) %attr(0644,root,root) /etc/dbus-1/system.d/udev_sysbus_policy.conf +%endif + +%if %{scsi_id} + %attr(755,root,root) /sbin/scsi_id + %config(noreplace) %attr(0644,root,root) /etc/scsi_id.config + %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8* +%endif + %changelog +* Wed Mar 24 2004 Greg Kroah-Hartman +- change the way dbus and selinux support is built (now an extra) + +* Tue Mar 2 2004 Greg Kroah-Hartman +- added udevstart to the list of files installed +- udevinfo is now in /usr/bin not /sbin + +* Fri Feb 27 2004 Greg Kroah-Hartman +- added ability to build with SELinux support + +* Thu Feb 19 2004 Greg Kroah-Hartman +- add some more files to the documentation directory +- add ability to build scsi_id and make it the default + +* Mon Feb 16 2004 Greg Kroah-Hartman +- fix up udevd build, as it's no longer needed to be build seperatly +- add udevtest to list of files +- more Red Hat sync ups. + * Thu Feb 12 2004 Greg Kroah-Hartman - add some changes from the latest Fedora udev release.