.gitattributes

@@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+e2fsprogs.keyring filter=lfs diff=lfs merge=lfs -text

_multibuild

@@ -1,4 +0,0 @@
-<multibuild>
-  <package>fuse2fs</package>
-</multibuild>
-

e2fsprogs.changes

@@ -1,38 +1,14 @@
--------------------------------------------------------------------
-Tue Dec 27 10:34:50 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
-
-- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-
--------------------------------------------------------------------
-Thu Sep 15 10:23:25 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Refresh e2fsprogs.keyring based on currently provided keys.
-
--------------------------------------------------------------------
-Wed Sep 14 14:47:43 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Spec file cleanup:
-  + Drop remainders regarding -mini packages, which was not a thing
-    since Jan 2014.
-  + Split build of fuse2fs out into a sep build (_multibuild
-    enabled).
-
--------------------------------------------------------------------
-Tue Sep 13 13:47:21 UTC 2022 - Christian Goll <cgoll@suse.com>
-
-- enabled fuse2fs build which enable to mount ext2/3/4 via FUSE
-
 -------------------------------------------------------------------
 Tue Apr 19 20:51:15 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
-- avoid empty preuninstall script
+- avoid empty preuninstall script 
 
 -------------------------------------------------------------------
 Fri Jan 28 15:40:35 UTC 2022 - Jan Kara <jack@suse.cz>
 
 - Update to 1.46.5:
   * better handling for resizing to fs sizes which would exceed inode limits
-  * fix crash in e2fsck fastcommit handling
+  * fix crash in e2fsck fastcommit handling 
   * fix possibly lost quota limits when e2fsck corrects quota files
   * fix tune2fs to properly transfer quota limits when convertion quota files
   * add support for handling of version 0 quota files in tune2fs

e2fsprogs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package e2fsprogs
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,52 +16,23 @@
 #
 
 
-%define flavor @BUILD_FLAVOR@%nil
+%define build_mini 0
 
-%if "%{flavor}" == ""
 Name:           e2fsprogs
-Summary:        Utilities for the Second Extended File System
-License:        GPL-2.0-only
 %if 0%{?suse_version} >= 1010
 # Hint for ZYPP
 Supplements:    filesystem(ext2) filesystem(ext3) filesystem(ext4)
 %endif
-%else
-Name:           fuse2fs
-Summary:        FUSE file system client for ext2/ext3/ext4 file systems
-License:        MIT
-BuildRequires:  fuse-devel
-%endif
-Version:        1.46.5
-Release:        0
-Group:          System/Filesystems
-URL:            http://e2fsprogs.sourceforge.net
-Source:         http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.xz
-Source2:        README.SUSE
-Source3:        baselibs.conf
-Source4:        http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.sign
-Source5:        https://thunk.org/tytso/tytso-key.asc#/e2fsprogs.keyring
-#
-# e2fsprogs patches
-#
-# libcom_err patches
-Patch3:         libcom_err-compile_et_permissions.patch
-Patch4:         e2fsprogs-1.42-implicit_fortify_decl.patch
-Patch5:         e2fsprogs-1.42-ext2fsh_implicit.patch
-Patch6:         harden_e2scrub@.service.patch
-Patch7:         harden_e2scrub_all.service.patch
-Patch8:         harden_e2scrub_fail@.service.patch
-Patch9:         harden_e2scrub_reap.service.patch
-BuildRequires:  libblkid-devel
-BuildRequires:  libuuid-devel
-BuildRequires:  pkg-config
-BuildRequires:  xz
-%if "%{flavor}" == ""
 %if 0%{?suse_version} >= 1210
 %bcond_without systemd
 %else
 %bcond_with systemd
 %endif
+BuildRequires:  libblkid-devel
+BuildRequires:  libuuid-devel
+BuildRequires:  pkg-config
+BuildRequires:  xz
+%if ! %{build_mini}
 %if 0%{?suse_version} > 1220
 BuildRequires:  makeinfo
 %endif
@@ -73,16 +44,55 @@ BuildRequires:  makeinfo
 Requires(post): %install_info_prereq
 Requires(preun):%install_info_prereq
 %endif
+%endif
 # bug437293
 %ifarch ppc64
 Obsoletes:      e2fsprogs-64bit
 %endif
