X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=e2fsprogs.spec;h=29e9b9b0a503a1c1af205ced851b36684a5ed3e7;hb=HEAD;hp=ca8217ecb4e960adad5c469baf9591b9ad81ce0a;hpb=1fd884dd6d892d7da05346eb8f7cd6581254e65a;p=packages%2Fe2fsprogs.git diff --git a/e2fsprogs.spec b/e2fsprogs.spec index ca8217e..73e4dbe 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,15 +1,33 @@ # +#TODO: +# - subpackage for systemd / cron / udev files? +# + # Conditional build: %bcond_with allstatic # link everything statically -%bcond_without static # link e2fsck dynamically with libc +%bcond_without fuse # fuse2fs program %bcond_without nls # build without NLS -%bcond_without initrd # don't build initrd version +%bcond_without tls # TLS +%bcond_without scrub # don't package e2scrub* utilities +%if "%{pld_release}" == "ac" +%bcond_with initrd # don't build initrd version %bcond_without uClibc # link initrd version with static glibc instead of uClibc -# -%ifarch sparc64 sparc +%bcond_with dietlibc # link initrd version with dietlibc instead of uClibc +%else +%bcond_with initrd # don't build initrd version +%bcond_with uClibc # link initrd version with static glibc instead of uClibc +%bcond_without dietlibc # link initrd version with dietlibc instead of uClibc +%endif + +%ifarch sparc64 sparc alpha ppc ppc64 %undefine with_uClibc %endif -# + +# see glibc.spec +%ifarch i386 +%undefine with_tls +%endif + Summary: Utilities for managing the second extended (ext2) filesystem Summary(cs.UTF-8): Nástroje pro správu souborových systémů typu ext2 Summary(da.UTF-8): Værktøjer til håndtering af ext2 filsystemer @@ -34,46 +52,81 @@ Summary(uk.UTF-8): Утиліти для роботи з файловою сис Summary(zh_CN.UTF-8): 管理第二扩展（ext2）文件系统的工具。 Summary(zh_TW.UTF-8): 用於管理 ext2 檔案系統的工具程式。 Name: e2fsprogs -Version: 1.40.10 +Version: 1.47.1 Release: 1 License: GPL v2 (with LGPL v2 and BSD parts) Group: Applications/System -Source0: http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz -# Source0-md5: 6174d70fb26858861f842f28486a8e83 -Source1: e2compr-0.4.texinfo.gz -# Source1-md5: c3c59ff37e49d8759abb1ef95a8d3abf +Source0: https://downloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz +# Source0-md5: 75e6d1353cbe6d5728a98fb0267206cb Source2: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source2-md5: 992a37783bd42a897232972917e8ca7d Patch0: %{name}-info.patch -Patch1: e2compr-info.patch -Patch2: %{name}-498381.patch +Patch1: %{name}-498381.patch +Patch2: %{name}-diet.patch URL: http://e2fsprogs.sourceforge.net/ -BuildRequires: autoconf +BuildRequires: autoconf >= 2.71 +BuildRequires: autoconf-archive BuildRequires: automake -BuildRequires: device-mapper-devel >= 1.02.18-2 -BuildRequires: gettext-devel >= 0.11 -BuildRequires: rpmbuild(macros) >= 1.426 +BuildRequires: gettext-tools >= 0.11 +BuildRequires: libblkid-devel +%{?with_fuse:BuildRequires: libfuse-devel} +BuildRequires: libuuid-devel +BuildRequires: pkgconfig +BuildRequires: rpm >= 4.4.9-56 +BuildRequires: rpmbuild(macros) >= 1.644 BuildRequires: texinfo +BuildRequires: texinfo-texi2dvi %if %{with allstatic} -BuildRequires: device-mapper-static BuildRequires: glibc-static -BuildRequires: libselinux-static -BuildRequires: libsepol-static %endif -%if %{with initrd} && %{with uClibc} +%if %{with initrd} + %if %{with uClibc} BuildRequires: uClibc-static >= 2:0.9.29 + %else + %if %{with dietlibc} +BuildRequires: dietlibc-static >= 2:0.32-9 +BuildRequires: libblkid-dietlibc +BuildRequires: libuuid-dietlibc + %else +BuildRequires: glibc-static +BuildRequires: libblkid-static +BuildRequires: libuuid-static + %endif + %endif %endif Requires(post,postun): /sbin/ldconfig -Requires: fsck = %{version}-%{release} +Requires(post,preun,postun): systemd-units >= 38 +Requires: %{name}-libs = %{version}-%{release} +Requires: fsck Requires: libcom_err = %{version}-%{release} -Requires: libuuid = %{version}-%{release} -Obsoletes: e2fsprogs-evms +Requires: libss = %{version}-%{release} +Requires: systemd-units >= 38 +Obsoletes: e2fsprogs-evms < 1.36 Obsoletes: libext2fs2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # changing CFLAGS in the middle confuses confcache %undefine configure_cache +# objdump -T /lib/libcom_err.so.2.1 | grep ___tls_get_addr +# on ac it is: +# 00000000 D *UND* 00000000 ___tls_get_addr +# on th it is: +# 00000000 DF *UND* 00000000 GLIBC_2.3 ___tls_get_addr +# yet on ac rpm-build-macros think it's unresolved symbol, but program still seem to work +%if "%{pld_release}" == "ac" +%define skip_post_check_so libcom_err.so.2.1 +%endif + +# for some reason known only to rpm there must be "\\|" not "\|" here +%define dietarch %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/') +%define dietlibdir %{_prefix}/lib/dietlibc/lib-%{dietarch} + +%ifarch ppc ppc64 +# for dietlibc +%define filterout_ld -Wl,-z,relro +%endif + %description The e2fsprogs package contains a number of utilities for creating, checking, modifying and correcting any inconsistencies in second @@ -285,10 +338,25 @@ debugfs（用于检查文件系统的内部结构、手动修复被破坏的文 创建测试范例）、 tune2fs（用于修改文件系统参数）和其它大多数核心 ext2fs 文件系统实用程序。 +%package fuse +Summary: FUSE file system client for ext2/ext3/ext4 file systems +Summary(pl.UTF-8): Klient systemu plików FUSE dla systemów plików ext2/ext3/ext4 +Group: Applications/System +Requires: %{name}-libs = %{version}-%{release} +Requires: libfuse-tools +Requires: libcom_err = %{version}-%{release} + +%description fuse +FUSE file system client for ext2/ext3/ext4 file systems. + +%description fuse -l pl.UTF-8 +Klient systemu plików FUSE dla systemów plików ext2/ext3/ext4. + %package libs Summary: ext2 filesystem-specific libraries Summary(pl.UTF-8): Biblioteki dla systemu plików ext2 Group: Libraries +Requires: libcom_err = %{version}-%{release} Conflicts: e2fsprogs < 1.40.6-3 Conflicts: fsck < 1.40.6-3 @@ -322,12 +390,14 @@ Summary(uk.UTF-8): Бібліотки програміста та хедери Summary(zh_CN.UTF-8): ext2 文件系统特有的静态库和头文件。 Summary(zh_TW.UTF-8): ext2 檔案系統特定的靜態函式庫與表頭。 Group: Development/Libraries -%if %{with allstatic} +%if %{without allstatic} Requires: %{name}-libs = %{version}-%{release} %endif Requires: libcom_err-devel = %{version}-%{release} -Requires: libuuid-devel = %{version}-%{release} +Requires: libuuid-devel Obsoletes: libext2fs2-devel +# until it comes back +Obsoletes: libquota-devel < 1.42.12 %description devel e2fsprogs-devel contains the libraries and header files needed to @@ -499,191 +569,180 @@ A Common Error Description Library for unices - static version. %description -n libcom_err-static -l pl.UTF-8 Biblioteka opisu popularnych błędów dla uniksów - wersja statyczna. -%package -n libuuid -Summary: Library for accessing and manipulating UUID -Summary(pl.UTF-8): Biblioteka umożliwiająca dostęp i zmiany UUID -License: BSD +%package -n libss +Summary: Subsystem command parsing library +Summary(pl.UTF-8): Biblioteka analizy poleceń podsystemów Group: Libraries +Requires: libcom_err = %{version}-%{release} Conflicts: e2fsprogs < 1.34-3 +Conflicts: e2fsprogs-libs < 1.41.11-2 -%description -n libuuid -Library for accessing and manipulating UUID. +%description -n libss +Subsystem command parsing library. -%description -n libuuid -l pl.UTF-8 -Biblioteka umożliwiająca dostęp i zmiany UUID. +%description -n libss -l pl.UTF-8 +Biblioteka analizy poleceń podsystemów. -%package -n libuuid-devel -Summary: Header files for library for accessing and manipulating UUID -Summary(pl.UTF-8): Pliki nagłówkowe biblioteki umożliwiającej dostęp i zmiany UUID -License: BSD +%package -n libss-devel +Summary: Development files for subsystem command parsing library +Summary(pl.UTF-8): Pliki dla programistów do biblioteki analizy poleceń podsystemów Group: Development/Libraries -Requires: libuuid = %{version}-%{release} -Conflicts: e2fsprogs-devel < 1.34-3 +Requires: libcom_err-devel = %{version}-%{release} +Requires: libss = %{version}-%{release} +Conflicts: e2fsprogs < 1.41.11-2 +Conflicts: e2fsprogs-devel < 1.41.11-2 -%description -n libuuid-devel -Library for accessing and manipulating UUID - development files. +%description -n libss-devel +Development files for subsystem command parsing library, including +header files and mk_cmds utility. -%description -n libuuid-devel -l pl.UTF-8 -Biblioteka umożliwiająca dostęp i zmiany UUID - pliki dla -programistów. +%description -n libss-devel -l pl.UTF-8 +Biblioteka opisu popularPliki dla programistów do biblioteki analizy +poleceń podsystemów - w tym pliki nagłówkowe i narzędzie mk_cmds. -%package -n libuuid-static -Summary: Static library for accessing and manipulating UUID -Summary(pl.UTF-8): Statyczna biblioteka umożliwiająca dostęp i zmiany UUID -License: BSD +%package -n libss-static +Summary: Static version of subsystem command parsing library +Summary(pl.UTF-8): Statyczna wersja biblioteki analizy poleceń podsystemów Group: Development/Libraries -Requires: libuuid-devel = %{version}-%{release} -Conflicts: e2fsprogs-static < 1.34-3 +Requires: libss-devel = %{version}-%{release} +Conflicts: e2fsprogs-static < 1.41.11-2 -%description -n libuuid-static -Library for accessing and manipulating UUID - static version. - -%description -n libuuid-static -l pl.UTF-8 -Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna. - -%package -n uuidd -Summary: Helper daemon to guarantee uniqueness of time-based UUIDs -Summary(pl.UTF-8): Pomocniczy demon gwarantujący unikalność UUID-ów opartych na czasie -License: GPL v2 -Group: Daemons -Requires(postun): /usr/sbin/groupdel -Requires(postun): /usr/sbin/userdel -Requires(pre): /bin/id -Requires(pre): /usr/bin/getgid -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/groupmod -Requires(pre): /usr/sbin/useradd -Requires(pre): /usr/sbin/usermod -Requires: libuuid = %{version}-%{release} -Provides: group(uuidd) -Provides: user(uuidd) -Conflicts: libuuid < 1.40.5-0.1 - -%description -n uuidd -The uuidd package contains a userspace daemon (uuidd) which guarantees -uniqueness of time-based UUID generation even at very high rates on -SMP systems. - -%description -n uuidd -l pl.UTF-8 -Ten pakiet zawiera działającego w przestrzeni użytkownika demona -(uuidd) gwarantującego unikalność generowania UUID-ów opartych na -czasie nawet przy bardzo dużej częstotliwości na systemach SMP. - -%package -n fsck -Summary: Check and repair a Linux file system -Summary(pl.UTF-8): Sprawdzenie i naprawa linuksowego systemu plików -Group: Applications/System -%if %{with allstatic} -Requires: %{name}-libs = %{version}-%{release} -%endif -Requires: libuuid = %{version}-%{release} +%description -n libss-static +Static version of subsystem command parsing library. + +%description -n libss-static -l pl.UTF-8 +Statyczna wersja biblioteki analizy poleceń podsystemów. + +%package -n libquota-devel +Summary: Quota management library +Summary(pl.UTF-8): Biblioteka do zarządzania limitami dyskowymi (quotami) +Group: Development/Libraries -%description -n fsck -Check and repair a Linux file system. +%description -n libquota-devel +Quota management library. -%description -n fsck -l pl.UTF-8 -Sprawdzenie i naprawa linuksowego systemu plików. +%description -n libquota-devel -l pl.UTF-8 +Biblioteka do zarządzania limitami dyskowymi (quotami). %package initrd -Summary: blkid - initrd version -Summary(pl.UTF-8): blkid - wersja dla initrd +Summary: e2fsck and mke2fs - initrd version +Summary(pl.UTF-8): e2fsck i mke2fs - wersja dla initrd Group: Base +Conflicts: geninitrd < 10000.10 %description initrd -This package includes a blkid utility to recognize partitions by label -or UUID - staticaly linked for initrd. +This package includes a e2fsck and mke2fs utilities staticaly linked +for initrd. %description initrd -l pl.UTF-8 -Pakiet ten zawiera narzędzie blkid do rozpoznawania partycji przez -etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd. +Pakiet ten zawiera narzędzia e2fsck i mke2fs statycznie skonsolidowane +na potrzeby initrd. %prep %setup -q %patch0 -p1 -%{__gzip} -dc < %{SOURCE1} > doc/e2compr.texinfo %patch1 -p1 %patch2 -p1 -sed -i -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in - -# AX_TLS -tail -n +2604 aclocal.m4 > acinclude.m4 - %build cp -f /usr/share/automake/config.sub . -%{__gettextize} %{__aclocal} %{__autoconf} %if %{with initrd} %configure \ - %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \ ac_cv_lib_dl_dlopen=no \ - --with-ccopts="-Os" \ - --with-ldopts="-static" \ + %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \ + %{?with_dietlibc:CC="diet %{__cc}"} \ + CFLAGS="%{rpmcflags} -Os" \ + LDFLAGS="%{rpmldflags} -static" \ --disable-elf-shlibs \ - --disable-selinux \ - --disable-nls - -%{__make} libs -%{__make} progs -mv -f misc/blkid initrd-blkid + --disable-fsck \ + --disable-fuse2fs \ + --disable-libblkid \ + --disable-libuuid \ + --disable-nls \ + --disable-testio-debug \ + --disable-e2initrd-helper \ + --disable-threads \ + --disable-tls \ + --disable-uuidd + +%{__make} libs \ + V=1 +%{__make} progs \ + V=1 +mv -f misc/mke2fs initrd-mke2fs %{__make} clean %endif %configure \ --with-root-prefix="" \ + --disable-fsck \ + %{!?with_fuse:--disable-fuse2fs} \ + --disable-libblkid \ + --disable-libuuid \ %{!?with_nls:--disable-nls} \ - %{!?with_allstatic:--enable-elf-shlibs} \ - --enable-blkid-devmapper \ - --enable-compression \ - --enable-htree \ - --enable-fsck \ - --disable-rpath - -%{__make} -j1 libs \ - LDFLAGS="%{rpmldflags}" + %{!?with_tls:--disable-tls} \ + --disable-rpath \ + --disable-uuidd \ + %{!?with_allstatic:--enable-elf-shlibs} + +%{__make} libs \ + LDFLAGS="%{rpmldflags}" \ + V=1 %{__make} progs docs \ - LDFLAGS="%{rpmldflags}" - -cd doc -makeinfo --no-split e2compr.texinfo + LDFLAGS="%{rpmldflags}" \ + V=1 %install rm -rf $RPM_BUILD_ROOT +%{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}} export PATH=/sbin:$PATH -install -d $RPM_BUILD_ROOT/var/lib/libuuid - -echo "install-shlibs:" >> intl/Makefile - -%{__make} install install-libs \ +%{__make} -j1 install install-libs \ root_libdir=/%{_lib} \ mkinstalldirs='install -d' \ + LDCONFIG=true \ DESTDIR=$RPM_BUILD_ROOT ln -sf e2fsck $RPM_BUILD_ROOT/sbin/fsck.ext2 ln -sf e2fsck $RPM_BUILD_ROOT/sbin/fsck.ext3 ln -sf mke2fs $RPM_BUILD_ROOT/sbin/mkfs.ext2 -install doc/e2compr.info $RPM_BUILD_ROOT%{_infodir} - touch $RPM_BUILD_ROOT%{_sysconfdir}/e2fsck.conf bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{mkfs,fsck}.ext[23].8* +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/{mkfs,fsck}.ext{2,3,4}.8* echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/man8/fsck.ext2.8 echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/man8/fsck.ext3.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/man8/fsck.ext4.8 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.ext2.8 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.ext3.8 +echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.ext4.8 # missing in non-english-man-pages tarball echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/hu/man8/fsck.ext3.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/hu/man8/fsck.ext4.8 echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/it/man8/fsck.ext3.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/it/man8/fsck.ext4.8 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/it/man8/mkfs.ext3.8 +echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/it/man8/mkfs.ext4.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/ja/man8/fsck.ext4.8 +echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/ja/man8/mkfs.ext4.8 echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/ko/man8/fsck.ext3.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/ko/man8/fsck.ext4.8 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/ko/man8/mkfs.ext3.8 +echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/ko/man8/mkfs.ext4.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/fsck.ext4.8 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext3.8 +echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext4.8 +# moved to util-linux-ng.spec +%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man1/uuidgen.1 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man3/libuuid.3 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man3/uuid_*.3 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/findfs.8 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/fsck.8 %if %{with nls} [ "`file $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/e2fsprogs.mo |\ @@ -691,19 +750,28 @@ echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext3.8 %find_lang %{name} %endif -rm -f $RPM_BUILD_ROOT%{_mandir}/README.e2fsprogs-non-english-man-pages -touch $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab +%{__rm} $RPM_BUILD_ROOT/sbin/logsave +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/logsave.8* +%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.e2fsprogs-non-english-man-pages -%{?with_initrd:install initrd-blkid $RPM_BUILD_ROOT/sbin/initrd-blkid} +%if %{with initrd} +install -d $RPM_BUILD_ROOT%{_libdir}/initrd +install -p initrd-mke2fs $RPM_BUILD_ROOT%{_libdir}/initrd/mke2fs +%endif %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell --/usr/sbin/fix-info-dir -c %{_infodir} +%post +[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1 +%systemd_post e2scrub_all.service -%postun -p /sbin/postshell --/usr/sbin/fix-info-dir -c %{_infodir} +%preun +%systemd_preun e2scrub_all.service + +%postun +[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1 +%systemd_reload %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -717,77 +785,89 @@ rm -rf $RPM_BUILD_ROOT %post -n libcom_err -p /sbin/ldconfig %postun -n libcom_err -p /sbin/ldconfig -%post -n libuuid -p /sbin/ldconfig -%postun -n libuuid -p /sbin/ldconfig - -%pre -n uuidd -if [ "$(getgid libuuid)" = "222" ]; then - /usr/sbin/groupmod -n uuidd libuuid -fi -%groupadd -g 222 uuidd -if [ "$(id -u libuuid 2>/dev/null)" = "222" ]; then - /usr/sbin/usermod -l uuidd libuuid -fi -%useradd -u 222 -r -d /var/lib/libuuid -s /bin/false -c "UUID generator helper daemon" -g uuidd uuidd - -%postun -n uuidd -if [ "$1" = "0" ]; then - %userremove uuidd - %groupremove uuidd -fi - -%post -n fsck -p /sbin/ldconfig -%postun -n fsck -p /sbin/ldconfig +%post -n libss -p /sbin/ldconfig +%postun -n libss -p /sbin/ldconfig %files %{?with_nls:-f %{name}.lang} %defattr(644,root,root,755) -# COPYING specifies license details for some parts of package -%doc COPYING README RELEASE-NOTES +%doc NOTICE README RELEASE-NOTES %attr(755,root,root) /sbin/badblocks -%attr(755,root,root) /sbin/blkid %attr(755,root,root) /sbin/debugfs %attr(755,root,root) /sbin/dumpe2fs %attr(755,root,root) /sbin/e2fsck %attr(755,root,root) /sbin/e2image %attr(755,root,root) /sbin/e2label -%attr(755,root,root) /sbin/findfs +%attr(755,root,root) /sbin/e2mmpstatus +%if %{with scrub} +%attr(755,root,root) /sbin/e2scrub +%attr(755,root,root) /sbin/e2scrub_all +%endif +%attr(755,root,root) /sbin/e2undo %attr(755,root,root) /sbin/fsck.ext2 %attr(755,root,root) /sbin/fsck.ext3 -%attr(755,root,root) /sbin/logsave +%attr(755,root,root) /sbin/fsck.ext4 %attr(755,root,root) /sbin/mke2fs %attr(755,root,root) /sbin/mkfs.ext2 %attr(755,root,root) /sbin/mkfs.ext3 +%attr(755,root,root) /sbin/mkfs.ext4 %attr(755,root,root) /sbin/resize2fs %attr(755,root,root) /sbin/tune2fs %attr(755,root,root) %{_bindir}/chattr %attr(755,root,root) %{_bindir}/lsattr -%attr(755,root,root) %{_bindir}/mk_cmds +%attr(755,root,root) %{_sbindir}/e2freefrag +%attr(755,root,root) %{_sbindir}/e4crypt +%attr(755,root,root) %{_sbindir}/e4defrag %attr(755,root,root) %{_sbindir}/filefrag %attr(755,root,root) %{_sbindir}/mklost+found %attr(755,root,root) %{_libdir}/e2initrd_helper +%dir %{_libexecdir}/e2fsprogs +%if %{with scrub} +%attr(755,root,root) %{_libexecdir}/e2fsprogs/e2scrub_all_cron +%attr(755,root,root) %{_libexecdir}/e2fsprogs/e2scrub_fail +%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/e2scrub_all +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2scrub.conf +%endif %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2fsck.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mke2fs.conf -%ghost %{_sysconfdir}/blkid.tab +%if %{with scrub} +%{systemdunitdir}/e2scrub@.service +%{systemdunitdir}/e2scrub_all.service +%{systemdunitdir}/e2scrub_all.timer +%{systemdunitdir}/e2scrub_fail@.service +%{systemdunitdir}/e2scrub_reap.service +/lib/udev/rules.d/64-ext4.rules +/lib/udev/rules.d/96-e2scrub.rules +%endif %{_mandir}/man1/chattr.1* %{_mandir}/man1/lsattr.1* -%{_mandir}/man1/mk_cmds.1* %{_mandir}/man5/e2fsck.conf.5* +%{_mandir}/man5/ext2.5* +%{_mandir}/man5/ext3.5* +%{_mandir}/man5/ext4.5* %{_mandir}/man5/mke2fs.conf.5* %{_mandir}/man8/badblocks.8* -%{_mandir}/man8/blkid.8* %{_mandir}/man8/debugfs.8* %{_mandir}/man8/dumpe2fs.8* +%{_mandir}/man8/e2freefrag.8* %{_mandir}/man8/e2fsck.8* %{_mandir}/man8/e2image.8* %{_mandir}/man8/e2label.8* +%{_mandir}/man8/e2mmpstatus.8* +%if %{with scrub} +%{_mandir}/man8/e2scrub.8* +%{_mandir}/man8/e2scrub_all.8* +%endif +%{_mandir}/man8/e2undo.8* +%{_mandir}/man8/e4crypt.8* +%{_mandir}/man8/e4defrag.8* %{_mandir}/man8/filefrag.8* -%{_mandir}/man8/findfs.8* %{_mandir}/man8/fsck.ext2.8* %{_mandir}/man8/fsck.ext3.8* -%{_mandir}/man8/logsave.8* +%{_mandir}/man8/fsck.ext4.8* %{_mandir}/man8/mke2fs.8* %{_mandir}/man8/mkfs.ext2.8* %{_mandir}/man8/mkfs.ext3.8* +%{_mandir}/man8/mkfs.ext4.8* %{_mandir}/man8/mklost+found.8* %{_mandir}/man8/resize2fs.8* %{_mandir}/man8/tune2fs.8* @@ -804,6 +884,7 @@ fi %lang(hu) %{_mandir}/hu/man8/e2fsck.8* %lang(hu) %{_mandir}/hu/man8/fsck.ext2.8* %lang(hu) %{_mandir}/hu/man8/fsck.ext3.8* +%lang(hu) %{_mandir}/hu/man8/fsck.ext4.8* %lang(hu) %{_mandir}/hu/man8/tune2fs.8* %lang(it) %{_mandir}/it/man1/chattr.1* %lang(it) %{_mandir}/it/man1/lsattr.1* @@ -813,9 +894,11 @@ fi %lang(it) %{_mandir}/it/man8/e2fsck.8* %lang(it) %{_mandir}/it/man8/fsck.ext2.8* %lang(it) %{_mandir}/it/man8/fsck.ext3.8* +%lang(it) %{_mandir}/it/man8/fsck.ext4.8* %lang(it) %{_mandir}/it/man8/mke2fs.8* %lang(it) %{_mandir}/it/man8/mkfs.ext2.8* %lang(it) %{_mandir}/it/man8/mkfs.ext3.8* +%lang(it) %{_mandir}/it/man8/mkfs.ext4.8* %lang(it) %{_mandir}/it/man8/mklost+found.8* %lang(it) %{_mandir}/it/man8/tune2fs.8* %lang(ja) %{_mandir}/ja/man1/chattr.1* @@ -826,12 +909,13 @@ fi %lang(ja) %{_mandir}/ja/man8/e2fsck.8* %lang(ja) %{_mandir}/ja/man8/e2image.8* %lang(ja) %{_mandir}/ja/man8/e2label.8* -%lang(ja) %{_mandir}/ja/man8/findfs.8* %lang(ja) %{_mandir}/ja/man8/fsck.ext2.8* %lang(ja) %{_mandir}/ja/man8/fsck.ext3.8* +%lang(ja) %{_mandir}/ja/man8/fsck.ext4.8* %lang(ja) %{_mandir}/ja/man8/mke2fs.8* %lang(ja) %{_mandir}/ja/man8/mkfs.ext2.8* %lang(ja) %{_mandir}/ja/man8/mkfs.ext3.8* +%lang(ja) %{_mandir}/ja/man8/mkfs.ext4.8* %lang(ja) %{_mandir}/ja/man8/mklost+found.8* %lang(ja) %{_mandir}/ja/man8/resize2fs.8* %lang(ja) %{_mandir}/ja/man8/tune2fs.8* @@ -843,9 +927,11 @@ fi %lang(ko) %{_mandir}/ko/man8/e2fsck.8* %lang(ko) %{_mandir}/ko/man8/fsck.ext2.8* %lang(ko) %{_mandir}/ko/man8/fsck.ext3.8* +%lang(ko) %{_mandir}/ko/man8/fsck.ext4.8* %lang(ko) %{_mandir}/ko/man8/mke2fs.8* %lang(ko) %{_mandir}/ko/man8/mkfs.ext2.8* %lang(ko) %{_mandir}/ko/man8/mkfs.ext3.8* +%lang(ko) %{_mandir}/ko/man8/mkfs.ext4.8* %lang(ko) %{_mandir}/ko/man8/mklost+found.8* %lang(ko) %{_mandir}/ko/man8/tune2fs.8* %lang(pl) %{_mandir}/pl/man1/chattr.1* @@ -857,53 +943,46 @@ fi %lang(pl) %{_mandir}/pl/man8/e2label.8* %lang(pl) %{_mandir}/pl/man8/fsck.ext2.8* %lang(pl) %{_mandir}/pl/man8/fsck.ext3.8* +%lang(pl) %{_mandir}/pl/man8/fsck.ext4.8* %lang(pl) %{_mandir}/pl/man8/mke2fs.8* %lang(pl) %{_mandir}/pl/man8/mkfs.ext2.8* %lang(pl) %{_mandir}/pl/man8/mkfs.ext3.8* +%lang(pl) %{_mandir}/pl/man8/mkfs.ext4.8* %lang(pl) %{_mandir}/pl/man8/mklost+found.8* %lang(pl) %{_mandir}/pl/man8/tune2fs.8* -%{_datadir}/ss -%{_infodir}/e2compr.info* + +%if %{with fuse} +%files fuse +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/fuse2fs +%{_mandir}/man1/fuse2fs.1* +%endif %if %{without allstatic} %files libs %defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libblkid.so.*.* -%attr(755,root,root) %ghost /%{_lib}/libblkid.so.1 %attr(755,root,root) /%{_lib}/libe2p.so.*.* %attr(755,root,root) %ghost /%{_lib}/libe2p.so.2 %attr(755,root,root) /%{_lib}/libext2fs.so.*.* %attr(755,root,root) %ghost /%{_lib}/libext2fs.so.2 -%attr(755,root,root) /%{_lib}/libss.so.*.* -%attr(755,root,root) %ghost /%{_lib}/libss.so.2 %endif %files devel %defattr(644,root,root,755) -%doc doc/libblkid.txt %if %{without allstatic} -%attr(755,root,root) %{_libdir}/libblkid.so %attr(755,root,root) %{_libdir}/libe2p.so %attr(755,root,root) %{_libdir}/libext2fs.so -%attr(755,root,root) %{_libdir}/libss.so %endif -%{_includedir}/blkid %{_includedir}/e2p %{_includedir}/ext2fs -%{_includedir}/ss -%{_pkgconfigdir}/blkid.pc %{_pkgconfigdir}/e2p.pc %{_pkgconfigdir}/ext2fs.pc -%{_pkgconfigdir}/ss.pc %{_infodir}/libext2fs.info* -%{_mandir}/man3/libblkid.3* %files static %defattr(644,root,root,755) -%{_libdir}/libblkid.a %{_libdir}/libe2p.a %{_libdir}/libext2fs.a -%{_libdir}/libss.a %files -n libcom_err %defattr(644,root,root,755) @@ -916,6 +995,7 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/compile_et %{!?with_allstatic:%attr(755,root,root) %{_libdir}/libcom_err.so} +%{_includedir}/com_err.h %{_includedir}/et %{_datadir}/et %{_pkgconfigdir}/com_err.pc @@ -928,47 +1008,39 @@ fi %defattr(644,root,root,755) %{_libdir}/libcom_err.a -%files -n libuuid -%defattr(644,root,root,755) -%doc lib/uuid/COPYING -%attr(755,root,root) %{_bindir}/uuidgen %if %{without allstatic} -%attr(755,root,root) /%{_lib}/libuuid.so.*.* -%attr(755,root,root) %ghost /%{_lib}/libuuid.so.1 +%files -n libss +%defattr(644,root,root,755) +%attr(755,root,root) /%{_lib}/libss.so.*.* +%attr(755,root,root) %ghost /%{_lib}/libss.so.2 %endif -%{_mandir}/man1/uuidgen.1* -%lang(ja) %{_mandir}/ja/man1/uuidgen.1* -%files -n libuuid-devel -%defattr(644,root,root,755) -%{!?with_allstatic:%attr(755,root,root) %{_libdir}/libuuid.so} -%{_includedir}/uuid -%{_pkgconfigdir}/uuid.pc -%{_mandir}/man3/uuid*.3* -%lang(ja) %{_mandir}/ja/man3/libuuid.3* -%lang(ja) %{_mandir}/ja/man3/uuid_*.3* - -%files -n libuuid-static +%files -n libss-devel %defattr(644,root,root,755) -%{_libdir}/libuuid.a +%attr(755,root,root) %{_bindir}/mk_cmds +%if %{without allstatic} +%attr(755,root,root) %{_libdir}/libss.so +%endif +%{_includedir}/ss +%{_datadir}/ss +%{_pkgconfigdir}/ss.pc +%{_mandir}/man1/mk_cmds.1* -%files -n uuidd +%files -n libss-static %defattr(644,root,root,755) -%attr(6755,uuidd,uuidd) %{_sbindir}/uuidd -%attr(2775,uuidd,uuidd) /var/lib/libuuid -%{_mandir}/man8/uuidd.8* +%{_libdir}/libss.a -%files -n fsck +%if 0 +# was installed in >= 1.42.2, since 1.42.12 is private only +%files -n libquota-devel %defattr(644,root,root,755) -%attr(755,root,root) /sbin/fsck -%{_mandir}/man8/fsck.8* -%lang(it) %{_mandir}/it/man8/fsck.8* -%lang(ja) %{_mandir}/ja/man8/fsck.8* -%lang(ko) %{_mandir}/ko/man8/fsck.8* -%lang(pl) %{_mandir}/pl/man8/fsck.8* +%{_libdir}/libquota.a +%{_includedir}/quota +%{_pkgconfigdir}/quota.pc +%endif %if %{with initrd} %files initrd %defattr(644,root,root,755) -%attr(755,root,root) /sbin/initrd-blkid +%attr(755,root,root) %{_libdir}/initrd/mke2fs %endif