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] switch to generate the man pages during the normal build, not during the...
[elogind.git]
/
udev.spec
diff --git
a/udev.spec
b/udev.spec
index a0cd75a608600a727e55c836e3e0250ebe9408f6..1df59ecdb879155fda8c40e3d70f3ca5f3f79db9 100644
(file)
--- a/
udev.spec
+++ b/
udev.spec
@@
-11,22
+11,22
@@
# 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 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.
# 0 - debugging disabled
# 1 - debugging enabled
%define debug 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 build the DBUS "extra package or not
+# 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 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
# if we want to build the scsi_id "extra" package or not
# 0 - do not build the package
# 1 - build it
@@
-34,7
+34,7
@@
Summary: A userspace implementation of devfs
Name: udev
Summary: A userspace implementation of devfs
Name: udev
-Version: 02
2
_bk
+Version: 02
3
_bk
Release: 1
License: GPL
Group: Utilities/System
Release: 1
License: GPL
Group: Utilities/System
@@
-62,11
+62,6
@@
make CC="gcc $RPM_OPT_FLAGS" \
%else
USE_LOG=false \
%endif
%else
USE_LOG=false \
%endif
-%if %{selinux}
- USE_SELINUX=true \
-%else
- USE_SELINUX=false \
-%endif
%if %{debug}
DEBUG=true \
%else
%if %{debug}
DEBUG=true \
%else
@@
-79,15
+74,13
@@
make CC="gcc $RPM_OPT_FLAGS" \
%if %{dbus}
extras/dbus \
%endif
%if %{dbus}
extras/dbus \
%endif
+%if %{selinux}
+ extras/selinux \
+%endif
"
%install
make DESTDIR=$RPM_BUILD_ROOT install \
"
%install
make DESTDIR=$RPM_BUILD_ROOT install \
-%if %{selinux}
- USE_SELINUX=true \
-%else
- USE_SELINUX=false \
-%endif
EXTRAS=" \
%if %{scsi_id}
extras/scsi_id \
EXTRAS=" \
%if %{scsi_id}
extras/scsi_id \
@@
-95,6
+88,9
@@
make DESTDIR=$RPM_BUILD_ROOT install \
%if %{dbus}
extras/dbus \
%endif
%if %{dbus}
extras/dbus \
%endif
+%if %{selinux}
+ extras/selinux \
+%endif
"
%post
"
%post
@@
-117,7
+113,7
@@
rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) /usr/bin/udevinfo
%attr(755,root,root) /sbin/udevsend
%attr(755,root,root) /sbin/udevd
%attr(755,root,root) /usr/bin/udevinfo
%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/
@@
-140,7
+136,7
@@
rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Mar 24 2004 Greg Kroah-Hartman <greg@kroah.com>
%changelog
* Wed Mar 24 2004 Greg Kroah-Hartman <greg@kroah.com>
-- change the way dbus support is built (now an extra)
+- 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