+
+%if %{build_mini}
+Conflicts:      e2fsprogs
+Conflicts:      e2fsprogs-devel
+Conflicts:      libcom_err-devel
+Conflicts:      libcom_err2
+Conflicts:      libext2fs-devel
+Conflicts:      libext2fs2
+%else
+Conflicts:      e2fsprogs-mini
+Conflicts:      e2fsprogs-mini-devel
+Conflicts:      libcom_err-mini-devel
+Conflicts:      libcom_err2-mini
+Conflicts:      libext2fs-mini-devel
+Conflicts:      libext2fs2-mini
+%endif
 #
+Version:        1.46.5
+Release:        0
+Summary:        Utilities for the Second Extended File System
+License:        GPL-2.0-only
+Group:          System/Filesystems
+URL:            http://e2fsprogs.sourceforge.net
 # For regenerate_initrd_post macro
 Requires(post): /usr/bin/mkdir /usr/bin/touch
 Requires:       libcom_err2 >= %{version}
 Requires:       libext2fs2 >= %{version}
 Suggests:       e2fsprogs-scrub
+Source:         http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.xz
+Source2:        README.SUSE
+Source3:        baselibs.conf
+Source4:        http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.sign
+Source5:        https://thunk.org/tytso/tytso-key.asc#/%{name}.keyring
+#
+# e2fsprogs patches
+#
+# libcom_err patches
+Patch3:         libcom_err-compile_et_permissions.patch
+Patch4:         e2fsprogs-1.42-implicit_fortify_decl.patch
+Patch5:         e2fsprogs-1.42-ext2fsh_implicit.patch
+Patch6:         harden_e2scrub@.service.patch
+Patch7:         harden_e2scrub_all.service.patch
+Patch8:         harden_e2scrub_fail@.service.patch
+Patch9:         harden_e2scrub_reap.service.patch
 # Do not suppress make commands
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -90,13 +100,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Utilities needed to create and maintain ext2 and ext3 file systems
 under Linux. Included in this package are: chattr, lsattr, mke2fs,
 mklost+found, tune2fs, e2fsck, resize2fs, and badblocks.
-%else
-
-%description
-fuse2fs is a FUSE file system client that supports reading and
-writing from devices or image files containing ext2, ext3, and
-ext4 file systems.
-%endif
 
 %package devel
 Summary:        Dummy development package
@@ -114,7 +117,12 @@ Requires:       libuuid-devel
 %description devel
 Dummy development package for backwards compatibility.
 
+%if %{build_mini}
+%package -n e2fsprogs-scrub-mini
+%else
+
 %package -n e2fsprogs-scrub
+%endif
 Summary:        Ext2fs scrubbing scripts and service files
 License:        GPL-2.0-only
 Group:          System/Filesystems
@@ -131,24 +139,45 @@ Requires:       util-linux
 Scripts and systemd service files for background scrubbing of LVM volumes
 with ext2, ext3, and ext4 filesystems.
 
+%if %{build_mini}
+%package -n libext2fs2-mini
+%else
+
 %package -n libext2fs2
+%endif
 Summary:        Ext2fs library
 License:        LGPL-2.0-only
 Group:          System/Filesystems
 
+%if %{build_mini}
+%description -n libext2fs2-mini
+%else
+
 %description -n libext2fs2
+%endif
 The basic Ext2fs shared library.
 
+%if %{build_mini}
+%package -n libext2fs-mini-devel
+%else
+
 %package -n libext2fs-devel
+%endif
 Summary:        Development files for libext2fs
 License:        LGPL-2.0-only
 Group:          Development/Libraries/C and C++
 Requires:       libcom_err-devel
 Requires:       libext2fs2 = %version
 
+%if %{build_mini}
+%description -n libext2fs-mini-devel
+%else
+
 %description -n libext2fs-devel
+%endif
 Development files for libext2fs.
 
+%if ! %{build_mini}
 %package -n libext2fs-devel-static
 Summary:        Development files for libext2fs
 License:        LGPL-2.0-only
@@ -159,8 +188,14 @@ Provides:       libext2fs-devel:%{_libdir}/libext2fs.a
 
 %description -n libext2fs-devel-static
 Development files for libext2fs. Static libraries.
