X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.spec;h=a0cd75a608600a727e55c836e3e0250ebe9408f6;hb=6fb7313bad16334c4b7bc742ee8cc9416ed1d78e;hp=aa595962f7dbcc29690c00039c217e1a87e9aba4;hpb=e68582be4a9522bb936a7c8adcd20991793d7d14;p=elogind.git

diff --git a/udev.spec b/udev.spec
index aa595962f..a0cd75a60 100644
--- a/udev.spec
+++ b/udev.spec
@@ -11,10 +11,10 @@
 # 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 build SELinux support in or not.
+# 0 - no SELinux support
+# 1 - SELinux support
+%define selinux 0
 
 # if we want to enable debugging support in udev.  If it is enabled, lots of 
 # stuff will get sent to the debug syslog.
@@ -22,14 +22,19 @@
 # 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: etc/init.d/udev
-# 1 - use LSB: 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 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: 017_bk
+Version: 022_bk
 Release: 1
 License: GPL
 Group: Utilities/System
@@ -57,30 +62,40 @@ make CC="gcc $RPM_OPT_FLAGS"	\
 %else
 	USE_LOG=false		\
 %endif
-%if %{dbus}
-	USE_DBUS=true		\
+%if %{selinux}
+	USE_SELINUX=true	\
 %else
-	USE_DBUS=false		\
+	USE_SELINUX=false	\
 %endif
 %if %{debug}
 	DEBUG=true		\
 %else
 	DEBUG=false		\
 %endif
-
+	EXTRAS="	\
+%if %{scsi_id}
+	extras/scsi_id	\
+%endif
+%if %{dbus}
+	extras/dbus	\
+%endif
+"
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install \
-%if %{dbus}
-	USE_DBUS=true		\
+%if %{selinux}
+	USE_SELINUX=true	\
 %else
-	USE_DBUS=false		\
+	USE_SELINUX=false	\
 %endif
-%if %{lsb}
-	USE_LSB=true		\
-%else
-	USE_LSB=false		\
+	EXTRAS="	\
+%if %{scsi_id}
+	extras/scsi_id	\
 %endif
+%if %{dbus}
+	extras/dbus	\
+%endif
+"
 
 %post
 /sbin/chkconfig --add udev
@@ -95,25 +110,49 @@ 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) /sbin/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 <greg@kroah.com>
+- change the way dbus support is built (now an extra)
+
+* Tue Mar 2 2004 Greg Kroah-Hartman <greg@kroah.com>
+- added udevstart to the list of files installed
+- udevinfo is now in /usr/bin not /sbin
+
+* Fri Feb 27 2004 Greg Kroah-Hartman <greg@kroah.com>
+- added ability to build with SELinux support
+
+* Thu Feb 19 2004 Greg Kroah-Hartman <greg@kroah.com>
+- 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 <greg@kroah.com>
 - fix up udevd build, as it's no longer needed to be build seperatly
 - add udevtest to list of files