rebuilt in /usr [release 1.46.2-2mamba;Sat May 01 2021]

e2fsprogs.spec

@@ -1,16 +1,11 @@
 %define with_ext2resize  0
 %define ext2resize_ver   1.1.19
 
-%define _root_sbindir    /sbin
-%define _root_libdir     /%{_lib}
-
 %define libname          libe2fs
-%define groupid          65052
-%define userid           65052
 
 Name:          e2fsprogs
 Version:       1.46.2
-Release:       1mamba
+Release:       2mamba
 Summary:       Utilities for managing the ext2/3/4 filesystem
 Group:         System/Tools
 Vendor:        openmamba
@@ -21,17 +16,18 @@ Source0:       http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-%{version}.t
 Source1:       http://downloads.sourceforge.net/ext2resize/ext2resize-%{ext2resize_ver}.tar.bz2
 Source2:       e2fsck-conf
 License:       GPL
+## AUTOBUILDREQ-BEGIN
+BuildRequires: glibc-devel
+BuildRequires: libblkid-devel
+BuildRequires: libfuse-devel
+BuildRequires: libuuid-devel
+## AUTOBUILDREQ-END
+BuildRequires: gettext-devel
+BuildRequires: texinfo
 Requires(pre): /sbin/ldconfig
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(post):%{__install_info}
-BuildRequires: gettext-devel
-BuildRequires: texinfo
-## AUTOBUILDREQ-BEGIN
-BuildRequires: glibc-devel
-BuildRequires: libblkid-devel
-BuildRequires: libuuid-devel
-## AUTOBUILDREQ-END
 
 %description
 The e2fsprogs package contains a number of utilities for creating, checking, modifying, and correcting any inconsistencies in second (ext2) extended filesystems.
@@ -57,6 +53,8 @@ Requires:      %{libname} = %{?epoch:%epoch:}%{version}-%{release}
 This package contains the libraries and header files needed to develop second extended (ext2) filesystem-specific programs.
 You should install e2fsprogs-devel if you want to develop ext2 filesystem-specific programs.
 
+%debug_package
+
 %prep
 %setup -q -a1
 
@@ -65,7 +63,6 @@ You should install e2fsprogs-devel if you want to develop ext2 filesystem-specif
 sed -i "s|-lblkid|-lblkid -luuid|" configure
 %endif
 %configure \
-   --with-root-prefix="" \
    --enable-elf-shlibs \
    --enable-nls \
    --enable-quota \
@@ -80,9 +77,9 @@ sed -i "s|-lblkid|-lblkid -luuid|" configure
 # CC=%{_target_platform}-gcc BUILD_CC=%{_target_platform}-gcc LD=%{_target_platform}-ld
 
 %if "%{_host}" == "%{_build}"
-%make root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
+%make
 %else
-%make root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir} LDFLAGS="-ldl -lpthread"
+%make LDFLAGS="-ldl -lpthread"
 %endif
 # CC=%{_target_platform}-gcc LD=%{_target_platform}-ld
 
@@ -99,11 +96,7 @@ make -C po update-po
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-export PATH=/sbin:$PATH
+%makeinstall install-libs
-%makeinstall install-libs \
-   root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
-
-ln -s libcom_err.so.2 %{buildroot}/%{_lib}/libcom_err.so
 
 install %{SOURCE2} %{buildroot}%{_sysconfdir}/e2fsck.conf
 
@@ -139,53 +132,19 @@ exit 0
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/e2fsck.conf
+%config(noreplace) %{_sysconfdir}/mke2fs.conf
 %{_sysconfdir}/cron.d/e2scrub_all
 %{_sysconfdir}/e2scrub.conf
-/sbin/badblocks
-#/sbin/blkid
-/sbin/debugfs
-/sbin/dumpe2fs
-/sbin/e2fsck
-/sbin/e2image
-/sbin/e2label
-/sbin/e2mmpstatus
-/sbin/e2scrub
-/sbin/e2scrub_all
-/sbin/e2undo
-#/sbin/findfs
-#/sbin/fsck
-/sbin/fsck.ext2
-/sbin/fsck.ext3
-/sbin/fsck.ext4
-#/sbin/fsck.ext4dev
-/sbin/logsave
-/sbin/mke2fs
-/sbin/mkfs.ext2
-/sbin/mkfs.ext3
-/sbin/mkfs.ext4
-#/sbin/mkfs.ext4dev
-/sbin/resize2fs
-/sbin/tune2fs
 %{_bindir}/chattr
 %{_bindir}/fuse2fs
 %{_bindir}/lsattr
-%{_sbindir}/e2freefrag
+%{_sbindir}/*
-%{_sbindir}/e4crypt
-%{_sbindir}/filefrag
-%{_sbindir}/mklost+found
-%if %with_ext2resize
-%{_sbindir}/ext2online
-%{_sbindir}/ext2prepare
-%{_sbindir}/ext2resize
-%endif
-%{_sbindir}/e4defrag
 %{_unitdir}/e2scrub@.service
 %{_unitdir}/e2scrub_all.service
 %{_unitdir}/e2scrub_all.timer
 %{_unitdir}/e2scrub_fail@.service
 %{_unitdir}/e2scrub_reap.service
 %{_udevrulesdir}/96-e2scrub.rules
-%config(noreplace) %{_sysconfdir}/mke2fs.conf
 %{_mandir}/man1/chattr.*
 %{_mandir}/man1/fuse2fs.1*
 %{_mandir}/man1/lsattr.*
@@ -198,10 +157,10 @@ exit 0
 
 %files -n %{libname}
 %defattr(-,root,root)
-/%{_lib}/libcom_err.so.*
+%{_libdir}/libcom_err.so.*
-/%{_lib}/libe2p.so.*
+%{_libdir}/libe2p.so.*
-/%{_lib}/libext2fs.so.*
+%{_libdir}/libext2fs.so.*
-/%{_lib}/libss.so.*
+%{_libdir}/libss.so.*
 %dir %{_libdir}/e2fsprogs
 %{_libdir}/e2fsprogs/e2scrub_*
 %doc NOTICE
@@ -218,7 +177,7 @@ exit 0
 %{_includedir}/ext2fs/
 #%{_includedir}/quota/mkquota.h
 %{_includedir}/ss/
-/%{_lib}/libcom_err.so
+%{_libdir}/libcom_err.so
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/com_err.pc
@@ -236,6 +195,9 @@ exit 0
 %endif
 
 %changelog
+* Sat May 01 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.46.2-2mamba
+- rebuilt in /usr
+
 * Mon Mar 01 2021 Automatic Build System <autodist@mambasoft.it> 1.46.2-1mamba
 - automatic version update by autodist