X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=e2fsprogs.spec;h=77e7bbdaf42fcaeb3851b67fcf7b75bf3688f583;hb=c530250e0879a79c03d5ca67260c94f6826ce15c;hp=2d33fc87c80b5c205728c673e685f76f43b9f54c;hpb=9b25605d80d51a285ba6e6748dde4d313f2811be;p=packages%2Fe2fsprogs.git diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 2d33fc8..77e7bbd 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -4,7 +4,8 @@ %bcond_without static # link e2fsck dynamically with libc %bcond_without nls # build without NLS %bcond_without initrd # don't build initrd version -%bcond_without uClibc # link initrd version with static glibc instead of uClibc +%bcond_with uClibc # link initrd version with static glibc instead of uClibc +%bcond_without dietlibc # link initrd version with dietlibc instead of uClibc # %ifarch sparc64 sparc %undefine with_uClibc @@ -34,36 +35,39 @@ Summary(uk.UTF-8): Утиліти для роботи з файловою сис Summary(zh_CN.UTF-8): 管理第二扩展（ext2）文件系统的工具。 Summary(zh_TW.UTF-8): 用於管理 ext2 檔案系統的工具程式。 Name: e2fsprogs -Version: 1.40.4 -Release: 1 +Version: 1.41.4 +Release: 2 License: GPL v2 (with LGPL v2 and BSD parts) Group: Applications/System Source0: http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz -# Source0-md5: 124d744bdf9d443591eb8193c085944b +# Source0-md5: 59033388df36987d2b9c9bbf7e19bd57 Source1: e2compr-0.4.texinfo.gz # Source1-md5: c3c59ff37e49d8759abb1ef95a8d3abf 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 +Patch3: %{name}-diet.patch URL: http://e2fsprogs.sourceforge.net/ -BuildRequires: autoconf +BuildRequires: autoconf >= 2.50 BuildRequires: automake -BuildRequires: device-mapper-devel BuildRequires: gettext-devel >= 0.11 +BuildRequires: rpmbuild(macros) >= 1.426 BuildRequires: texinfo -%if %{with static} -BuildRequires: device-mapper-static +%if %{with allstatic} BuildRequires: glibc-static BuildRequires: libselinux-static BuildRequires: libsepol-static %endif %if %{with initrd} %if %{with uClibc} - %ifarch ppc -BuildRequires: uClibc-static >= 2:0.9.29 +BuildRequires: uClibc-static >= 2:0.9.29 + %else + %if %{with dietlibc} +BuildRequires: dietlibc-static %else -BuildRequires: uClibc-static >= 2:0.9.26 +BuildRequires: glibc-static %endif %endif %endif @@ -78,6 +82,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # changing CFLAGS in the middle confuses confcache %undefine configure_cache +# 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} + %description The e2fsprogs package contains a number of utilities for creating, checking, modifying and correcting any inconsistencies in second @@ -289,6 +297,19 @@ debugfs（用于检查文件系统的内部结构、手动修复被破坏的文 创建测试范例）、 tune2fs（用于修改文件系统参数）和其它大多数核心 ext2fs 文件系统实用程序。 +%package libs +Summary: ext2 filesystem-specific libraries +Summary(pl.UTF-8): Biblioteki dla systemu plików ext2 +Group: Libraries +Conflicts: e2fsprogs < 1.40.6-3 +Conflicts: fsck < 1.40.6-3 + +%description libs +ext2 filesystem-specific libraries. + +%description libs -l pl.UTF-8 +Biblioteki dla systemu plików ext2. + %package devel Summary: ext2 filesystem-specific libraries and headers Summary(cs.UTF-8): Knihovny a hlavičkové soubory pro systém souborů ext2 @@ -313,7 +334,9 @@ Summary(uk.UTF-8): Бібліотки програміста та хедери Summary(zh_CN.UTF-8): ext2 文件系统特有的静态库和头文件。 Summary(zh_TW.UTF-8): ext2 檔案系統特定的靜態函式庫與表頭。 Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +%if %{without allstatic} +Requires: %{name}-libs = %{version}-%{release} +%endif Requires: libcom_err-devel = %{version}-%{release} Requires: libuuid-devel = %{version}-%{release} Obsoletes: libext2fs2-devel @@ -530,10 +553,55 @@ 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 libuuid-dietlibc +Summary: Static dietlibc library for accessing and manipulating UUID +Summary(pl.UTF-8): Statyczna biblioteka dietlibc umożliwiająca dostęp i zmiany UUID +License: BSD +Group: Development/Libraries +Requires: libuuid-devel = %{version}-%{release} +Conflicts: e2fsprogs-static < 1.34-3 + +%description -n libuuid-dietlibc +Library for accessing and manipulating UUID - static dietlibc version. + +%description -n libuuid-dietlibc -l pl.UTF-8 +Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna dietlibc. + +%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 %{without allstatic} +Requires: %{name}-libs = %{version}-%{release} +%endif Requires: libuuid = %{version}-%{release} %description -n fsck @@ -558,16 +626,12 @@ etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd. %prep %setup -q %patch0 -p1 -gunzip < %{SOURCE1} > doc/e2compr.texinfo +%{__gzip} -dc < %{SOURCE1} > doc/e2compr.texinfo %patch1 -p1 +%patch2 -p1 +%patch3 -p1 -sed -i -e " - s,DEVMAPPER_REQ='libselinux libsepol',DEVMAPPER_REQ=,; - s,DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol',DEVMAPPER_LIBS='-ldevmapper',; - s,/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a,/usr/%{_lib}/libdevmapper.a /usr/%{_lib}/libselinux.a /usr/%{_lib}/libsepol.a," \ - -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in - -%{!?with_static:sed '/^all:/s/e2fsck\.static//' -i e2fsck/Makefile.in} +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 @@ -579,18 +643,37 @@ cp -f /usr/share/automake/config.sub . %{__autoconf} %if %{with initrd} +%if %{with dietlibc} +# needed for syscall() +sed -i -e 's|\(^LIBUUID = .*\)|\1 -lcompat|g' \ + -e 's|\(^STATIC_LIBUUID = .*\)|\1 -lcompat|g' MCONFIG.in +%endif %configure \ - %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \ ac_cv_lib_dl_dlopen=no \ + %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \ + %{?with_dietlibc:--with-cc="diet %{__cc}"} \ --with-ccopts="-Os" \ --with-ldopts="-static" \ --disable-elf-shlibs \ --disable-selinux \ - --disable-nls + --disable-nls \ + --disable-testio-debug \ + --disable-e2initrd-helper \ + --disable-uuidd \ + --disable-tls \ + --disable-nls \ + --disable-threads %{__make} -j1 libs %{__make} progs mv -f misc/blkid initrd-blkid +mv -f misc/mke2fs initrd-mke2fs +mv -f misc/fsck initrd-e2fsck +%if %{with dietlibc} +sed -i -e 's|\(^LIBUUID = .*\) -lcompat|\1|g' \ + -e 's|\(^STATIC_LIBUUID = .*\) -lcompat|\1|g' MCONFIG.in +mv -f lib/uuid/libuuid.a diet-libuuid.a +%endif %{__make} clean %endif @@ -598,10 +681,8 @@ mv -f misc/blkid initrd-blkid --with-root-prefix="" \ %{!?with_nls:--disable-nls} \ %{!?with_allstatic:--enable-elf-shlibs} \ - --enable-blkid-devmapper \ --enable-compression \ --enable-htree \ - %{!?with_static:--enable-dynamic-e2fsck} \ --enable-fsck \ --disable-rpath @@ -615,6 +696,7 @@ makeinfo --no-split e2compr.texinfo %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 @@ -636,18 +718,40 @@ 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 -f $RPM_BUILD_ROOT%{_mandir}/man8/{mkfs,fsck}.ext[234]*.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 e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/man8/fsck.ext4dev.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 +echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/man8/mkfs.ext4dev.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}/hu/man8/fsck.ext4dev.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 e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/it/man8/fsck.ext4dev.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 mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/it/man8/mkfs.ext4dev.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/ja/man8/fsck.ext4.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/ja/man8/fsck.ext4dev.8 +echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/ja/man8/mkfs.ext4.8 +echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/ja/man8/mkfs.ext4dev.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 e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/ko/man8/fsck.ext4dev.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 mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/ko/man8/mkfs.ext4dev.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/fsck.ext4.8 +echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/fsck.ext4dev.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 +echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext4dev.8 %if %{with nls} [ "`file $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/e2fsprogs.mo |\ @@ -658,40 +762,54 @@ echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext3.8 rm -f $RPM_BUILD_ROOT%{_mandir}/README.e2fsprogs-non-english-man-pages touch $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab -%{?with_initrd:install initrd-blkid $RPM_BUILD_ROOT/sbin/initrd-blkid} +%if %{with initrd} +install -d $RPM_BUILD_ROOT%{_libdir}/initrd +install initrd-blkid $RPM_BUILD_ROOT%{_libdir}/initrd/blkid +install initrd-e2fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck +install initrd-mke2fs $RPM_BUILD_ROOT%{_libdir}/initrd/mke2fs +%endif + +%{?with_dietlibc:install diet-libuuid.a $RPM_BUILD_ROOT%{dietlibdir}/libuuid.a} %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig -[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 +%post -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} + +%postun -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} -%postun -/sbin/ldconfig -[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig -%post devel -[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 +%post devel -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} -%postun devel -[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 +%postun devel -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} %post -n libcom_err -p /sbin/ldconfig %postun -n libcom_err -p /sbin/ldconfig -%pre -n libuuid -%groupadd -g 222 libuuid -%useradd -u 222 -r -d /var/lib/libuuid -s /bin/false -c "libuuid" -g libuuid libuuid - %post -n libuuid -p /sbin/ldconfig +%postun -n libuuid -p /sbin/ldconfig + +%pre -n uuidd +if [ "$(getgid libuuid 2>/dev/null)" = "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 libuuid +%postun -n uuidd if [ "$1" = "0" ]; then - %userremove libuuid - %groupremove libuuid + %userremove uuidd + %groupremove uuidd fi -/sbin/ldconfig %post -n fsck -p /sbin/ldconfig %postun -n fsck -p /sbin/ldconfig @@ -707,13 +825,18 @@ fi %attr(755,root,root) /sbin/e2fsck %attr(755,root,root) /sbin/e2image %attr(755,root,root) /sbin/e2label +%attr(755,root,root) /sbin/e2undo %attr(755,root,root) /sbin/findfs %attr(755,root,root) /sbin/fsck.ext2 %attr(755,root,root) /sbin/fsck.ext3 +%attr(755,root,root) /sbin/fsck.ext4 +%attr(755,root,root) /sbin/fsck.ext4dev %attr(755,root,root) /sbin/logsave %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/mkfs.ext4dev %attr(755,root,root) /sbin/resize2fs %attr(755,root,root) /sbin/tune2fs %attr(755,root,root) %{_bindir}/chattr @@ -721,14 +844,6 @@ fi %attr(755,root,root) %{_bindir}/mk_cmds %attr(755,root,root) %{_sbindir}/filefrag %attr(755,root,root) %{_sbindir}/mklost+found -%if %{without allstatic} -%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 %attr(755,root,root) %{_libdir}/e2initrd_helper %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2fsck.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mke2fs.conf @@ -745,14 +860,19 @@ fi %{_mandir}/man8/e2fsck.8* %{_mandir}/man8/e2image.8* %{_mandir}/man8/e2label.8* +%{_mandir}/man8/e2undo.8* %{_mandir}/man8/filefrag.8* %{_mandir}/man8/findfs.8* %{_mandir}/man8/fsck.ext2.8* %{_mandir}/man8/fsck.ext3.8* +%{_mandir}/man8/fsck.ext4.8* +%{_mandir}/man8/fsck.ext4dev.8* %{_mandir}/man8/logsave.8* %{_mandir}/man8/mke2fs.8* %{_mandir}/man8/mkfs.ext2.8* %{_mandir}/man8/mkfs.ext3.8* +%{_mandir}/man8/mkfs.ext4.8* +%{_mandir}/man8/mkfs.ext4dev.8* %{_mandir}/man8/mklost+found.8* %{_mandir}/man8/resize2fs.8* %{_mandir}/man8/tune2fs.8* @@ -769,6 +889,8 @@ 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/fsck.ext4dev.8* %lang(hu) %{_mandir}/hu/man8/tune2fs.8* %lang(it) %{_mandir}/it/man1/chattr.1* %lang(it) %{_mandir}/it/man1/lsattr.1* @@ -778,9 +900,13 @@ 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/fsck.ext4dev.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/mkfs.ext4dev.8* %lang(it) %{_mandir}/it/man8/mklost+found.8* %lang(it) %{_mandir}/it/man8/tune2fs.8* %lang(ja) %{_mandir}/ja/man1/chattr.1* @@ -794,9 +920,13 @@ fi %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/fsck.ext4dev.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/mkfs.ext4dev.8* %lang(ja) %{_mandir}/ja/man8/mklost+found.8* %lang(ja) %{_mandir}/ja/man8/resize2fs.8* %lang(ja) %{_mandir}/ja/man8/tune2fs.8* @@ -808,9 +938,13 @@ 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/fsck.ext4dev.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/mkfs.ext4dev.8* %lang(ko) %{_mandir}/ko/man8/mklost+found.8* %lang(ko) %{_mandir}/ko/man8/tune2fs.8* %lang(pl) %{_mandir}/pl/man1/chattr.1* @@ -822,14 +956,31 @@ 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/fsck.ext4dev.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/mkfs.ext4dev.8* %lang(pl) %{_mandir}/pl/man8/mklost+found.8* %lang(pl) %{_mandir}/pl/man8/tune2fs.8* %{_datadir}/ss %{_infodir}/e2compr.info* +%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 @@ -884,14 +1035,11 @@ fi %defattr(644,root,root,755) %doc lib/uuid/COPYING %attr(755,root,root) %{_bindir}/uuidgen -%attr(6755,libuuid,libuuid) %{_sbindir}/uuidd %if %{without allstatic} %attr(755,root,root) /%{_lib}/libuuid.so.*.* %attr(755,root,root) %ghost /%{_lib}/libuuid.so.1 %endif -%attr(750,libuuid,libuuid) /var/lib/libuuid %{_mandir}/man1/uuidgen.1* -%{_mandir}/man8/uuidd.8* %lang(ja) %{_mandir}/ja/man1/uuidgen.1* %files -n libuuid-devel @@ -907,13 +1055,21 @@ fi %defattr(644,root,root,755) %{_libdir}/libuuid.a +%if %{with dietlibc} +%files -n libuuid-dietlibc +%defattr(644,root,root,755) +%{dietlibdir}/libuuid.a +%endif + +%files -n uuidd +%defattr(644,root,root,755) +%attr(6755,uuidd,uuidd) %{_sbindir}/uuidd +%attr(2775,uuidd,uuidd) /var/lib/libuuid +%{_mandir}/man8/uuidd.8* + %files -n fsck %defattr(644,root,root,755) %attr(755,root,root) /sbin/fsck -%if %{without allstatic} -%attr(755,root,root) /%{_lib}/libblkid.so.*.* -%attr(755,root,root) %ghost /%{_lib}/libblkid.so.1 -%endif %{_mandir}/man8/fsck.8* %lang(it) %{_mandir}/it/man8/fsck.8* %lang(ja) %{_mandir}/ja/man8/fsck.8* @@ -923,5 +1079,7 @@ fi %if %{with initrd} %files initrd %defattr(644,root,root,755) -%attr(755,root,root) /sbin/initrd-blkid +%attr(755,root,root) %{_libdir}/initrd/blkid +%attr(755,root,root) %{_libdir}/initrd/e2fsck +%attr(755,root,root) %{_libdir}/initrd/mke2fs %endif