- rebuild with readline 7.0

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

diff --git a/util-linux.spec b/util-linux.spec
index 4e240cf9a4f5da04c6a54d8b7936075b334b4ec8..429a07ab8cbec570db4bbef050aa7b986fe054db 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -10,7 +10,7 @@
 # Conditional build:
 %bcond_with    uClibc          # link initrd version with static glibc instead of uClibc
 %bcond_without dietlibc        # link initrd version with dietlibc instead of uClibc
-%bcond_without selinux         # SELinux support
+%bcond_without selinux         # SELinux support
 %bcond_without su              # su/runuser programs
 %if "%{pld_release}" == "ac"
 %bcond_with    initrd          # don't build initrd version
@@ -36,18 +36,17 @@ Summary(ru.UTF-8):  Набор базовых системных утилит д
 Summary(tr.UTF-8):     Temel sistem araçları
 Summary(uk.UTF-8):     Набір базових системних утиліт для Linux
 Name:          util-linux
-Version:       2.26
+Version:       2.28
 Release:       2
 License:       GPL v2+
 Group:         Applications/System
-Source0:       https://www.kernel.org/pub/linux/utils/util-linux/v2.26/%{name}-%{version}.tar.xz
-# Source0-md5: 912c550a4e5c47c0ce9abd0733fa9a64
+Source0:       https://www.kernel.org/pub/linux/utils/util-linux/v2.28/%{name}-%{version}.tar.xz
+# Source0-md5: e534e6ccc49107e5d31c329af798ef7d
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:       login.pamd
 Source3:       %{name}-blockdev.init
 Source4:       %{name}-blockdev.sysconfig
-Source5:       blockdev.upstart
 Source6:       su.pamd
 Source7:       su-l.pamd
 Source8:       runuser.pamd
@@ -56,13 +55,12 @@ Source10:   nologin.c
 Source11:      nologin.8
 Source12:      blockdev.service
 Source13:      blockdev.sh
-
-Patch3:                %{name}-fdformat-ide.patch
-Patch4:                %{name}-fhs.patch
-Patch7:                %{name}-login-lastlog.patch
-Patch8:                %{name}-procpartitions.patch
-Patch9:                su-paths.patch
-Patch10:       %{name}-diet.patch
+Patch0:                %{name}-fdformat-ide.patch
+Patch1:                %{name}-fhs.patch
+Patch2:                %{name}-login-lastlog.patch
+Patch3:                %{name}-procpartitions.patch
+Patch4:                su-paths.patch
+Patch5:                %{name}-diet.patch
 URL:           https://github.com/karelzak/util-linux
 BuildRequires: audit-libs-devel >= 1.0.6
 BuildRequires: autoconf >= 2.60
@@ -80,6 +78,7 @@ BuildRequires:        ncurses-devel >= 5.0
 BuildRequires: pam-devel >= %{pam_ver}
 BuildRequires: pkgconfig
 BuildRequires: python3-devel
+BuildRequires: readline-devel
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.671
 BuildRequires: sed >= 4.0
@@ -292,7 +291,6 @@ Group:              Applications/System
 Requires:      libmount = %{version}-%{release}
 Requires:      libsmartcols = %{version}-%{release}
 Conflicts:     SysVinit < 2.86-26
-Conflicts:     upstart-SysVinit < 2.86-28
 # C: nfs-utils-common is opposite to http://cvs.pld-linux.org/packages/nfs-utils/nfs-utils.spec?r1=1.165&r2=1.166
 Conflicts:     nfs-utils-common < 1.1.3-3
 
@@ -731,13 +729,12 @@ Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 
 %prep
 %setup -q -a1
-
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%{?with_initrd:%patch10 -p1}
+%{?with_initrd:%patch5 -p1}
 
 cp -p %{SOURCE10} nologin.c
 
@@ -843,7 +840,8 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
        --with-audit \
        --with-bashcompletiondir=/usr/share/bash-completion/completions \
        --with-selinux%{!?with_selinux:=no} \
-       --with-smack
+       --with-smack \
+       --with-readline
 
 %{__make}
 
@@ -851,7 +849,7 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,init,security} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \
        $RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}} \
        $RPM_BUILD_ROOT{/lib/systemd/pld-helpers.d,%{systemdunitdir}}
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
@@ -868,7 +866,6 @@ cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
-cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/blockdev.conf
 cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/blockdev.service
 cp -p %{SOURCE13} $RPM_BUILD_ROOT/lib/systemd/pld-helpers.d/blockdev.sh
 %if %{with su}
@@ -1038,10 +1035,10 @@ fi
 %attr(755,root,root) %{_bindir}/s390*
 %{_mandir}/man8/s390*
 %endif
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
 %attr(755,root,root) %{_bindir}/i386
 %{_mandir}/man8/i386*
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 %attr(755,root,root) %{_bindir}/x86_64
 %{_mandir}/man8/x86_64*
 %endif
@@ -1108,8 +1105,10 @@ fi
 %attr(755,root,root) %{_bindir}/logger
 %attr(755,root,root) %{_bindir}/look
 %attr(755,root,root) %{_bindir}/lscpu
+%attr(755,root,root) %{_bindir}/lsipc
 %attr(755,root,root) %{_bindir}/lslocks
 %attr(755,root,root) %{_bindir}/lslogins
+%attr(755,root,root) %{_bindir}/lsns
 %attr(755,root,root) %{_bindir}/mesg
 %attr(755,root,root) %{_bindir}/mcookie
 %attr(755,root,root) %{_bindir}/namei
@@ -1166,6 +1165,7 @@ fi
 %{_mandir}/man1/logger.1*
 %{_mandir}/man1/look.1*
 %{_mandir}/man1/lscpu.1*
+%{_mandir}/man1/lsipc.1*
 %{_mandir}/man1/lslogins.1*
 %{_mandir}/man1/mcookie.1*
 %{_mandir}/man1/mesg.1*
@@ -1194,6 +1194,7 @@ fi
 %{_mandir}/man8/delpart.8*
 %{_mandir}/man8/partx.8*
 %{_mandir}/man8/lsblk.8*
+%{_mandir}/man8/lsns.8*
 %{_mandir}/man8/chcpu.8*
 %{_mandir}/man8/ctrlaltdel.8*
 %{_mandir}/man8/fdformat.8*
@@ -1456,7 +1457,6 @@ fi
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/blockdev
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/blockdev
-%config(noreplace) %verify(not md5 mtime size) /etc/init/blockdev.conf
 %attr(755,root,root) /sbin/blockdev
 %{_mandir}/man8/blockdev.8*
 %lang(ja) %{_mandir}/ja/man8/blockdev.8*