- use %%_kernelsrcdir

- only mount and losetup get @2.[24] suffix (others don't depend)
- fixes in the suffix determination
- release 5
- STB

Changed files:
    util-linux.spec -> 1.128

diff --git a/util-linux.spec b/util-linux.spec
index 99ba59cb15e662a3c4e18f750c8eafc1211f62a9..2c079032d86b0dadb3a9048ce11c7a3d45ca6a43 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -5,9 +5,15 @@
 #
 # TODO:
 # - move raw to /sbin (potentially can be used before mount partitions)??
-%define                _kernel_ver     %(grep UTS_RELEASE /usr/src/linux/include/linux/version.h 2>/dev/null | cut -d'"' -f2)
+%define                _kernel_ver     %(grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2)
 %define                _kernel24       %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
-%define                _kernel_series  %{?_kernel24:2.4}%{!?_kernel24:2.2}
+%if %{_kernel24}
+%define                _kernel_series  2.4
+%else
+%define                _kernel_series  2.2
+%endif
+
+%define                rel     5
 
 Summary:       Collection of basic system utilities for Linux
 Summary(de):   Sammlung von grundlegenden Systemdienstprogrammen für Linux
@@ -16,7 +22,7 @@ Summary(pl):  Zbi
 Summary(tr):   Temel sistem araçlarý
 Name:          util-linux
 Version:       2.11g
-Release:       4@%{_kernel_series}
+Release:       %{rel}
 License:       Distributable
 Group:         Applications/System
 Group(de):     Applikationen/System
@@ -70,7 +76,6 @@ BuildRequires:        ncurses-devel >= 5.0
 BuildRequires: gettext-devel
 BuildRequires: texinfo
 Requires:      pam >= 0.66
-Conflicts:     kernel %{?_kernel24:<} {!?_kernel24:>=} 2.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     util-linux-suids
 
@@ -114,6 +119,12 @@ Summary(tr):       Yerel-
 Group:         Applications/System
 Group(de):     Applikationen/System
 Group(pl):     Aplikacje/System
+Release:       %{rel}@%{_kernel_series}
+%if %{_kernel24}
+Conflicts:     kernel < 2.3.0
+%else
+Conflicts:     kernel >= 2.3.0
+%endif
 
 %description -n losetup
 Linux supports a special block device called the loopback device,
@@ -167,6 +178,12 @@ Summary(tr):       Dosya sistemlerini ba
 Group:         Applications/System
 Group(de):     Applikationen/System
 Group(pl):     Aplikacje/System
+Release:       %{rel}@%{_kernel_series}
+%if %{_kernel24}
+Conflicts:     kernel < 2.3.0
+%else
+Conflicts:     kernel >= 2.3.0
+%endif
 
 %description -n mount
 Mount is used for adding new filesystems, both local and networked, to
@@ -322,7 +339,7 @@ Obs
 %endif
 
 %build
-CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses -I%{_kernelsrcdir}/include"
 %configure2_13
 
 %{__make} OPT="%{rpmcflags}" \