Compare commits
18 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
c87ed81c2c | ||
|
09904cbd56 | ||
|
5fa93ec5e0 | ||
|
3bf1f5a44f | ||
|
4ffd39d553 | ||
|
a228e53a4b | ||
|
a04c11370c | ||
|
d65ce0b32c | ||
|
260ccc24c5 | ||
|
c96992b25e | ||
|
dd1f0e5a82 | ||
|
f64c455630 | ||
|
1f18765a68 | ||
|
6c5649c0b6 | ||
|
6578411a87 | ||
|
3b965f951d | ||
|
c409cb5073 | ||
|
f3b1a65177 |
6
.gitignore
vendored
6
.gitignore
vendored
@ -84,3 +84,9 @@
|
||||
/util-linux-2.37.tar.xz
|
||||
/util-linux-2.37.2.tar.xz
|
||||
/util-linux-2.38-rc1.tar.xz
|
||||
/util-linux-2.38-rc3.tar.xz
|
||||
/util-linux-2.38.tar.xz
|
||||
/util-linux-2.38.1.tar.xz
|
||||
/util-linux-2.39-rc1.tar.xz
|
||||
/util-linux-2.39-rc2.tar.xz
|
||||
/util-linux-2.39-rc3.tar.xz
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (util-linux-2.38-rc1.tar.xz) = bffcf794c633c927dd61a9813fc43cbbf996a08c788a63c754d745c9eadbe23abc161db25d4126e63422b694d73480f88e0d960b065d529190192f3b98690868
|
||||
SHA512 (util-linux-2.39-rc3.tar.xz) = 8a93d32a5ceb38d50a4b2c8bfa48bcab7ec9b758c89b5a1a4f7fd74558dce37385bd7ea203345148d4389de4ea60ec42058f9d7889a8075d3e616773d085427e
|
||||
|
137
util-linux.spec
137
util-linux.spec
@ -1,19 +1,19 @@
|
||||
### Header
|
||||
Summary: Collection of basic system utilities
|
||||
Name: util-linux
|
||||
Version: 2.38
|
||||
Release: 0.3%{?dist}
|
||||
Version: 2.39
|
||||
Release: 0.5%{?dist}
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
URL: https://en.wikipedia.org/wiki/Util-linux
|
||||
|
||||
### Macros
|
||||
%define upstream_version %{version}-rc1
|
||||
%define upstream_major %(eval echo %{version} | %{__sed} -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/')
|
||||
%global upstream_version %{version}-rc3
|
||||
%global upstream_major %(eval echo %{version} | sed -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/')
|
||||
|
||||
%define compldir %{_datadir}/bash-completion/completions/
|
||||
%global compldir %{_datadir}/bash-completion/completions/
|
||||
|
||||
%define pypkg python3
|
||||
%define pyver 3
|
||||
%global pypkg python3
|
||||
%global pyver 3
|
||||
|
||||
### Dependencies
|
||||
BuildRequires: make
|
||||
@ -26,26 +26,22 @@ BuildRequires: pam-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: popt-devel
|
||||
BuildRequires: libutempter-devel
|
||||
Buildrequires: systemd-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: systemd
|
||||
Buildrequires: libuser-devel
|
||||
BuildRequires: libuser-devel
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: %{pypkg}-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
BuildRequires: bison
|
||||
BuildRequires: rubygem-asciidoctor
|
||||
%ifarch ppc64le
|
||||
BuildRequires: librtas-devel
|
||||
%endif
|
||||
|
||||
# enable if make changes to build-system
|
||||
#BuildRequires: autoconf
|
||||
#BuildRequires: automake
|
||||
#BuildRequires: libtool
|
||||
#BuildRequires: bison
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
BuildRequires: bison
|
||||
|
||||
### Sources
|
||||
Source0: https://www.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/util-linux-%{upstream_version}.tar.xz
|
||||
@ -101,12 +97,12 @@ Patch1: login-default-motd-file.patch
|
||||
%description
|
||||
The util-linux package contains a large variety of low-level system
|
||||
utilities that are necessary for a Linux system to function. Among
|
||||
others, Util-linux contains the fdisk configuration tool and the login
|
||||
others, util-linux contains the fdisk configuration tool and the login
|
||||
program.
|
||||
|
||||
|
||||
%package -n util-linux-core
|
||||
Summary: The most essential utilities from the util-linux suite.
|
||||
Summary: The most essential utilities from the util-linux suite
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
Provides: /bin/dmesg
|
||||
Provides: /bin/kill
|
||||
@ -132,7 +128,7 @@ minimal installations.
|
||||
|
||||
|
||||
%package -n libfdisk
|
||||
Summary: Partitioning library for fdisk-like programs.
|
||||
Summary: Partitioning library for fdisk-like programs
|
||||
License: LGPLv2+
|
||||
|
||||
%description -n libfdisk
|
||||
@ -140,7 +136,7 @@ This is library for fdisk-like programs, part of util-linux.
|
||||
|
||||
|
||||
%package -n libfdisk-devel
|
||||
Summary: Partitioning library for fdisk-like programs.
|
||||
Summary: Partitioning library for fdisk-like programs
|
||||
License: LGPLv2+
|
||||
Requires: libfdisk%{?_isa} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
@ -151,7 +147,7 @@ part of util-linux.
|
||||
|
||||
|
||||
%package -n libsmartcols
|
||||
Summary: Formatting library for ls-like programs.
|
||||
Summary: Formatting library for ls-like programs
|
||||
License: LGPLv2+
|
||||
|
||||
%description -n libsmartcols
|
||||
@ -159,7 +155,7 @@ This is library for ls-like terminal programs, part of util-linux.
|
||||
|
||||
|
||||
%package -n libsmartcols-devel
|
||||
Summary: Formatting library for ls-like programs.
|
||||
Summary: Formatting library for ls-like programs
|
||||
License: LGPLv2+
|
||||
Requires: libsmartcols%{?_isa} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
@ -196,7 +192,6 @@ Summary: Block device ID library
|
||||
License: LGPLv2+
|
||||
Requires: libuuid%{?_isa} = %{version}-%{release}
|
||||
Conflicts: filesystem < 3
|
||||
Requires(post): coreutils
|
||||
|
||||
%description -n libblkid
|
||||
This is block device identification library, part of util-linux.
|
||||
@ -278,12 +273,12 @@ mountinfo, etc) and mount filesystems.
|
||||
|
||||
|
||||
%package -n util-linux-user
|
||||
Summary: libuser based util-linux utilities
|
||||
Summary: util-linux utilities based on libuser
|
||||
Requires: util-linux = %{version}-%{release}
|
||||
License: GPLv2
|
||||
|
||||
%description -n util-linux-user
|
||||
chfn and chsh utilities with dependence on libuser
|
||||
chfn and chsh utilities with dependence on libuser.
|
||||
|
||||
|
||||
%prep
|
||||
@ -292,8 +287,8 @@ chfn and chsh utilities with dependence on libuser
|
||||
%build
|
||||
unset LINGUAS || :
|
||||
|
||||
# unfortunately, we did changes to build-system
|
||||
./autogen.sh
|
||||
# enable only when make a change to the build-system
|
||||
#./autogen.sh
|
||||
|
||||
|
||||
export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
|
||||
@ -340,13 +335,13 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,6,8,5}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{pam.d,security/console.apps}
|
||||
mkdir -p ${RPM_BUILD_ROOT}/usr/lib/tmpfiles.d
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir}/tmpfiles.d
|
||||
|
||||
# install util-linux
|
||||
%make_install
|
||||
|
||||
# And a dirs uuidd needs that the makefiles don't create
|
||||
install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}/usr/lib/tmpfiles.d/uuidd.conf
|
||||
install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/uuidd.conf
|
||||
install -d ${RPM_BUILD_ROOT}/run/uuidd
|
||||
install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
|
||||
|
||||
@ -434,22 +429,6 @@ find $RPM_BUILD_ROOT%{_mandir}/man8 -regextype posix-egrep \
|
||||
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
|
||||
|
||||
|
||||
%post -n util-linux-core
|
||||
if [ ! -L /etc/mtab ]; then
|
||||
ln -sf ../proc/self/mounts /etc/mtab || :
|
||||
fi
|
||||
|
||||
%post -n libblkid
|
||||
### Move blkid cache to /run
|
||||
[ -d /run/blkid ] || mkdir -p /run/blkid
|
||||
for I in /etc/blkid.tab /etc/blkid.tab.old \
|
||||
/etc/blkid/blkid.tab /etc/blkid/blkid.tab.old; do
|
||||
|
||||
if [ -f "$I" ]; then
|
||||
mv "$I" /run/blkid/ || :
|
||||
fi
|
||||
done
|
||||
|
||||
%pre -n uuidd
|
||||
getent group uuidd >/dev/null || groupadd -r uuidd
|
||||
getent passwd uuidd >/dev/null || \
|
||||
@ -511,6 +490,7 @@ fi
|
||||
%{_bindir}/eject
|
||||
%{_bindir}/fallocate
|
||||
%{_bindir}/fincore
|
||||
%{_bindir}/fadvise
|
||||
%{_bindir}/getopt
|
||||
%{_bindir}/hexdump
|
||||
%{_bindir}/irqtop
|
||||
@ -530,6 +510,7 @@ fi
|
||||
%{_bindir}/mcookie
|
||||
%{_bindir}/mesg
|
||||
%{_bindir}/namei
|
||||
%{_bindir}/pipesz
|
||||
%{_bindir}/prlimit
|
||||
%{_bindir}/rename
|
||||
%{_bindir}/rev
|
||||
@ -544,6 +525,7 @@ fi
|
||||
%{_bindir}/utmpdump
|
||||
%{_bindir}/uuidgen
|
||||
%{_bindir}/uuidparse
|
||||
%{_bindir}/waitpid
|
||||
%{_bindir}/wall
|
||||
%{_bindir}/wdctl
|
||||
%{_bindir}/whereis
|
||||
@ -554,6 +536,7 @@ fi
|
||||
%{_mandir}/man1/colrm.1*
|
||||
%{_mandir}/man1/column.1*
|
||||
%{_mandir}/man1/eject.1*
|
||||
%{_mandir}/man1/fadvise.1.*
|
||||
%{_mandir}/man1/fallocate.1*
|
||||
%{_mandir}/man1/fincore.1*
|
||||
%{_mandir}/man1/getopt.1*
|
||||
@ -572,6 +555,7 @@ fi
|
||||
%{_mandir}/man1/mcookie.1*
|
||||
%{_mandir}/man1/mesg.1*
|
||||
%{_mandir}/man1/namei.1*
|
||||
%{_mandir}/man1/pipesz.1.*
|
||||
%{_mandir}/man1/prlimit.1*
|
||||
%{_mandir}/man1/rename.1*
|
||||
%{_mandir}/man1/rev.1*
|
||||
@ -587,6 +571,7 @@ fi
|
||||
%{_mandir}/man1/utmpdump.1.gz
|
||||
%{_mandir}/man1/uuidgen.1*
|
||||
%{_mandir}/man1/uuidparse.1*
|
||||
%{_mandir}/man1/waitpid.1.*
|
||||
%{_mandir}/man1/wall.1*
|
||||
%{_mandir}/man1/whereis.1*
|
||||
%{_mandir}/man1/write.1*
|
||||
@ -594,6 +579,7 @@ fi
|
||||
%{_mandir}/man5/terminal-colors.d.5*
|
||||
%{_mandir}/man8/addpart.8*
|
||||
%{_mandir}/man8/blkdiscard.8*
|
||||
%{_mandir}/man8/blkpr.8.*
|
||||
%{_mandir}/man8/blkzone.8*
|
||||
%{_mandir}/man8/chcpu.8*
|
||||
%{_mandir}/man8/chmem.8*
|
||||
@ -627,6 +613,7 @@ fi
|
||||
%{_mandir}/man8/zramctl.8*
|
||||
%{_sbindir}/addpart
|
||||
%{_sbindir}/blkdiscard
|
||||
%{_sbindir}/blkpr
|
||||
%{_sbindir}/blkzone
|
||||
%{_sbindir}/chcpu
|
||||
%{_sbindir}/ctrlaltdel
|
||||
@ -696,6 +683,7 @@ fi
|
||||
%{compldir}/mkfs.cramfs
|
||||
%{compldir}/mkfs.minix
|
||||
%{compldir}/namei
|
||||
%{compldir}/pipesz
|
||||
%{compldir}/pivot_root
|
||||
%{compldir}/prlimit
|
||||
%{compldir}/readprofile
|
||||
@ -752,7 +740,6 @@ fi
|
||||
|
||||
|
||||
%files -n util-linux-core
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
|
||||
%attr(4755,root,root) %{_bindir}/mount
|
||||
%attr(4755,root,root) %{_bindir}/umount
|
||||
%{_bindir}/chrt
|
||||
@ -838,6 +825,7 @@ fi
|
||||
%{_sbindir}/swapoff
|
||||
%{_sbindir}/swapon
|
||||
%{_sbindir}/switch_root
|
||||
/etc/mtab
|
||||
|
||||
|
||||
%files -n util-linux-user
|
||||
@ -859,7 +847,7 @@ fi
|
||||
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
|
||||
%dir %attr(2775, uuidd, uuidd) /run/uuidd
|
||||
%{compldir}/uuidd
|
||||
/usr/lib/tmpfiles.d/uuidd.conf
|
||||
%{_tmpfilesdir}/uuidd.conf
|
||||
|
||||
|
||||
%files -n libfdisk
|
||||
@ -930,6 +918,59 @@ fi
|
||||
%{_libdir}/python*/site-packages/libmount/
|
||||
|
||||
%changelog
|
||||
* Wed Apr 19 2023 Karel Zak <kzak@redhat.com> - 2.39-0.5
|
||||
- upgrade to v2.39-rc3 (fixes XFS and rw/ro issues)
|
||||
|
||||
* Wed Apr 5 2023 Karel Zak <kzak@redhat.com> - 2.39-0.4
|
||||
- fix #2180593 (superblock reconfiguration libmount issue)
|
||||
|
||||
* Tue Apr 4 2023 Karel Zak <kzak@redhat.com> - 2.39-0.3
|
||||
- fix spec file
|
||||
|
||||
* Tue Apr 4 2023 Karel Zak <kzak@redhat.com> - 2.39-0.2
|
||||
- upgrade to v2.39-rc2
|
||||
|
||||
* Mon Mar 20 2023 Karel Zak <kzak@redhat.com> - 2.39-0.1
|
||||
- upgrade to v2.39-rc1
|
||||
https://kernel.org/pub/linux/utils/util-linux/v2.39/v2.39-ReleaseNotes
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.38.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Dec 17 2022 Florian Weimer <fweimer@redhat.com> - 2.38.1-3
|
||||
- Backport upstream patch to fix C99 issue in kill
|
||||
|
||||
* Mon Aug 22 2022 Karel Zak <kzak@redhat.com> - 2.38.1-2
|
||||
- improve tmpfiles.d use in spec file
|
||||
|
||||
* Thu Aug 4 2022 Karel Zak <kzak@redhat.com> - 2.38.1-1
|
||||
- upgrade to v2.38.1
|
||||
https://kernel.org/pub/linux/utils/util-linux/v2.38/v2.38.1-ReleaseNotes
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.38-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.38-4
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Wed Apr 13 2022 Karel Zak <kzak@redhat.com> - 2.38-3
|
||||
- fix spec file changelog order
|
||||
|
||||
* Wed Mar 30 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.38-2
|
||||
- simplify creation of /etc/mtab symlink
|
||||
|
||||
* Wed Mar 30 2022 Karel Zak <kzak@redhat.com> - 2.38-1
|
||||
- upgrade to v2.38
|
||||
- don't (re)generate build-system
|
||||
- modernize spec file style (thanks to Zbigniew)
|
||||
|
||||
* Thu Mar 17 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.38-0.5
|
||||
- Drop very old upgrade scriptlet for libblkid
|
||||
|
||||
* Wed Mar 16 2022 Karel Zak <kzak@redhat.com> - 2.38-0.4
|
||||
- upgrade to v2.38-rc3
|
||||
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.38/v2.38-ReleaseNotes
|
||||
|
||||
* Wed Feb 2 2022 Karel Zak <kzak@redhat.com> - 2.38-0.3
|
||||
- add /usr/lib/tmpfiles.d/uuidd.conf (based on #2047952)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user