diff --git a/e2fsprogs.spec b/e2fsprogs.spec index a525fe766f573623951ed8bcb8546e1f17efab73..b3ece213e5c0233f8203d4a7beb0abcd1e22841b 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 Name: e2fsprogs Version: 1.46.5 Release: %{anolis_release}%{?dist} @@ -20,8 +20,8 @@ BuildRequires: make BuildRequires: gnupg2 xz BuildRequires: autoconf -Requires: e2fsprogs-libs%{?_isa} = %{version}-%{release} -Requires: libcom_err%{?_isa} = %{version}-%{release} +Requires: e2fsprogs-libs = %{version}-%{release} +Requires: libcom_err = %{version}-%{release} Requires: libss = %{version}-%{release} Obsoletes: e4fsprogs < %{version}-%{release} @@ -45,7 +45,7 @@ performance of an ext2, ext3, or ext4 file system. %package libs Summary: Ext2/3/4 file system specific shared libraries License: GPLv2 and LGPLv2 -Requires: libcom_err%{?_isa} = %{version}-%{release} +Requires: libcom_err = %{version}-%{release} %description libs E2fsprogs-libs contains libe2p and libext2fs, the libraries of the @@ -68,8 +68,8 @@ from user space, and perform other useful functions. %package devel Summary: Ext2/3/4 file system specific libraries and headers License: GPLv2 and LGPLv2 -Requires: e2fsprogs-libs%{?_isa} = %{version}-%{release} -Requires: libcom_err-devel%{?_isa} = %{version}-%{release} +Requires: e2fsprogs-libs = %{version}-%{release} +Requires: libcom_err-devel = %{version}-%{release} Requires: gawk Requires: pkgconfig @@ -94,7 +94,7 @@ libcom_err is an attempt to present a common error-handling mechanism. %package -n libcom_err-devel Summary: Common error description library License: MIT -Requires: libcom_err%{?_isa} = %{version}-%{release} +Requires: libcom_err = %{version}-%{release} Requires: pkgconfig %description -n libcom_err-devel @@ -108,7 +108,7 @@ libcom_err is an attempt to present a common error-handling mechanism. %package -n libss Summary: Command line interface parsing library License: MIT -Requires: libcom_err%{?_isa} = %{version}-%{release} +Requires: libcom_err = %{version}-%{release} %description -n libss This is libss, a command line interface parsing library, part of e2fsprogs. @@ -122,7 +122,7 @@ It was originally inspired by the Multics SubSystem library. %package -n libss-devel Summary: Command line interface parsing library License: MIT -Requires: libss%{?_isa} = %{version}-%{release} +Requires: libss = %{version}-%{release} Requires: pkgconfig %description -n libss-devel @@ -139,7 +139,7 @@ Recommends: sendmail Requires: systemd Requires: util-linux Requires: lvm2 -Requires: e2fsprogs%{?_isa} = %{version}-%{release} +Requires: e2fsprogs = %{version}-%{release} %description -n e2scrub This package includes e2scrub script that can check ext[234] file system @@ -179,6 +179,8 @@ chmod +w %{buildroot}%{_libdir}/*.a %find_lang %{name} +%generate_compatibility_deps + %check make PRINT_FAILED=yes fullcheck @@ -217,6 +219,8 @@ make PRINT_FAILED=yes fullcheck %{_sbindir}/e2freefrag %{_sbindir}/e4defrag %{_sbindir}/mklost+found +%{abidir}/debugfs-option.list +%{abidir}/e4crypt-option.list %{_bindir}/chattr %{_bindir}/lsattr @@ -255,12 +259,18 @@ make PRINT_FAILED=yes fullcheck %{_mandir}/man8/resize2fs.8* %{_mandir}/man8/tune2fs.8* +%ifarch x86_64 %exclude %{_libdir}/e2fsprogs/e2scrub_all_cron +%endif + %files libs +%dir %{abidir} %{!?_licensedir:%global license %%doc} %license NOTICE %{_libdir}/libe2p.so.* %{_libdir}/libext2fs.so.* +%{abidir}/libe2p.dump +%{abidir}/libext2fs.dump %files static %{!?_licensedir:%global license %%doc} @@ -281,6 +291,7 @@ make PRINT_FAILED=yes fullcheck %{!?_licensedir:%global license %%doc} %license NOTICE %{_libdir}/libcom_err.so.* +%{abidir}/libcom_err.dump %files -n libcom_err-devel %{_bindir}/compile_et @@ -296,6 +307,7 @@ make PRINT_FAILED=yes fullcheck %{!?_licensedir:%global license %%doc} %license NOTICE %{_libdir}/libss.so.* +%{abidir}/libss.dump %files -n libss-devel %{_bindir}/mk_cmds @@ -320,6 +332,9 @@ make PRINT_FAILED=yes fullcheck %{_udevdir}/96-e2scrub.rules %changelog +* Mon Oct 31 2022 mgb01105731 - 1.46.5-3 +- optimise spec file + * Tue Mar 22 2022 Chunmei Xu - 1.46.5-2 - change to fuse3