chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] clean up chassis_id coding style.
[elogind.git]
/
udev.spec
diff --git
a/udev.spec
b/udev.spec
index 0778f93dc7fbe6ab895fa1955c222c47915334c9..1df59ecdb879155fda8c40e3d70f3ca5f3f79db9 100644
(file)
--- a/
udev.spec
+++ b/
udev.spec
@@
-11,21
+11,21
@@
# Note, it is not recommend if you use klibc to enable logging.
%define log 0
# 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.
+# 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 build the DBUS "extra" package or not
# 0 - no DBUS support
# 1 - DBUS support
%define dbus 0
# 0 - no DBUS support
# 1 - DBUS support
%define dbus 0
-# if we want to build
SELinux support in or not.
+# if we want to build
the SELinux "extra" package or not
# 0 - no SELinux support
# 1 - SELinux support
# 0 - no SELinux support
# 1 - SELinux support
-%define selinux 1
-
-# 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
+%define selinux 0
# if we want to build the scsi_id "extra" package or not
# 0 - do not build the package
# if we want to build the scsi_id "extra" package or not
# 0 - do not build the package
@@
-34,7
+34,7
@@
Summary: A userspace implementation of devfs
Name: udev
Summary: A userspace implementation of devfs
Name: udev
-Version: 02
0
+Version: 02
3_bk
Release: 1
License: GPL
Group: Utilities/System
Release: 1
License: GPL
Group: Utilities/System
@@
-62,16
+62,6
@@
make CC="gcc $RPM_OPT_FLAGS" \
%else
USE_LOG=false \
%endif
%else
USE_LOG=false \
%endif
-%if %{dbus}
- USE_DBUS=true \
-%else
- USE_DBUS=false \
-%endif
-%if %{selinux}
- USE_SELINUX=true \
-%else
- USE_SELINUX=false \
-%endif
%if %{debug}
DEBUG=true \
%else
%if %{debug}
DEBUG=true \
%else
@@
-81,24
+71,26
@@
make CC="gcc $RPM_OPT_FLAGS" \
%if %{scsi_id}
extras/scsi_id \
%endif
%if %{scsi_id}
extras/scsi_id \
%endif
-"
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install \
%if %{dbus}
%if %{dbus}
- USE_DBUS=true \
-%else
- USE_DBUS=false \
+ extras/dbus \
%endif
%if %{selinux}
%endif
%if %{selinux}
- USE_SELINUX=true \
-%else
- USE_SELINUX=false \
+ extras/selinux \
%endif
%endif
+"
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install \
EXTRAS=" \
%if %{scsi_id}
extras/scsi_id \
%endif
EXTRAS=" \
%if %{scsi_id}
extras/scsi_id \
%endif
+%if %{dbus}
+ extras/dbus \
+%endif
+%if %{selinux}
+ extras/selinux \
+%endif
"
%post
"
%post
@@
-114,12
+106,14
@@
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%files
%defattr(-,root,root)
-%doc COPYING README TODO ChangeLog HOWTO* etc/udev/udev.rules.examples docs/*
+%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/udev
-%attr(755,root,root) /
s
bin/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/udevsend
%attr(755,root,root) /sbin/udevd
-%attr(755,root,root) /
s
bin/udevtest
+%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/
%attr(755,root,root) /sbin/udevstart
%attr(755,root,root) %dir /udev/
%attr(755,root,root) %dir /etc/udev/
@@
-141,8
+135,12
@@
rm -rf $RPM_BUILD_ROOT
%endif
%changelog
%endif
%changelog
+* Wed Mar 24 2004 Greg Kroah-Hartman <greg@kroah.com>
+- change the way dbus and selinux support is built (now an extra)
+
* Tue Mar 2 2004 Greg Kroah-Hartman <greg@kroah.com>
- added udevstart to the list of files installed
* 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
* Fri Feb 27 2004 Greg Kroah-Hartman <greg@kroah.com>
- added ability to build with SELinux support