+%endif
+
+%if %{build_mini}
+%package -n libcom_err2-mini
+%else
 
 %package -n libcom_err2
+%endif
 Summary:        E2fsprogs error reporting library
 # bug437293
 License:        MIT
@@ -173,10 +208,20 @@ Obsoletes:      libcom_err2-64bit
 Provides:       libcom_err = %{version}
 Obsoletes:      libcom_err <= 1.40
 
+%if %{build_mini}
+%description -n libcom_err2-mini
+%else
+
 %description -n libcom_err2
+%endif
 com_err is an error message display library.
 
+%if %{build_mini}
+%package -n libcom_err-mini-devel
+%else
+
 %package -n libcom_err-devel
+%endif
 Summary:        Development files for libcom_err
 # bug437293
 License:        MIT
@@ -188,9 +233,15 @@ Obsoletes:      libcom_err-devel-64bit
 Requires:       glibc-devel
 Requires:       libcom_err2 = %version
 
+%if %{build_mini}
+%description -n libcom_err-mini-devel
+%else
+
 %description -n libcom_err-devel
+%endif
 Development files for the com_err error message display library.
 
+%if ! %{build_mini}
 %package -n libcom_err-devel-static
 Summary:        Development files for libcom_err, static libraries
 License:        MIT
@@ -206,6 +257,7 @@ Obsoletes:      libcom_err-devel-64bit
 
 %description -n libcom_err-devel-static
 Development files for the com_err error message display library. Static libraries.
+%endif
 
 %prep
 %setup -q -n e2fsprogs-%{version}
@@ -231,19 +283,21 @@ cp %{SOURCE2} .
   --without-crond-dir \
   --with-systemd-unit-dir=%{?_unitdir} \
   CFLAGS="$RPM_OPT_FLAGS"
+%if %{build_mini}
+rm -rf doc
+%endif
 make %{?_smp_mflags} V=1
 #Guarantee that tranlations match the source messages
 make -C po update-po
 
 %install
-%if "%{flavor}" == ""
 make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir}
 
 %{find_lang} e2fsprogs
 
 rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
 
-%if 0%{?suse_version} < 1550
+%if !0%{?usrmerged}
 mkdir %{buildroot}/sbin
 ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks
 ln -s %{_sbindir}/debugfs   %{buildroot}/sbin/debugfs
@@ -273,51 +327,92 @@ done
 %endif
 
 %if %{with systemd}
+%if %{build_mini}
+%pre -n e2fsprogs-scrub-mini
+%else
+
 %pre -n e2fsprogs-scrub
+%endif
 %service_add_pre e2scrub@.service e2scrub_all.service e2scrub_all.timer e2scrub_fail@.service e2scrub_reap.service
 %endif
 
 %post
 /sbin/ldconfig
+%if ! %{build_mini}
 %if 0%{?suse_version} <= 1530
 %install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
 %endif
 %{?regenerate_initrd_post}
+%endif
 
 %if %{with systemd}
+%if %{build_mini}
+%post -n e2fsprogs-scrub-mini
+%else
+
 %post -n e2fsprogs-scrub
+%endif
 %service_add_post e2scrub@.service e2scrub_all.service e2scrub_all.timer e2scrub_fail@.service e2scrub_reap.service
 %endif
 
 %if %{with systemd}
+%if %{build_mini}
+%preun -n e2fsprogs-scrub-mini
+%else
 %if 0%{?suse_version} <= 1530
 %preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
 %endif
 
 %preun -n e2fsprogs-scrub
+%endif
 %service_del_preun e2scrub@.service e2scrub_all.service e2scrub_all.timer e2scrub_fail@.service e2scrub_reap.service
 %endif
 
 %postun
 /sbin/ldconfig
+%if ! %{build_mini}
 %{?regenerate_initrd_post}
+%endif
 
 %if %{with systemd}
+%if %{build_mini}
+%postun -n e2fsprogs-scrub-mini
+%else
+
 %postun -n e2fsprogs-scrub
+%endif
 %service_del_postun e2scrub@.service e2scrub_all.service e2scrub_all.timer e2scrub_fail@.service e2scrub_reap.service
 %endif
 
+%if ! %{build_mini}
 %posttrans
 %{?regenerate_initrd_posttrans}
+%endif
 
