X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=e2fsprogs.spec;h=46167f7f71af3feb359e3b782b02c2652b6385cc;hb=2b31b5504b331a07d9a37a355569b73b12a61802;hp=34d1474233f6e091611cac50447191aace0a1d95;hpb=da60c362dfbbbdc7f6d1b5e05bd0346501b5168e;p=packages%2Fe2fsprogs.git diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 34d1474..46167f7 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,12 +1,11 @@ -# TODO -# - run uidd via init.d # # Conditional build: %bcond_with allstatic # link everything statically %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 @@ -36,40 +35,50 @@ Summary(uk.UTF-8): Утиліти для роботи з файловою сис Summary(zh_CN.UTF-8): 管理第二扩展（ext2）文件系统的工具。 Summary(zh_TW.UTF-8): 用於管理 ext2 檔案系統的工具程式。 Name: e2fsprogs -Version: 1.40.6 -Release: 1 +Version: 1.41.8 +Release: 4 License: GPL v2 (with LGPL v2 and BSD parts) Group: Applications/System Source0: http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz -# Source0-md5: d219b7be4f7170400c646f5611c0b702 +# Source0-md5: 6708cc8e484809fc5cfb232882e48489 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}-no-bashism.patch -Patch3: %{name}-498381.patch +Patch2: %{name}-498381.patch +Patch3: %{name}-diet.patch +Patch4: %{name}-external-libblkid.patch +Patch5: %{name}-external-libuuid.patch URL: http://e2fsprogs.sourceforge.net/ -BuildRequires: autoconf +BuildRequires: autoconf >= 2.50 BuildRequires: automake -BuildRequires: device-mapper-devel >= 1.02.18-2 BuildRequires: gettext-devel >= 0.11 BuildRequires: rpmbuild(macros) >= 1.426 BuildRequires: texinfo +BuildRequires: texinfo-texi2dvi +BuildRequires: libblkid-devel +BuildRequires: libuuid-devel %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 +BuildRequires: libblkid-dietlibc +BuildRequires: libuuid-dietlibc + %else +BuildRequires: glibc-static + %endif + %endif %endif Requires(post,postun): /sbin/ldconfig Requires: fsck = %{version}-%{release} Requires: libcom_err = %{version}-%{release} -Requires: libuuid = %{version}-%{release} Obsoletes: e2fsprogs-evms Obsoletes: libext2fs2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -77,6 +86,15 @@ 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} + +%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 @@ -288,6 +306,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 @@ -312,9 +343,11 @@ 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} +Requires: libuuid-devel Obsoletes: libext2fs2-devel %description devel @@ -487,81 +520,13 @@ 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 -Group: Libraries -Conflicts: e2fsprogs < 1.34-3 - -%description -n libuuid -Library for accessing and manipulating UUID. - -%description -n libuuid -l pl.UTF-8 -Biblioteka umożliwiająca dostęp i zmiany UUID. - -%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 -Group: Development/Libraries -Requires: libuuid = %{version}-%{release} -Conflicts: e2fsprogs-devel < 1.34-3 - -%description -n libuuid-devel -Library for accessing and manipulating UUID - development files. - -%description -n libuuid-devel -l pl.UTF-8 -Biblioteka umożliwiająca dostęp i zmiany UUID - pliki dla -programistów. - -%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 -Group: Development/Libraries -Requires: libuuid-devel = %{version}-%{release} -Conflicts: e2fsprogs-static < 1.34-3 - -%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 -Requires: libuuid = %{version}-%{release} +%if %{without allstatic} +Requires: %{name}-libs = %{version}-%{release} +%endif %description -n fsck Check and repair a Linux file system. @@ -570,17 +535,18 @@ Check and repair a Linux file system. Sprawdzenie i naprawa linuksowego systemu plików. %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ędziae2fsck i mke2fs statycznie skonsolidowane +na potrzeby initrd. %prep %setup -q @@ -589,8 +555,8 @@ etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd. %patch1 -p1 %patch2 -p1 %patch3 -p1 - -%{__rm} debugfs/*.o +%patch4 -p1 +%patch5 -p1 sed -i -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in @@ -604,26 +570,44 @@ cp -f /usr/share/automake/config.sub . %{__autoconf} %if %{with initrd} +%if %{with dietlibc} +# needed for syscall() +cp -a MCONFIG.in MCONFIG.in.org +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-ccopts="-Os" \ - --with-ldopts="-static" \ + %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \ + %{?with_dietlibc:--with-cc="diet %{__cc}"} \ + --with-ccopts="%{rpmcflags} -Os" \ + --with-ldopts="%{rpmldflags} -static" \ --disable-elf-shlibs \ - --disable-selinux \ - --disable-nls - -%{__make} libs + --disable-libblkid \ + --disable-libuuid \ + --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 %{__make} clean +%{?with_dietlibc:mv MCONFIG.in.org MCONFIG.in} %endif %configure \ --with-root-prefix="" \ %{!?with_nls:--disable-nls} \ %{!?with_allstatic:--enable-elf-shlibs} \ - --enable-blkid-devmapper \ + --disable-libblkid \ + --disable-libuuid \ + --disable-uuidd \ --enable-compression \ --enable-htree \ --enable-fsck \ @@ -639,10 +623,9 @@ 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 - echo "install-shlibs:" >> intl/Makefile %{__make} install install-libs \ @@ -660,18 +643,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 |\ @@ -680,20 +685,24 @@ echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext3.8 %endif 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-e2fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck +install initrd-mke2fs $RPM_BUILD_ROOT%{_libdir}/initrd/mke2fs +%endif %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 -/sbin/ldconfig -[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 +%postun -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} + +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %post devel -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} @@ -704,25 +713,6 @@ 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 @@ -731,19 +721,22 @@ fi # COPYING specifies license details for some parts of package %doc COPYING 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/e2undo %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 @@ -751,38 +744,32 @@ 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 -%ghost %{_sysconfdir}/blkid.tab %{_mandir}/man1/chattr.1* %{_mandir}/man1/lsattr.1* %{_mandir}/man1/mk_cmds.1* %{_mandir}/man5/e2fsck.conf.5* %{_mandir}/man5/mke2fs.conf.5* %{_mandir}/man8/badblocks.8* -%{_mandir}/man8/blkid.8* %{_mandir}/man8/debugfs.8* %{_mandir}/man8/dumpe2fs.8* %{_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* @@ -799,6 +786,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* @@ -808,9 +797,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* @@ -821,12 +814,15 @@ 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/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* @@ -838,9 +834,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* @@ -852,37 +852,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/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}/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 @@ -910,43 +919,9 @@ 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 -%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 -%defattr(644,root,root,755) -%{_libdir}/libuuid.a - -%files -n uuidd -%defattr(644,root,root,755) -%attr(2775,uuidd,uuidd) /var/lib/libuuid -%attr(6755,uuidd,uuidd) %{_sbindir}/uuidd -%{_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* @@ -956,5 +931,6 @@ fi %if %{with initrd} %files initrd %defattr(644,root,root,755) -%attr(755,root,root) /sbin/initrd-blkid +%attr(755,root,root) %{_libdir}/initrd/e2fsck +%attr(755,root,root) %{_libdir}/initrd/mke2fs %endif