- fix without selinux

[packages/util-linux.git] / util-linux.spec

diff --git a/util-linux.spec b/util-linux.spec
index 73584b30332691b22141c17b7cca90dc94fbd2ed..28675481a496c43a9616b68854ec1f528f29fd2a 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
 %bcond_with    uClibc  # don't build few utilities
+%bcond_without selinux # build without SELinux support
 #
 # TODO:
 # - move raw to /sbin (potentially can be used before mount partitions)??
@@ -17,7 +18,7 @@ Summary(tr):  Temel sistem ara
 Summary(uk):   îÁÂ¦Ò ÂÁÚÏ×ÉÈ ÓÉÓÔÅÍÎÉÈ ÕÔÉÌ¦Ô ÄÌÑ Linux
 Name:          util-linux
 Version:       2.12r
-Release:       4
+Release:       6
 License:       distributable
 Group:         Applications/System
 # devel versions at ftp://ftp.kernel.org/pub/linux/utils/util-linux/testing
@@ -63,15 +64,14 @@ Patch26:    %{name}-2.12q-update-mtab-when-moving.patch
 Patch27:       %{name}-2.12q-use-update_mtab-for-fake.patch
 Patch28:       %{name}-2.12q-more-fake-checks-v2.patch
 Patch29:       %{name}-2.12q-update_mtab-fixes.patch
+Patch30:       %{name}-as_needed-fix.patch
 BuildRequires: cryptsetup-devel
 BuildRequires: gettext-devel
-BuildRequires: grep
-BuildRequires: libselinux-devel
+%{?with_selinux:BuildRequires: libselinux-devel}
 %{!?with_uClibc:BuildRequires: ncurses-devel >= 5.0}
 %{!?with_uClibc:BuildRequires: pam-devel >= 0.79.0}
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: texinfo
-BuildRequires: textutils
 %{!?with_uClibc:BuildRequires: zlib-devel}
 %{!?with_uClibc:Requires:      pam >= 0.79.0}
 Provides:      fdisk
@@ -140,6 +140,7 @@ Summary:    Support for blockdev
 Summary(pl):   Obs³uga blockdev
 Group:         Applications/System
 Requires(post,preun):  /sbin/chkconfig
+Requires:      coreutils
 Requires:      rc-scripts
 #Requires:     uname(release) >= 2.6
 
@@ -402,6 +403,7 @@ Obs
 %patch27 -p1
 %patch28 -p0
 %patch29 -p1
+%patch30 -p1
 
 %build
 CC="%{__cc}"
@@ -418,6 +420,7 @@ export CC CFLAGS LDFLAGS
        MOREHELPDIR=%{_datadir}/misc \
        %{!?with_uClibc:ADD_RAW="yes"} \
        %{?with_uClibc:HAVE_RAW_H="no" HAVE_PAM="no"} \
+       %{!?with_selinux:HAVE_SELINUX="no"}
 
 %ifarch ppc
 %{__cc} %{rpmcflags} %{rpmldflags} clock-ppc.c -o clock-ppc
@@ -440,6 +443,7 @@ install -d $RPM_BUILD_ROOT{/bin,/sbin,/etc/{pam.d,logrotate,rc.d/init.d,sysconfi
        GETOPTDIR=$RPM_BUILD_ROOT%{_examplesdir}/getopt \
        USRGAMESDIR=$RPM_BUILD_ROOT%{_bindir} \
        USE_TTY_GROUP=no \
+       %{!?with_selinux:HAVE_SELINUX="no"} \
        %{!?with_uClibc:ADD_RAW="yes"} \
        %{?with_uClibc:HAVE_RAW_H="no" HAVE_PAM="no"}
 
@@ -1043,7 +1047,7 @@ fi
 %lang(ja) %{_mandir}/ja/man8/tunelp.8*
 %lang(pl) %{_mandir}/pl/man8/tunelp.8*
 
-%if %{without uClibc}
+%if !%{with uClibc}
 %files -n login
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/login
@@ -1069,7 +1073,7 @@ fi
 %lang(es) %{_mandir}/es/man8/agetty.8*
 %lang(ja) %{_mandir}/ja/man8/agetty.8*
 
-%if %{without uClibc}
+%if !%{with uClibc}
 %files -n rawdevices
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/raw