|
@@ -2,26 +2,28 @@
|
|
Summary: A collection of basic system utilities
|
|
Summary: A collection of basic system utilities
|
|
Summary(ja): 基本システムユーティリティー集
|
|
Summary(ja): 基本システムユーティリティー集
|
|
Name: util-linux
|
|
Name: util-linux
|
|
-Version: 2.22.2
|
|
|
|
-Release: 5%{?_dist_release}
|
|
|
|
|
|
+Version: 2.30.1
|
|
|
|
+Release: 1%{?_dist_release}
|
|
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
|
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
|
Group: System Environment/Base
|
|
Group: System Environment/Base
|
|
URL: http://en.wikipedia.org/wiki/Util-linux
|
|
URL: http://en.wikipedia.org/wiki/Util-linux
|
|
|
|
|
|
-%define _localstatedir /var/run
|
|
|
|
-
|
|
|
|
### Features
|
|
### Features
|
|
%define with_selinux 0
|
|
%define with_selinux 0
|
|
%define with_audit 1
|
|
%define with_audit 1
|
|
%define mtab_symlink 1
|
|
%define mtab_symlink 1
|
|
|
|
|
|
### Macros
|
|
### Macros
|
|
|
|
+%bcond_with bashcomp
|
|
%define floppyver 0.18
|
|
%define floppyver 0.18
|
|
%define no_hwclock_archs s390 s390x
|
|
%define no_hwclock_archs s390 s390x
|
|
%define no_cfsfdisk_archs sparc sparcv9 sparc64
|
|
%define no_cfsfdisk_archs sparc sparcv9 sparc64
|
|
-%define cytune_archs %{ix86} alpha armv4l
|
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
|
|
|
|
|
+%define _unpackaged_files_terminate_build 1
|
|
|
|
+%define _localstatedir /var/run
|
|
|
|
+%define compldir %{_datadir}/bash-completion/completions/
|
|
|
|
+
|
|
### Paths
|
|
### Paths
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
@@ -33,6 +35,7 @@ BuildRequires: gettext
|
|
%if %{with_selinux}
|
|
%if %{with_selinux}
|
|
BuildRequires: libselinux-devel
|
|
BuildRequires: libselinux-devel
|
|
%endif
|
|
%endif
|
|
|
|
+BuildRequires: bison
|
|
BuildRequires: ncurses-devel
|
|
BuildRequires: ncurses-devel
|
|
BuildRequires: pam-devel
|
|
BuildRequires: pam-devel
|
|
BuildRequires: texinfo
|
|
BuildRequires: texinfo
|
|
@@ -40,27 +43,28 @@ BuildRequires: zlib-devel
|
|
BuildRequires: popt-devel
|
|
BuildRequires: popt-devel
|
|
BuildRequires: libutempter-devel
|
|
BuildRequires: libutempter-devel
|
|
BuildRequires: eudev-libudev-devel
|
|
BuildRequires: eudev-libudev-devel
|
|
|
|
+BuildRequires: libcap-ng-devel
|
|
|
|
+BuildRequires: libuser-devel
|
|
|
|
|
|
# su/runuser patches need this
|
|
# su/runuser patches need this
|
|
BuildRequires: automake, autoconf, libtool
|
|
BuildRequires: automake, autoconf, libtool
|
|
|
|
|
|
### Sources
|
|
### Sources
|
|
Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.22/%{name}-%{version}.tar.xz
|
|
Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.22/%{name}-%{version}.tar.xz
|
|
-Source1: util-linux-ng-login.pamd
|
|
|
|
-Source5: util-linux-ng-login-noselinux.pamd
|
|
|
|
-Source2: util-linux-ng-remote.pamd
|
|
|
|
-Source6: util-linux-ng-remote-noselinux.pamd
|
|
|
|
-Source3: util-linux-ng-chsh-chfn.pamd
|
|
|
|
-Source4: util-linux-ng-60-raw.rules
|
|
|
|
-Source8: nologin.c
|
|
|
|
-Source9: nologin.8
|
|
|
|
-Source10: uuidd.init
|
|
|
|
-Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
|
|
|
|
|
|
+Source1: util-linux-login.pamd
|
|
|
|
+Source2: util-linux-remote.pamd
|
|
|
|
+Source3: util-linux-chsh-chfn.pamd
|
|
|
|
+Source4: util-linux-60-raw.rules
|
|
Source12: util-linux-su.pamd
|
|
Source12: util-linux-su.pamd
|
|
Source13: util-linux-su-l.pamd
|
|
Source13: util-linux-su-l.pamd
|
|
Source14: util-linux-runuser.pamd
|
|
Source14: util-linux-runuser.pamd
|
|
Source15: util-linux-runuser-l.pamd
|
|
Source15: util-linux-runuser-l.pamd
|
|
|
|
|
|
|
|
+Source5: util-linux-ng-login-noselinux.pamd
|
|
|
|
+Source6: util-linux-ng-remote-noselinux.pamd
|
|
|
|
+Source10: uuidd.init
|
|
|
|
+#Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
|
|
|
|
+
|
|
|
|
|
|
### Obsoletes & Conflicts & Provides
|
|
### Obsoletes & Conflicts & Provides
|
|
%ifarch alpha
|
|
%ifarch alpha
|
|
@@ -74,13 +78,14 @@ Conflicts: coreutils < 8.20
|
|
Obsoletes: eject <= 2.1.5
|
|
Obsoletes: eject <= 2.1.5
|
|
Provides: eject = 2.1.6
|
|
Provides: eject = 2.1.6
|
|
|
|
|
|
-# sulogin, utmpdump merged into util-linux v2.22
|
|
|
|
-Conflicts: SysVinit-tools < 2.88dsf-3
|
|
|
|
|
|
+# last, lastb, mesg and wall in util-linux is enabled.
|
|
|
|
+Conflicts: SysVinit-tools < 2.88dsf-4
|
|
|
|
|
|
Conflicts: kernel < 2.2.12-7
|
|
Conflicts: kernel < 2.2.12-7
|
|
# old versions of e2fsprogs contain fsck, uuidgen
|
|
# old versions of e2fsprogs contain fsck, uuidgen
|
|
Conflicts: e2fsprogs < 1.41.8-5
|
|
Conflicts: e2fsprogs < 1.41.8-5
|
|
|
|
|
|
|
|
+
|
|
# old versions of util-linux have been splited to more sub-packages
|
|
# old versions of util-linux have been splited to more sub-packages
|
|
Obsoletes: mount < 2.11, losetup < 2.11
|
|
Obsoletes: mount < 2.11, losetup < 2.11
|
|
Provides: mount = %{version}-%{release}, losetup = %{version}-%{release}
|
|
Provides: mount = %{version}-%{release}, losetup = %{version}-%{release}
|
|
@@ -127,44 +132,15 @@ Distribution: Vine Linux
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
Packager: daisuke
|
|
Packager: daisuke
|
|
|
|
|
|
-### Floppy patches (Fedora/RHEL specific)
|
|
|
|
-###
|
|
|
|
-# add a missing header
|
|
|
|
-Patch0: util-linux-2.19-floppy-locale.patch
|
|
|
|
-# add note about ATAPI IDE floppy to fdformat.8
|
|
|
|
-Patch1: util-linux-2.20-fdformat-man-ide.patch
|
|
|
|
-# 169628 - /usr/bin/floppy doesn't work with /dev/fd0
|
|
|
|
-Patch2: util-linux-2.19-floppy-generic.patch
|
|
|
|
-
|
|
|
|
### Ready for upstream?
|
|
### Ready for upstream?
|
|
###
|
|
###
|
|
# 151635 - makeing /var/log/lastlog
|
|
# 151635 - makeing /var/log/lastlog
|
|
-Patch7: util-linux-ng-2.21-login-lastlog.patch
|
|
|
|
-# 231192 - ipcs is not printing correct values on pLinux
|
|
|
|
-Patch8: util-linux-2.21-ipcs-32bit.patch
|
|
|
|
|
|
+Patch7: 2.28-login-lastlog-create.patch
|
|
|
|
|
|
### Upstream patches from proposed stable/v2.22.x branch
|
|
### Upstream patches from proposed stable/v2.22.x branch
|
|
### (remove after update to the final 2.22.3)
|
|
### (remove after update to the final 2.22.3)
|
|
###
|
|
###
|
|
|
|
|
|
-### Upstream patches from master branch (will be v2.23) for su(1) and new
|
|
|
|
-### runuser(1) implementation. This is required for the recent coreutils where
|
|
|
|
-### is no more su(1).
|
|
|
|
-###
|
|
|
|
-Patch200: 0200-su-add-group-and-supp-group-options.patch
|
|
|
|
-Patch201: 0201-su-move-generic-su-code-to-su-common.c.patch
|
|
|
|
-Patch202: 0202-runuser-new-command-derived-from-su-1.patch
|
|
|
|
-Patch203: 0203-su-more-robust-getpwuid-for-GNU-Hurt-coreutils-71b7d.patch
|
|
|
|
-Patch204: 0204-su-verify-writing-to-streams-was-successful.patch
|
|
|
|
-Patch205: 0205-su-move-long-options-to-main.patch
|
|
|
|
-Patch206: 0206-su-add-segmentation-fault-reporting-of-the-child-pro.patch
|
|
|
|
-Patch207: 0207-su-fixed-a-typo-in-pam-error-message.patch
|
|
|
|
-Patch208: 0208-runuser-add-u-to-not-execute-shell.patch
|
|
|
|
-Patch209: 0209-build-sys-move-runuser-to-sbin-dir.patch
|
|
|
|
-Patch210: 0210-su-fix-COMMAND-not-specified-error.patch
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
%description
|
|
%description
|
|
The util-linux-ng package contains a large variety of low-level system
|
|
The util-linux-ng package contains a large variety of low-level system
|
|
utilities that are necessary for a Linux system to function. Among
|
|
utilities that are necessary for a Linux system to function. Among
|
|
@@ -176,6 +152,59 @@ Util-linux パッケージは Linux システムが機能するために必要
|
|
低レベルのシステムユーティリティを含んでいます。fdisk 設定ツールやログ
|
|
低レベルのシステムユーティリティを含んでいます。fdisk 設定ツールやログ
|
|
インプログラムも含んでいます。
|
|
インプログラムも含んでいます。
|
|
|
|
|
|
|
|
+%if %{with bashcomp}
|
|
|
|
+%package -n bash-completion-util-linux
|
|
|
|
+Summary: bash-completions for util-linux
|
|
|
|
+Summary(ja): util-linux用のbash補完拡張
|
|
|
|
+Group: System Environment/Base
|
|
|
|
+License: GPLv2 and GPLv2+
|
|
|
|
+Requires: bash-completion
|
|
|
|
+
|
|
|
|
+%description -n bash-completion-util-linux
|
|
|
|
+ This package contains bash-completions to use util-linux.
|
|
|
|
+%endif
|
|
|
|
+
|
|
|
|
+%package -n libfdisk
|
|
|
|
+Summary: Partitioning library for fdisk-like programs.
|
|
|
|
+Group: Development/Libraries
|
|
|
|
+License: LGPLv2+
|
|
|
|
+
|
|
|
|
+%description -n libfdisk
|
|
|
|
+This is library for fdisk-like programs, part of util-linux.
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+%package -n libfdisk-devel
|
|
|
|
+Summary: Partitioning library for fdisk-like programs.
|
|
|
|
+Group: Development/Libraries
|
|
|
|
+License: LGPLv2+
|
|
|
|
+Requires: libfdisk = %{version}-%{release}
|
|
|
|
+Requires: pkgconfig
|
|
|
|
+
|
|
|
|
+%description -n libfdisk-devel
|
|
|
|
+This is development library and headers for fdisk-like programs,
|
|
|
|
+part of util-linux.
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+%package -n libsmartcols
|
|
|
|
+Summary: Formatting library for ls-like programs.
|
|
|
|
+Group: Development/Libraries
|
|
|
|
+License: LGPLv2+
|
|
|
|
+
|
|
|
|
+%description -n libsmartcols
|
|
|
|
+This is library for ls-like terminal programs, part of util-linux.
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+%package -n libsmartcols-devel
|
|
|
|
+Summary: Formatting library for ls-like programs.
|
|
|
|
+Group: Development/Libraries
|
|
|
|
+License: LGPLv2+
|
|
|
|
+Requires: libsmartcols = %{version}-%{release}
|
|
|
|
+Requires: pkgconfig
|
|
|
|
+
|
|
|
|
+%description -n libsmartcols-devel
|
|
|
|
+This is development library and headers for ls-like terminal programs,
|
|
|
|
+part of util-linux.
|
|
|
|
+
|
|
|
|
|
|
%package -n libmount
|
|
%package -n libmount
|
|
Summary: Device mounting library
|
|
Summary: Device mounting library
|
|
@@ -373,26 +402,9 @@ across a network.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
%prep
|
|
-%setup -q -a 11
|
|
|
|
-cp %{SOURCE8} %{SOURCE9} .
|
|
|
|
|
|
+%setup -q
|
|
|
|
|
|
-%patch0 -p1
|
|
|
|
-%patch1 -p1
|
|
|
|
-%patch2 -p1
|
|
|
|
%patch7 -p1
|
|
%patch7 -p1
|
|
-%patch8 -p1
|
|
|
|
-
|
|
|
|
-%patch200 -p1
|
|
|
|
-%patch201 -p1
|
|
|
|
-%patch202 -p1
|
|
|
|
-%patch203 -p1
|
|
|
|
-%patch204 -p1
|
|
|
|
-%patch205 -p1
|
|
|
|
-%patch206 -p1
|
|
|
|
-%patch207 -p1
|
|
|
|
-%patch208 -p1
|
|
|
|
-%patch209 -p1
|
|
|
|
-%patch210 -p1
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
unset LINGUAS || :
|
|
unset LINGUAS || :
|
|
@@ -406,7 +418,9 @@ export SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
|
|
--bindir=/bin \
|
|
--bindir=/bin \
|
|
--sbindir=/sbin \
|
|
--sbindir=/sbin \
|
|
--libdir=/%{_lib} \
|
|
--libdir=/%{_lib} \
|
|
- --disable-wall \
|
|
|
|
|
|
+ --disable-silent-rules \
|
|
|
|
+ --disable-bfs \
|
|
|
|
+ --disable-pg \
|
|
--enable-partx \
|
|
--enable-partx \
|
|
--enable-login-utils \
|
|
--enable-login-utils \
|
|
--enable-kill \
|
|
--enable-kill \
|
|
@@ -414,6 +428,7 @@ export SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
|
|
--enable-ddate \
|
|
--enable-ddate \
|
|
--enable-chfn-chsh \
|
|
--enable-chfn-chsh \
|
|
--enable-raw \
|
|
--enable-raw \
|
|
|
|
+ --enable-libmount-force-mountinfo \
|
|
--with-udev \
|
|
--with-udev \
|
|
%if %{with_selinux}
|
|
%if %{with_selinux}
|
|
--with-selinux \
|
|
--with-selinux \
|
|
@@ -432,18 +447,9 @@ export SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
|
|
--with-utempter \
|
|
--with-utempter \
|
|
--disable-makeinstall-chown
|
|
--disable-makeinstall-chown
|
|
|
|
|
|
-# build util-linux-ng
|
|
|
|
|
|
+# build util-linux
|
|
make %{?_smp_mflags}
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
-# build floppy stuff
|
|
|
|
-pushd floppy-%{floppyver}
|
|
|
|
-%configure --disable-gtk2
|
|
|
|
-make %{?_smp_mflags}
|
|
|
|
-popd
|
|
|
|
-
|
|
|
|
-# build nologin
|
|
|
|
-gcc $CFLAGS -o nologin nologin.c
|
|
|
|
-
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
rm -rf ${RPM_BUILD_ROOT}
|
|
rm -rf ${RPM_BUILD_ROOT}
|
|
@@ -460,16 +466,6 @@ chmod 0644 ${RPM_BUILD_ROOT}/var/log/lastlog
|
|
# install util-linux
|
|
# install util-linux
|
|
make install DESTDIR=${RPM_BUILD_ROOT}
|
|
make install DESTDIR=${RPM_BUILD_ROOT}
|
|
|
|
|
|
-# inslall floppy stuff
|
|
|
|
-pushd floppy-%{floppyver}
|
|
|
|
-make install DESTDIR=${RPM_BUILD_ROOT}
|
|
|
|
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/floppygtk
|
|
|
|
-popd
|
|
|
|
-
|
|
|
|
-# install nologin
|
|
|
|
-install -m 755 nologin ${RPM_BUILD_ROOT}/sbin
|
|
|
|
-install -m 644 nologin.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
|
|
|
|
-
|
|
|
|
echo '.so man8/raw.8' > $RPM_BUILD_ROOT%{_mandir}/man8/rawdevices.8
|
|
echo '.so man8/raw.8' > $RPM_BUILD_ROOT%{_mandir}/man8/rawdevices.8
|
|
{
|
|
{
|
|
# see RH bugzilla #216664
|
|
# see RH bugzilla #216664
|
|
@@ -488,6 +484,9 @@ install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
|
|
# libtool junk
|
|
# libtool junk
|
|
rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.la
|
|
rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.la
|
|
|
|
|
|
|
|
+# static libs
|
|
|
|
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.a
|
|
|
|
+
|
|
# PAM settings
|
|
# PAM settings
|
|
{
|
|
{
|
|
pushd ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
|
|
pushd ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
|
|
@@ -512,9 +511,6 @@ ln -sf hwclock ${RPM_BUILD_ROOT}/sbin/clock
|
|
|
|
|
|
|
|
|
|
# Final cleanup
|
|
# Final cleanup
|
|
-%ifnarch %cytune_archs
|
|
|
|
-rm -f $RPM_BUILD_ROOT%{_bindir}/cytune $RPM_BUILD_ROOT%{_mandir}/man8/cytune.8*
|
|
|
|
-%endif
|
|
|
|
%ifarch %no_hwclock_archs
|
|
%ifarch %no_hwclock_archs
|
|
rm -f $RPM_BUILD_ROOT/sbin/{hwclock,clock} $RPM_BUILD_ROOT%{_mandir}/man8/hwclock.8* $RPM_BUILD_ROOT/usr/sbin/{hwclock,clock}
|
|
rm -f $RPM_BUILD_ROOT/sbin/{hwclock,clock} $RPM_BUILD_ROOT%{_mandir}/man8/hwclock.8* $RPM_BUILD_ROOT/usr/sbin/{hwclock,clock}
|
|
%endif
|
|
%endif
|
|
@@ -537,17 +533,13 @@ for I in man1/chkdupexe.1 man1/line.1 man1/pg.1 man1/newgrp.1 \
|
|
done
|
|
done
|
|
|
|
|
|
# deprecated docs
|
|
# deprecated docs
|
|
-for I in text-utils/README.pg misc-utils/README.reset floppy-%{floppyver}/README.html; do
|
|
|
|
|
|
+for I in text-utils/README.pg misc-utils/README.reset; do
|
|
rm -rf $I
|
|
rm -rf $I
|
|
done
|
|
done
|
|
|
|
|
|
-# rename docs
|
|
|
|
-mv floppy-%{floppyver}/README floppy-%{floppyver}/README.floppy
|
|
|
|
-
|
|
|
|
# we install getopt/getopt-*.{bash,tcsh} as doc files
|
|
# we install getopt/getopt-*.{bash,tcsh} as doc files
|
|
chmod 644 misc-utils/getopt-*.{bash,tcsh}
|
|
chmod 644 misc-utils/getopt-*.{bash,tcsh}
|
|
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/getopt/*
|
|
|
|
-rmdir ${RPM_BUILD_ROOT}%{_datadir}/getopt
|
|
|
|
|
|
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/util-linux/getopt
|
|
|
|
|
|
ln -sf ../../bin/kill $RPM_BUILD_ROOT%{_bindir}/kill
|
|
ln -sf ../../bin/kill $RPM_BUILD_ROOT%{_bindir}/kill
|
|
|
|
|
|
@@ -589,14 +581,22 @@ mv %{name}.lang %{name}.files
|
|
|
|
|
|
# create list of setarch(8) symlinks
|
|
# create list of setarch(8) symlinks
|
|
find $RPM_BUILD_ROOT%{_bindir}/ -regextype posix-egrep -type l \
|
|
find $RPM_BUILD_ROOT%{_bindir}/ -regextype posix-egrep -type l \
|
|
- -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64)$" \
|
|
|
|
|
|
+ -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|uname26)$" \
|
|
-printf "%{_bindir}/%f\n" >> %{name}.files
|
|
-printf "%{_bindir}/%f\n" >> %{name}.files
|
|
|
|
|
|
find $RPM_BUILD_ROOT%{_mandir}/man8 -regextype posix-egrep \
|
|
find $RPM_BUILD_ROOT%{_mandir}/man8 -regextype posix-egrep \
|
|
- -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64)\.8.*" \
|
|
|
|
|
|
+ -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|uname26)\.8.*" \
|
|
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
|
|
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
|
|
|
|
|
|
|
|
|
|
|
|
+# drop python files
|
|
|
|
+rm -rf %{buildroot}%{python_sitelib}/libmount
|
|
|
|
+rm -rf %{buildroot}%{python_sitearch}/libmount
|
|
|
|
+
|
|
|
|
+%if !%{with bashcomp}
|
|
|
|
+rm -rf %{buildroot}%{compldir}
|
|
|
|
+%endif
|
|
|
|
+
|
|
%clean
|
|
%clean
|
|
[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
|
|
[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
@@ -680,8 +680,10 @@ fi
|
|
|
|
|
|
%files -f %{name}.files
|
|
%files -f %{name}.files
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%doc */README.* NEWS AUTHORS README*
|
|
|
|
-%doc Documentation/deprecated.txt Documentation/licenses/*
|
|
|
|
|
|
+%doc README NEWS AUTHORS
|
|
|
|
+%doc Documentation/deprecated.txt
|
|
|
|
+%{!?_licensedir:%global license %%doc}
|
|
|
|
+%license Documentation/licenses/*
|
|
%doc misc-utils/getopt-*.{bash,tcsh}
|
|
%doc misc-utils/getopt-*.{bash,tcsh}
|
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/pam.d/chfn
|
|
%config(noreplace) %{_sysconfdir}/pam.d/chfn
|
|
@@ -717,7 +719,9 @@ fi
|
|
|
|
|
|
/sbin/addpart
|
|
/sbin/addpart
|
|
/sbin/agetty
|
|
/sbin/agetty
|
|
|
|
+/sbin/blkdiscard
|
|
/sbin/blkid
|
|
/sbin/blkid
|
|
|
|
+/sbin/blkzone
|
|
/sbin/blockdev
|
|
/sbin/blockdev
|
|
/sbin/chcpu
|
|
/sbin/chcpu
|
|
/sbin/ctrlaltdel
|
|
/sbin/ctrlaltdel
|
|
@@ -742,16 +746,19 @@ fi
|
|
/sbin/swapon
|
|
/sbin/swapon
|
|
/sbin/switch_root
|
|
/sbin/switch_root
|
|
/sbin/wipefs
|
|
/sbin/wipefs
|
|
|
|
+/sbin/zramctl
|
|
|
|
|
|
%{_bindir}/cal
|
|
%{_bindir}/cal
|
|
%{_bindir}/chrt
|
|
%{_bindir}/chrt
|
|
|
|
+%{_bindir}/chmem
|
|
%{_bindir}/col
|
|
%{_bindir}/col
|
|
%{_bindir}/colcrt
|
|
%{_bindir}/colcrt
|
|
%{_bindir}/colrm
|
|
%{_bindir}/colrm
|
|
%{_bindir}/column
|
|
%{_bindir}/column
|
|
-%{_bindir}/ddate
|
|
|
|
|
|
+#%{_bindir}/ddate
|
|
%{_bindir}/eject
|
|
%{_bindir}/eject
|
|
%{_bindir}/fallocate
|
|
%{_bindir}/fallocate
|
|
|
|
+%{_bindir}/fincore
|
|
%{_bindir}/flock
|
|
%{_bindir}/flock
|
|
%{_bindir}/getopt
|
|
%{_bindir}/getopt
|
|
%{_bindir}/hexdump
|
|
%{_bindir}/hexdump
|
|
@@ -761,12 +768,20 @@ fi
|
|
%{_bindir}/ipcs
|
|
%{_bindir}/ipcs
|
|
%{_bindir}/isosize
|
|
%{_bindir}/isosize
|
|
%{_bindir}/kill
|
|
%{_bindir}/kill
|
|
|
|
+%{_bindir}/last
|
|
|
|
+%{_bindir}/lastb
|
|
%{_bindir}/logger
|
|
%{_bindir}/logger
|
|
%{_bindir}/look
|
|
%{_bindir}/look
|
|
%{_bindir}/lscpu
|
|
%{_bindir}/lscpu
|
|
|
|
+%{_bindir}/lsipc
|
|
%{_bindir}/lslocks
|
|
%{_bindir}/lslocks
|
|
|
|
+%{_bindir}/lslogins
|
|
|
|
+%{_bindir}/lsmem
|
|
|
|
+%{_bindir}/lsns
|
|
|
|
+%{_bindir}/mesg
|
|
%{_bindir}/mcookie
|
|
%{_bindir}/mcookie
|
|
%{_bindir}/namei
|
|
%{_bindir}/namei
|
|
|
|
+%{_bindir}/nsenter
|
|
%{_bindir}/prlimit
|
|
%{_bindir}/prlimit
|
|
%{_bindir}/rename
|
|
%{_bindir}/rename
|
|
%{_bindir}/renice
|
|
%{_bindir}/renice
|
|
@@ -774,14 +789,16 @@ fi
|
|
%{_bindir}/script
|
|
%{_bindir}/script
|
|
%{_bindir}/scriptreplay
|
|
%{_bindir}/scriptreplay
|
|
%{_bindir}/setarch
|
|
%{_bindir}/setarch
|
|
|
|
+%{_bindir}/setpriv
|
|
%{_bindir}/setsid
|
|
%{_bindir}/setsid
|
|
%{_bindir}/setterm
|
|
%{_bindir}/setterm
|
|
-%{_bindir}/tailf
|
|
|
|
|
|
+#%{_bindir}/tailf
|
|
%{_bindir}/ul
|
|
%{_bindir}/ul
|
|
%{_bindir}/unshare
|
|
%{_bindir}/unshare
|
|
%{_bindir}/utmpdump
|
|
%{_bindir}/utmpdump
|
|
%{_bindir}/uuidgen
|
|
%{_bindir}/uuidgen
|
|
%{_bindir}/whereis
|
|
%{_bindir}/whereis
|
|
|
|
+%attr(-,root,tty) %{_bindir}/wall
|
|
|
|
|
|
%{_sbindir}/ldattach
|
|
%{_sbindir}/ldattach
|
|
%{_sbindir}/readprofile
|
|
%{_sbindir}/readprofile
|
|
@@ -796,9 +813,10 @@ fi
|
|
%{_mandir}/man1/colcrt.1*
|
|
%{_mandir}/man1/colcrt.1*
|
|
%{_mandir}/man1/colrm.1*
|
|
%{_mandir}/man1/colrm.1*
|
|
%{_mandir}/man1/column.1*
|
|
%{_mandir}/man1/column.1*
|
|
-%{_mandir}/man1/ddate.1*
|
|
|
|
|
|
+#%{_mandir}/man1/ddate.1*
|
|
%{_mandir}/man1/dmesg.1*
|
|
%{_mandir}/man1/dmesg.1*
|
|
%{_mandir}/man1/eject.1*
|
|
%{_mandir}/man1/eject.1*
|
|
|
|
+%{_mandir}/man1/fincore.1*
|
|
%{_mandir}/man1/fallocate.1*
|
|
%{_mandir}/man1/fallocate.1*
|
|
%{_mandir}/man1/flock.1*
|
|
%{_mandir}/man1/flock.1*
|
|
%{_mandir}/man1/getopt.1*
|
|
%{_mandir}/man1/getopt.1*
|
|
@@ -808,13 +826,20 @@ fi
|
|
%{_mandir}/man1/ipcrm.1*
|
|
%{_mandir}/man1/ipcrm.1*
|
|
%{_mandir}/man1/ipcs.1*
|
|
%{_mandir}/man1/ipcs.1*
|
|
%{_mandir}/man1/kill.1*
|
|
%{_mandir}/man1/kill.1*
|
|
|
|
+%{_mandir}/man1/last.1*
|
|
|
|
+%{_mandir}/man1/lastb.1*
|
|
%{_mandir}/man1/logger.1*
|
|
%{_mandir}/man1/logger.1*
|
|
%{_mandir}/man1/login.1*
|
|
%{_mandir}/man1/login.1*
|
|
%{_mandir}/man1/look.1*
|
|
%{_mandir}/man1/look.1*
|
|
%{_mandir}/man1/lscpu.1*
|
|
%{_mandir}/man1/lscpu.1*
|
|
|
|
+%{_mandir}/man1/lsipc.1*
|
|
|
|
+%{_mandir}/man1/lslogins.1*
|
|
|
|
+%{_mandir}/man1/lsmem.1*
|
|
|
|
+%{_mandir}/man1/mesg.1*
|
|
%{_mandir}/man1/mcookie.1*
|
|
%{_mandir}/man1/mcookie.1*
|
|
%{_mandir}/man1/more.1*
|
|
%{_mandir}/man1/more.1*
|
|
%{_mandir}/man1/namei.1*
|
|
%{_mandir}/man1/namei.1*
|
|
|
|
+%{_mandir}/man1/nsenter.1*
|
|
%{_mandir}/man1/mountpoint.1*
|
|
%{_mandir}/man1/mountpoint.1*
|
|
%{_mandir}/man1/prlimit.1*
|
|
%{_mandir}/man1/prlimit.1*
|
|
%{_mandir}/man1/rename.1*
|
|
%{_mandir}/man1/rename.1*
|
|
@@ -824,31 +849,38 @@ fi
|
|
%{_mandir}/man1/script.1*
|
|
%{_mandir}/man1/script.1*
|
|
%{_mandir}/man1/scriptreplay.1*
|
|
%{_mandir}/man1/scriptreplay.1*
|
|
%{_mandir}/man1/setsid.1*
|
|
%{_mandir}/man1/setsid.1*
|
|
|
|
+%{_mandir}/man1/setpriv.1*
|
|
%{_mandir}/man1/setterm.1*
|
|
%{_mandir}/man1/setterm.1*
|
|
%{_mandir}/man1/su.1*
|
|
%{_mandir}/man1/su.1*
|
|
-%{_mandir}/man1/tailf.1*
|
|
|
|
|
|
+#%{_mandir}/man1/tailf.1*
|
|
%{_mandir}/man1/taskset.1*
|
|
%{_mandir}/man1/taskset.1*
|
|
%{_mandir}/man1/ul.1*
|
|
%{_mandir}/man1/ul.1*
|
|
%{_mandir}/man1/unshare.1*
|
|
%{_mandir}/man1/unshare.1*
|
|
%{_mandir}/man1/utmpdump.1*
|
|
%{_mandir}/man1/utmpdump.1*
|
|
%{_mandir}/man1/uuidgen.1*
|
|
%{_mandir}/man1/uuidgen.1*
|
|
|
|
+%{_mandir}/man1/wall.1*
|
|
%{_mandir}/man1/whereis.1*
|
|
%{_mandir}/man1/whereis.1*
|
|
%{_mandir}/man1/write.1*
|
|
%{_mandir}/man1/write.1*
|
|
-%{_mandir}/ru/man1/ddate.1.gz
|
|
|
|
|
|
+#%{_mandir}/ru/man1/ddate.1.gz
|
|
|
|
|
|
%{_mandir}/man5/fstab.5*
|
|
%{_mandir}/man5/fstab.5*
|
|
|
|
+%{_mandir}/man5/terminal-colors.d.5*
|
|
|
|
|
|
%{_mandir}/man8/addpart.8*
|
|
%{_mandir}/man8/addpart.8*
|
|
%{_mandir}/man8/agetty.8*
|
|
%{_mandir}/man8/agetty.8*
|
|
|
|
+%{_mandir}/man8/blkdiscard.8*
|
|
%{_mandir}/man8/blkid.8*
|
|
%{_mandir}/man8/blkid.8*
|
|
|
|
+%{_mandir}/man8/blkzone.8*
|
|
%{_mandir}/man8/blockdev.8*
|
|
%{_mandir}/man8/blockdev.8*
|
|
%{_mandir}/man8/ctrlaltdel.8*
|
|
%{_mandir}/man8/ctrlaltdel.8*
|
|
%{_mandir}/man8/chcpu.8*
|
|
%{_mandir}/man8/chcpu.8*
|
|
|
|
+%{_mandir}/man8/chmem.8*
|
|
%{_mandir}/man8/delpart.8*
|
|
%{_mandir}/man8/delpart.8*
|
|
%{_mandir}/man8/fdisk.8*
|
|
%{_mandir}/man8/fdisk.8*
|
|
%{_mandir}/man8/findfs.8*
|
|
%{_mandir}/man8/findfs.8*
|
|
%{_mandir}/man8/findmnt.8*
|
|
%{_mandir}/man8/findmnt.8*
|
|
%{_mandir}/man8/fsck.8*
|
|
%{_mandir}/man8/fsck.8*
|
|
|
|
+%{_mandir}/man8/fsck.cramfs.8*
|
|
%{_mandir}/man8/fsfreeze.8*
|
|
%{_mandir}/man8/fsfreeze.8*
|
|
%{_mandir}/man8/fstrim.8*
|
|
%{_mandir}/man8/fstrim.8*
|
|
%{_mandir}/man8/isosize.8*
|
|
%{_mandir}/man8/isosize.8*
|
|
@@ -856,7 +888,9 @@ fi
|
|
%{_mandir}/man8/losetup.8*
|
|
%{_mandir}/man8/losetup.8*
|
|
%{_mandir}/man8/lsblk.8*
|
|
%{_mandir}/man8/lsblk.8*
|
|
%{_mandir}/man8/lslocks.8*
|
|
%{_mandir}/man8/lslocks.8*
|
|
|
|
+%{_mandir}/man8/lsns.8*
|
|
%{_mandir}/man8/mkfs.8*
|
|
%{_mandir}/man8/mkfs.8*
|
|
|
|
+%{_mandir}/man8/mkfs.cramfs.8*
|
|
%{_mandir}/man8/mkswap.8*
|
|
%{_mandir}/man8/mkswap.8*
|
|
%{_mandir}/man8/mount.8*
|
|
%{_mandir}/man8/mount.8*
|
|
%{_mandir}/man8/nologin.8*
|
|
%{_mandir}/man8/nologin.8*
|
|
@@ -876,22 +910,18 @@ fi
|
|
%{_mandir}/man8/wipefs.8*
|
|
%{_mandir}/man8/wipefs.8*
|
|
%{_mandir}/man8/raw.8*
|
|
%{_mandir}/man8/raw.8*
|
|
%{_mandir}/man8/rawdevices.8*
|
|
%{_mandir}/man8/rawdevices.8*
|
|
|
|
+%{_mandir}/man8/zramctl.8*
|
|
|
|
|
|
%ifnarch s390 s390x
|
|
%ifnarch s390 s390x
|
|
/sbin/clock
|
|
/sbin/clock
|
|
/sbin/hwclock
|
|
/sbin/hwclock
|
|
-%{_bindir}/floppy
|
|
|
|
%{_sbindir}/fdformat
|
|
%{_sbindir}/fdformat
|
|
%{_sbindir}/hwclock
|
|
%{_sbindir}/hwclock
|
|
-%{_sbindir}/tunelp
|
|
|
|
%{_mandir}/man8/fdformat.8*
|
|
%{_mandir}/man8/fdformat.8*
|
|
-%{_mandir}/man8/floppy.8*
|
|
|
|
%{_mandir}/man8/hwclock.8*
|
|
%{_mandir}/man8/hwclock.8*
|
|
-%{_mandir}/man8/tunelp.8*
|
|
|
|
%endif
|
|
%endif
|
|
|
|
|
|
%ifnarch sparc sparcv9 sparc64
|
|
%ifnarch sparc sparcv9 sparc64
|
|
-%doc Documentation/sfdisk.txt
|
|
|
|
/sbin/cfdisk
|
|
/sbin/cfdisk
|
|
/sbin/sfdisk
|
|
/sbin/sfdisk
|
|
%{_mandir}/man8/cfdisk.8*
|
|
%{_mandir}/man8/cfdisk.8*
|
|
@@ -902,11 +932,12 @@ fi
|
|
%{_bindir}/sunhostid
|
|
%{_bindir}/sunhostid
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-%ifarch %cytune_archs
|
|
|
|
-%{_bindir}/cytune
|
|
|
|
-%{_mandir}/man8/cytune.8*
|
|
|
|
-%endif
|
|
|
|
|
|
|
|
|
|
+%if %{with bashcomp}
|
|
|
|
+%files -n bash-completion-util-linux
|
|
|
|
+%defattr(-,root,root)
|
|
|
|
+%{compldir}/*
|
|
|
|
+%endif
|
|
|
|
|
|
%files -n uuidd
|
|
%files -n uuidd
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
@@ -917,6 +948,32 @@ fi
|
|
%dir %attr(2775, uuidd, uuidd) /var/run/uuidd
|
|
%dir %attr(2775, uuidd, uuidd) /var/run/uuidd
|
|
|
|
|
|
|
|
|
|
|
|
+%files -n libfdisk
|
|
|
|
+%defattr(-,root,root)
|
|
|
|
+%{!?_licensedir:%global license %%doc}
|
|
|
|
+%license Documentation/licenses/COPYING.LGPLv2.1 libfdisk/COPYING
|
|
|
|
+/%{_lib}/libfdisk.so.*
|
|
|
|
+
|
|
|
|
+%files -n libfdisk-devel
|
|
|
|
+%defattr(-,root,root)
|
|
|
|
+%{_libdir}/libfdisk.so
|
|
|
|
+%{_includedir}/libfdisk
|
|
|
|
+%{_libdir}/pkgconfig/fdisk.pc
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+%files -n libsmartcols
|
|
|
|
+%defattr(-,root,root)
|
|
|
|
+%{!?_licensedir:%global license %%doc}
|
|
|
|
+%license Documentation/licenses/COPYING.LGPLv2.1 libsmartcols/COPYING
|
|
|
|
+/%{_lib}/libsmartcols.so.*
|
|
|
|
+
|
|
|
|
+%files -n libsmartcols-devel
|
|
|
|
+%defattr(-,root,root)
|
|
|
|
+%{_libdir}/libsmartcols.so
|
|
|
|
+%{_includedir}/libsmartcols
|
|
|
|
+%{_libdir}/pkgconfig/smartcols.pc
|
|
|
|
+
|
|
|
|
+
|
|
%files -n libmount
|
|
%files -n libmount
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
%doc libmount/COPYING
|
|
%doc libmount/COPYING
|
|
@@ -925,7 +982,7 @@ fi
|
|
%files -n libmount-devel
|
|
%files -n libmount-devel
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
%doc libmount/COPYING
|
|
%doc libmount/COPYING
|
|
-%{_libdir}/libmount.a
|
|
|
|
|
|
+#%{_libdir}/libmount.a
|
|
%{_libdir}/libmount.so
|
|
%{_libdir}/libmount.so
|
|
%{_includedir}/libmount
|
|
%{_includedir}/libmount
|
|
%{_libdir}/pkgconfig/mount.pc
|
|
%{_libdir}/pkgconfig/mount.pc
|
|
@@ -936,10 +993,9 @@ fi
|
|
%dir /etc/blkid
|
|
%dir /etc/blkid
|
|
/%{_lib}/libblkid.so.*
|
|
/%{_lib}/libblkid.so.*
|
|
|
|
|
|
-
|
|
|
|
%files -n libblkid-devel
|
|
%files -n libblkid-devel
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%{_libdir}/libblkid.a
|
|
|
|
|
|
+#%{_libdir}/libblkid.a
|
|
%{_libdir}/libblkid.so
|
|
%{_libdir}/libblkid.so
|
|
%{_includedir}/blkid
|
|
%{_includedir}/blkid
|
|
%{_mandir}/man3/libblkid.3*
|
|
%{_mandir}/man3/libblkid.3*
|
|
@@ -952,7 +1008,7 @@ fi
|
|
|
|
|
|
%files -n libuuid-devel
|
|
%files -n libuuid-devel
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%{_libdir}/libuuid.a
|
|
|
|
|
|
+#%{_libdir}/libuuid.a
|
|
%{_libdir}/libuuid.so
|
|
%{_libdir}/libuuid.so
|
|
%{_includedir}/uuid
|
|
%{_includedir}/uuid
|
|
%{_mandir}/man3/uuid.3*
|
|
%{_mandir}/man3/uuid.3*
|
|
@@ -977,7 +1033,7 @@ fi
|
|
|
|
|
|
%files -n compat32-libuuid-devel
|
|
%files -n compat32-libuuid-devel
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%{_libdir}/libuuid.a
|
|
|
|
|
|
+#%{_libdir}/libuuid.a
|
|
%{_libdir}/libuuid.so
|
|
%{_libdir}/libuuid.so
|
|
%{_libdir}/pkgconfig/uuid.pc
|
|
%{_libdir}/pkgconfig/uuid.pc
|
|
|
|
|
|
@@ -987,7 +1043,7 @@ fi
|
|
|
|
|
|
%files -n compat32-libblkid-devel
|
|
%files -n compat32-libblkid-devel
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%{_libdir}/libblkid.a
|
|
|
|
|
|
+#%{_libdir}/libblkid.a
|
|
%{_libdir}/libblkid.so
|
|
%{_libdir}/libblkid.so
|
|
%{_libdir}/pkgconfig/blkid.pc
|
|
%{_libdir}/pkgconfig/blkid.pc
|
|
|
|
|
|
@@ -997,12 +1053,17 @@ fi
|
|
|
|
|
|
%files -n compat32-libmount-devel
|
|
%files -n compat32-libmount-devel
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%{_libdir}/libmount.a
|
|
|
|
|
|
+#%{_libdir}/libmount.a
|
|
%{_libdir}/libmount.so
|
|
%{_libdir}/libmount.so
|
|
%{_libdir}/pkgconfig/mount.pc
|
|
%{_libdir}/pkgconfig/mount.pc
|
|
%endif
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Fri Sep 08 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.30.1-1
|
|
|
|
+- updated to 2.30.1.
|
|
|
|
+- updated Patch7.
|
|
|
|
+- dropped Patch0-2,8 and 200-210.
|
|
|
|
+
|
|
* Mon Nov 23 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.22.2-5
|
|
* Mon Nov 23 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.22.2-5
|
|
- set "/var/run" to %%_localstatedir.
|
|
- set "/var/run" to %%_localstatedir.
|
|
|
|
|