+%if %{build_mini}
+%post -n libext2fs2-mini -p /sbin/ldconfig
+%else
 %post -n libext2fs2 -p /sbin/ldconfig
+%endif
 
+%if %{build_mini}
+%postun -n libext2fs2-mini -p /sbin/ldconfig
+%else
 %postun -n libext2fs2 -p /sbin/ldconfig
+%endif
 
+%if %{build_mini}
+%post -n libcom_err2-mini -p /sbin/ldconfig
+%else
 %post -n libcom_err2 -p /sbin/ldconfig
+%endif
 
+%if %{build_mini}
+%postun -n libcom_err2-mini -p /sbin/ldconfig
+%else
 %postun -n libcom_err2 -p /sbin/ldconfig
+%endif
 
 %files -f e2fsprogs.lang
 %defattr(-, root, root)
@@ -326,7 +421,7 @@ done
 %license NOTICE
 %endif
 %config /etc/mke2fs.conf
-%if 0%{?suse_version} < 1550
+%if !0%{?usrmerged}
 /sbin/badblocks
 /sbin/debugfs
 /sbin/dumpe2fs
@@ -371,7 +466,9 @@ done
 %{_sbindir}/e2freefrag
 %{_sbindir}/e4defrag
 %{_sbindir}/e4crypt
+%if ! %{build_mini}
 %{_infodir}/libext2fs.info.gz
+%endif
 %{_mandir}/man1/chattr.1.gz
 %{_mandir}/man1/lsattr.1.gz
 %{_mandir}/man5/ext?.5.gz
@@ -383,7 +480,12 @@ done
 %defattr(-,root,root)
 %doc README.SUSE
 
+%if %{build_mini}
+%files -n e2fsprogs-scrub-mini
+%else
+
 %files -n e2fsprogs-scrub
+%endif
 %defattr(-,root,root)
 %config /etc/e2scrub.conf
 %{_sbindir}/e2scrub
@@ -398,16 +500,26 @@ done
 %{_unitdir}/e2scrub_reap.service
 %endif
 
+%if %{build_mini}
+%files -n libext2fs2-mini
+%else
+
 %files -n libext2fs2
+%endif
 %defattr(-, root, root)
-%if 0%{?suse_version} < 1550
+%if !0%{?usrmerged}
 /%{_lib}/libext2fs.so.*
 /%{_lib}/libe2p.so.*
 %endif
 %{_libdir}/libext2fs.so.*
 %{_libdir}/libe2p.so.*
 
+%if %{build_mini}
+%files -n libext2fs-mini-devel
+%else
+
 %files -n libext2fs-devel
+%endif
 %defattr(-, root, root)
 %{_libdir}/libext2fs.so
 %{_libdir}/libe2p.so
@@ -416,16 +528,26 @@ done
 %_libdir/pkgconfig/e2p.pc
 %_libdir/pkgconfig/ext2fs.pc
 
+%if %{build_mini}
+%files -n libcom_err2-mini
+%else
+
 %files -n libcom_err2
+%endif
 %defattr(-, root, root)
-%if 0%{?suse_version} < 1550
+%if !0%{?usrmerged}
 /%{_lib}/libcom_err.so.*
 /%{_lib}/libss.so.*
 %endif
 %{_libdir}/libcom_err.so.*
 %{_libdir}/libss.so.*
 
+%if %{build_mini}
+%files -n libcom_err-mini-devel
+%else
+
 %files -n libcom_err-devel
+%endif
 %defattr(-, root, root)
 %_bindir/compile_et
 %_bindir/mk_cmds
@@ -442,6 +564,7 @@ done
 %{_mandir}/man1/mk_cmds.1.gz
 %{_mandir}/man3/com_err.3.gz
 
+%if ! %{build_mini}
 %files -n libcom_err-devel-static
 %defattr(-, root, root)
 %{_libdir}/libcom_err.a
@@ -451,14 +574,6 @@ done
 %defattr(-, root, root)
 %{_libdir}/libext2fs.a
 %{_libdir}/libe2p.a
-
-%else
-%make_install
-(cd %{buildroot}; find -L -type f | grep -v fuse2fs | xargs rm)
-
-%files
-%_bindir/fuse2fs
-%{_mandir}/man1/fuse2fs.1.gz
 %endif
 
 %changelog