# 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
%if "%{pld_release}" == "ac"
%define pam_ver 0.79.0
%else
-%define pam_ver 0.99.7.1
+%define pam_ver 1:1.1.8-5
%endif
Summary: Collection of basic system utilities for Linux
Summary(tr.UTF-8): Temel sistem araçları
Summary(uk.UTF-8): Набір базових системних утиліт для Linux
Name: util-linux
-Version: 2.25.1
+Version: 2.28
Release: 2
-License: GPL
+License: GPL v2+
Group: Applications/System
-Source0: https://www.kernel.org/pub/linux/utils/util-linux/v2.25/%{name}-%{version}.tar.xz
-# Source0-md5: 2ff36a8f8ede70f66c5ad0fb09e40e79
+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
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
BuildRequires: automake >= 1:1.10
-BuildRequires: gettext-devel >= 0.14.1
+BuildRequires: gettext-tools >= 0.14.1
%{?with_fallocate:BuildRequires: glibc-devel >= 6:2.11}
BuildRequires: gtk-doc >= 1.10
BuildRequires: gtk-doc-automake >= 1.10
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
%endif
%endif
Requires: libblkid = %{version}-%{release}
+Requires: libfdisk = %{version}-%{release}
%{?with_selinux:Requires: libselinux >= 2.0}
Requires: libsmartcols = %{version}-%{release}
Requires: pam >= %{pam_ver}
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
(uuidd) gwarantującego unikalność generowania UUID-ów opartych na
czasie nawet przy bardzo dużej częstotliwości na systemach SMP.
+%package -n libfdisk
+Summary: fdisk library
+Summary(pl.UTF-8): Biblioteka fdisk
+License: LGPL v2.1+
+Group: Libraries
+Requires: libblkid = %{version}-%{release}
+Requires: libuuid = %{version}-%{release}
+
+%description -n libfdisk
+fdisk library.
+
+%description -n libfdisk -l pl.UTF-8
+Biblioteka fdisk.
+
+%package -n libfdisk-devel
+Summary: Header files for fdisk library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki fdisk
+License: LGPL v2.1+
+Group: Development/Libraries
+Requires: libblkid-devel = %{version}-%{release}
+Requires: libfdisk = %{version}-%{release}
+Requires: libuuid-devel = %{version}-%{release}
+
+%description -n libfdisk-devel
+Header files for fdisk library.
+
+%description -n libfdisk-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki fdisk.
+
+%package -n libfdisk-static
+Summary: Static version of fdisk library
+Summary(pl.UTF-8): Statyczna wersja biblioteki fdisk
+License: LGPL v2.1+
+Group: Development/Libraries
+Requires: libfdisk-devel = %{version}-%{release}
+
+%description -n libfdisk-static
+Static version of fdisk library.
+
+%description -n libfdisk-static -l pl.UTF-8
+Statyczna wersja biblioteki fdisk.
+
%package -n libmount
Summary: Library to handle mounting-related tasks
Summary(pl.UTF-8): Biblioteka obsługująca zadania związane z montowaniem
-License: LGPL
+License: LGPL v2.1+
Group: Libraries
Requires: libblkid = %{version}-%{release}
%package -n libmount-devel
Summary: Header files for mount library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki mount
-License: LGPL
+License: LGPL v2.1+
Group: Development/Libraries
Requires: libblkid-devel = %{version}-%{release}
Requires: libmount = %{version}-%{release}
%package -n libmount-static
Summary: Static version of mount library
Summary(pl.UTF-8): Statyczna wersja biblioteki mount
-License: LGPL
+License: LGPL v2.1+
Group: Development/Libraries
Requires: libmount-devel = %{version}-%{release}
%package -n python3-libmount
Summary: Python 3.x libmount bindings
Summary(pl.UTF-8): Wiązania Pythona 3.x do biblioteki libmount
+License: LGPL v3+
Group: Libraries/Python
Requires: libmount = %{version}-%{release}
%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
--with-audit \
--with-bashcompletiondir=/usr/share/bash-completion/completions \
--with-selinux%{!?with_selinux:=no} \
- --with-smack
+ --with-smack \
+ --with-readline
%{__make}
%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}}
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}
:> $RPM_BUILD_ROOT/var/lock/wtmpxlock
:> $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab
-for lib in blkid uuid mount smartcols; do
+for lib in blkid fdisk mount smartcols uuid; do
mv $RPM_BUILD_ROOT%{_libdir}/lib${lib}.so.* $RPM_BUILD_ROOT/%{_lib}
ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${lib}.so.*.*.*) \
$RPM_BUILD_ROOT%{_libdir}/lib${lib}.so
# python module
%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/libmount/pylibmount.la
# obsoleted by pkg-config (libuuid.la temporarily kept because of packages built with it)
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{blkid,mount,smartcols}.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{blkid,fdisk,mount,smartcols}.la
ln -s hwclock $RPM_BUILD_ROOT/sbin/clock
echo '.so man8/hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/man8/clock.8
%groupremove uuidd
fi
+%post -n libfdisk -p /sbin/ldconfig
+%postun -n libfdisk -p /sbin/ldconfig
+
%post -n libmount -p /sbin/ldconfig
%postun -n libmount -p /sbin/ldconfig
%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
%attr(755,root,root) /sbin/switch_root
%endif
%attr(755,root,root) /sbin/wipefs
+%attr(755,root,root) /sbin/zramctl
%attr(755,root,root) %{_bindir}/cal
%attr(755,root,root) %{_bindir}/chrt
%attr(755,root,root) %{_bindir}/col
%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
%{_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*
%{_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*
%{_mandir}/man8/uname26.8*
%{_mandir}/man8/wdctl.8*
%{_mandir}/man8/wipefs.8*
+%{_mandir}/man8/zramctl.8*
%lang(de) %{_mandir}/de/man1/kill.1*
%lang(de) %{_mandir}/de/man1/more.1*
%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*
%{systemdunitdir}/uuidd.service
%{systemdunitdir}/uuidd.socket
+%files -n libfdisk
+%defattr(644,root,root,755)
+%doc libfdisk/COPYING
+%attr(755,root,root) /%{_lib}/libfdisk.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libfdisk.so.1
+
+%files -n libfdisk-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libfdisk.so
+%{_includedir}/libfdisk
+%{_pkgconfigdir}/fdisk.pc
+
+%files -n libfdisk-static
+%defattr(644,root,root,755)
+%{_libdir}/libfdisk.a
+
%files -n libmount
%defattr(644,root,root,755)
+%doc libmount/COPYING
%attr(755,root,root) /%{_lib}/libmount.so.*.*
%attr(755,root,root) %ghost /%{_lib}/libmount.so.1