forked from pool/e2fsprogs
create e2fsprogs-mini
This patch only creates the .spec file. A link needs to also be created from filesystems:e2fsprogs-mini to filesystems:e2fsprogs. This is needed so to reduce the build dependencies on libtirpc so the new fixed version can actually get into Factory and hopefully openSUSE 13.1 - Created "-mini" version of package which doesn't build "info" and so doesn't depend on makeinfo, texinfo, and all of tex. This should allow packages in the bootstrap cycle (such as krb5-mini) to build-depends of libraries from here. - Created "-mini" version of package which doesn't build "info" and so doesn't depend on makeinfo, texinfo, and all of tex. This should allow packages in the bootstrap cycle (such as krb5-mini) to build-depends of libraries from here. - update to 1.42.8 * e2fsck: detect and fix invalid extents at leaf block tails * e2fsck: allow checking ro root fs with external journal * fix offline resizing of fs with flex_bg && !resize_inode * fix resize2fs to not leave bitmaps beyond fs end * fixed e2image for large (>32-bit) filesystems * debugfs fixes - Removed upstreamed patches: e2p-Fix-s-handling-in-parse_num_blocks2.patch resize-bigalloc_check-should-have-return-type-void.patch libext2fs-Fix-return-value-in-ext2fs_test_block_bitm.patch libext2fs-Provide-prototype-for-ext2fs_symlink.patch - Fix compilation for Fedora targets in Build Service - Fix compilation warnings by patches: e2p-Fix-s-handling-in-parse_num_blocks2.patch Rev filesystems/50 Md5 8463db4be40d0427c9bb17050f6a36e9 2013-12-10 20:59:42 jeff_mahoney 210106
This commit is contained in:
parent
ba76ccf4ec
commit
0d547b0411
1615
e2fsprogs-mini.changes
Normal file
1615
e2fsprogs-mini.changes
Normal file
File diff suppressed because it is too large
Load Diff
424
e2fsprogs-mini.spec
Normal file
424
e2fsprogs-mini.spec
Normal file
@ -0,0 +1,424 @@
|
|||||||
|
#
|
||||||
|
# spec file for package e2fsprogs-mini
|
||||||
|
#
|
||||||
|
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%define build_mini 1
|
||||||
|
|
||||||
|
Name: e2fsprogs-mini
|
||||||
|
%if 0%{?suse_version} >= 1010
|
||||||
|
# Hint for ZYPP
|
||||||
|
Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4)
|
||||||
|
%endif
|
||||||
|
BuildRequires: autoconf
|
||||||
|
BuildRequires: libblkid-devel
|
||||||
|
BuildRequires: libuuid-devel
|
||||||
|
BuildRequires: pkg-config
|
||||||
|
%if ! %{build_mini}
|
||||||
|
%if 0%{?suse_version} > 1220
|
||||||
|
BuildRequires: makeinfo
|
||||||
|
%endif
|
||||||
|
# Define info macros if missing (for Fedora builds)
|
||||||
|
%if 0%{!?%install_info_prereq:1}
|
||||||
|
%define install_info_prereq info
|
||||||
|
%define install_info sbin/install-info
|
||||||
|
%define install_info_delete sbin/install-info --delete
|
||||||
|
%endif
|
||||||
|
Requires: %install_info_prereq
|
||||||
|
%endif
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: e2fsprogs-64bit
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
Conflicts: e2fsprogs
|
||||||
|
Conflicts: e2fsprogs-devel
|
||||||
|
Conflicts: libext2fs2
|
||||||
|
Conflicts: libext2fs-devel
|
||||||
|
Conflicts: libcom_err2
|
||||||
|
Conflicts: libcom_err-devel
|
||||||
|
%else
|
||||||
|
Conflicts: e2fsprogs-mini
|
||||||
|
Conflicts: e2fsprogs-mini-devel
|
||||||
|
Conflicts: libext2fs2-mini
|
||||||
|
Conflicts: libext2fs-mini-devel
|
||||||
|
Conflicts: libcom_err2-mini
|
||||||
|
Conflicts: libcom_err-mini-devel
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
Version: 1.42.8
|
||||||
|
Release: 0
|
||||||
|
Summary: Utilities for the Second Extended File System
|
||||||
|
License: GPL-2.0
|
||||||
|
Group: System/Filesystems
|
||||||
|
Url: http://e2fsprogs.sourceforge.net
|
||||||
|
Requires: libcom_err2 >= %{version}
|
||||||
|
Requires: libext2fs2 >= %{version}
|
||||||
|
Source: http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.gz
|
||||||
|
Source2: README.SUSE
|
||||||
|
Source3: baselibs.conf
|
||||||
|
Source4: e2fsck.conf
|
||||||
|
#
|
||||||
|
# e2fsprogs patches
|
||||||
|
#
|
||||||
|
Patch1: e2fsprogs-1.41.1-splash_support.patch
|
||||||
|
# libcom_err patches
|
||||||
|
Patch2: libcom_err-compile_et_permissions.patch
|
||||||
|
Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch
|
||||||
|
Patch5: e2fsprogs-1.42-ext2fsh_implicit.patch
|
||||||
|
# Do not suppress make commands
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
|
%description
|
||||||
|
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.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Dummy development package
|
||||||
|
License: LGPL-2.0
|
||||||
|
Group: Development/Libraries/C and C++
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: e2fsprogs-devel-64bit
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
Requires: libblkid-devel
|
||||||
|
Requires: libext2fs-devel = %version
|
||||||
|
Requires: libuuid-devel
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
Dummy development package for backwards compatibility.
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%package -n libext2fs2-mini
|
||||||
|
%else
|
||||||
|
%package -n libext2fs2
|
||||||
|
%endif
|
||||||
|
Summary: Ext2fs library
|
||||||
|
License: LGPL-2.0
|
||||||
|
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
|
||||||
|
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 libcom_err2-mini
|
||||||
|
%else
|
||||||
|
%package -n libcom_err2
|
||||||
|
%endif
|
||||||
|
Summary: E2fsprogs error reporting library
|
||||||
|
License: MIT
|
||||||
|
Group: System/Filesystems
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: libcom_err-64bit
|
||||||
|
Obsoletes: libcom_err2-64bit
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
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
|
||||||
|
License: MIT
|
||||||
|
Group: Development/Libraries/C and C++
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: libcom_err-devel-64bit
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
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.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n e2fsprogs-%{version}
|
||||||
|
# e2fsprogs patches
|
||||||
|
%patch1
|
||||||
|
# libcom_err patches
|
||||||
|
%patch2 -p1
|
||||||
|
%patch4
|
||||||
|
%patch5
|
||||||
|
cp %{SOURCE2} .
|
||||||
|
|
||||||
|
%build
|
||||||
|
autoreconf --force --install
|
||||||
|
%configure \
|
||||||
|
--disable-evms \
|
||||||
|
--with-root-prefix='' \
|
||||||
|
--enable-elf-shlibs \
|
||||||
|
--disable-libblkid \
|
||||||
|
--disable-libuuid \
|
||||||
|
--disable-uuidd \
|
||||||
|
--disable-fsck \
|
||||||
|
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
|
||||||
|
make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir}
|
||||||
|
|
||||||
|
# Let boot continue even if system clock is wrong
|
||||||
|
install -p -m 644 %{SOURCE4} %{buildroot}/etc/e2fsck.conf
|
||||||
|
|
||||||
|
%{find_lang} e2fsprogs
|
||||||
|
|
||||||
|
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
|
||||||
|
rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.ext4dev
|
||||||
|
rm -f $RPM_BUILD_ROOT/%{_sbindir}/fsck.ext4dev
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8*
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8*
|
||||||
|
rm -v %{buildroot}%{_includedir}/quota/mkquota.h
|
||||||
|
rm -v %{buildroot}%{_libdir}/pkgconfig/quota.pc
|
||||||
|
|
||||||
|
# Need libext2fs.a for silo
|
||||||
|
find "%buildroot/%_libdir" -type f -name "*.a" \
|
||||||
|
%ifarch %sparc
|
||||||
|
! -name libext2fs.a \
|
||||||
|
%endif
|
||||||
|
-print -delete
|
||||||
|
#UsrMerge
|
||||||
|
mkdir %{buildroot}/sbin
|
||||||
|
ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks
|
||||||
|
ln -s %{_sbindir}/debugfs %{buildroot}/sbin/debugfs
|
||||||
|
ln -s %{_sbindir}/dumpe2fs %{buildroot}/sbin/dumpe2fs
|
||||||
|
ln -s %{_sbindir}/e2undo %{buildroot}/sbin/e2undo
|
||||||
|
ln -s %{_sbindir}/e2fsck %{buildroot}/sbin/e2fsck
|
||||||
|
ln -s %{_sbindir}/e2label %{buildroot}/sbin/e2label
|
||||||
|
ln -s %{_sbindir}/fsck.ext2 %{buildroot}/sbin/fsck.ext2
|
||||||
|
ln -s %{_sbindir}/fsck.ext3 %{buildroot}/sbin/fsck.ext3
|
||||||
|
ln -s %{_sbindir}/fsck.ext4 %{buildroot}/sbin/fsck.ext4
|
||||||
|
ln -s %{_sbindir}/mke2fs %{buildroot}/sbin/mke2fs
|
||||||
|
ln -s %{_sbindir}/mkfs.ext2 %{buildroot}/sbin/mkfs.ext2
|
||||||
|
ln -s %{_sbindir}/mkfs.ext3 %{buildroot}/sbin/mkfs.ext3
|
||||||
|
ln -s %{_sbindir}/mkfs.ext4 %{buildroot}/sbin/mkfs.ext4
|
||||||
|
ln -s %{_sbindir}/resize2fs %{buildroot}/sbin/resize2fs
|
||||||
|
ln -s %{_sbindir}/tune2fs %{buildroot}/sbin/tune2fs
|
||||||
|
ln -s %{_sbindir}/e2image %{buildroot}/sbin/e2image
|
||||||
|
ln -s %{_sbindir}/logsave %{buildroot}/sbin/logsave
|
||||||
|
mkdir %{buildroot}/%{_lib}
|
||||||
|
pushd %{buildroot}/%{_libdir}
|
||||||
|
LIBNAMES=$(ls *.so.*)
|
||||||
|
popd
|
||||||
|
for libName in $LIBNAMES;
|
||||||
|
do ln -s %{_libdir}/$libName %{buildroot}/%{_lib};
|
||||||
|
done
|
||||||
|
#EndUsrMerge
|
||||||
|
%post
|
||||||
|
/sbin/ldconfig
|
||||||
|
%if ! %{build_mini}
|
||||||
|
%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%postun
|
||||||
|
/sbin/ldconfig
|
||||||
|
%if ! %{build_mini}
|
||||||
|
%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
||||||
|
%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)
|
||||||
|
%doc RELEASE-NOTES README
|
||||||
|
%config /etc/e2fsck.conf
|
||||||
|
%config /etc/mke2fs.conf
|
||||||
|
#UsrMerge
|
||||||
|
/sbin/badblocks
|
||||||
|
/sbin/debugfs
|
||||||
|
/sbin/dumpe2fs
|
||||||
|
/sbin/e2undo
|
||||||
|
/sbin/e2fsck
|
||||||
|
/sbin/e2label
|
||||||
|
/sbin/fsck.ext2
|
||||||
|
/sbin/fsck.ext3
|
||||||
|
/sbin/fsck.ext4
|
||||||
|
/sbin/mke2fs
|
||||||
|
/sbin/mkfs.ext2
|
||||||
|
/sbin/mkfs.ext3
|
||||||
|
/sbin/mkfs.ext4
|
||||||
|
/sbin/resize2fs
|
||||||
|
/sbin/tune2fs
|
||||||
|
/sbin/e2image
|
||||||
|
/sbin/logsave
|
||||||
|
#EndUsrMerge
|
||||||
|
%{_sbindir}/badblocks
|
||||||
|
%{_sbindir}/debugfs
|
||||||
|
%{_sbindir}/dumpe2fs
|
||||||
|
%{_sbindir}/e2undo
|
||||||
|
%{_sbindir}/e2fsck
|
||||||
|
%{_sbindir}/e2label
|
||||||
|
%{_sbindir}/fsck.ext2
|
||||||
|
%{_sbindir}/fsck.ext3
|
||||||
|
%{_sbindir}/fsck.ext4
|
||||||
|
%{_sbindir}/mke2fs
|
||||||
|
%{_sbindir}/mkfs.ext2
|
||||||
|
%{_sbindir}/mkfs.ext3
|
||||||
|
%{_sbindir}/mkfs.ext4
|
||||||
|
%{_sbindir}/resize2fs
|
||||||
|
%{_sbindir}/tune2fs
|
||||||
|
%{_sbindir}/e2image
|
||||||
|
%{_sbindir}/logsave
|
||||||
|
%{_bindir}/chattr
|
||||||
|
%{_bindir}/lsattr
|
||||||
|
%{_sbindir}/mklost+found
|
||||||
|
%{_sbindir}/filefrag
|
||||||
|
%{_sbindir}/e2freefrag
|
||||||
|
%{_sbindir}/e4defrag
|
||||||
|
%if ! %{build_mini}
|
||||||
|
%{_infodir}/libext2fs.info.gz
|
||||||
|
%endif
|
||||||
|
%{_mandir}/man1/chattr.1.gz
|
||||||
|
%{_mandir}/man1/lsattr.1.gz
|
||||||
|
%{_mandir}/man5/e2fsck.conf.5.gz
|
||||||
|
%{_mandir}/man5/mke2fs.conf.5.gz
|
||||||
|
%{_mandir}/man8/*.8.gz
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%doc README.SUSE
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%files -n libext2fs2-mini
|
||||||
|
%else
|
||||||
|
%files -n libext2fs2
|
||||||
|
%endif
|
||||||
|
%defattr(-, root, root)
|
||||||
|
#UsrMerge
|
||||||
|
/%{_lib}/libext2fs.so.*
|
||||||
|
/%{_lib}/libe2p.so.*
|
||||||
|
#EndUsrMerge
|
||||||
|
%{_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
|
||||||
|
%ifarch %sparc
|
||||||
|
%{_libdir}/libext2fs.a
|
||||||
|
%endif
|
||||||
|
%{_libdir}/libe2p.so
|
||||||
|
/usr/include/ext2fs
|
||||||
|
/usr/include/e2p
|
||||||
|
%_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)
|
||||||
|
#UsrMerge
|
||||||
|
/%{_lib}/libcom_err.so.*
|
||||||
|
/%{_lib}/libss.so.*
|
||||||
|
#EndUsrMerge
|
||||||
|
%{_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
|
||||||
|
%{_libdir}/libcom_err.so
|
||||||
|
%{_libdir}/libss.so
|
||||||
|
%_libdir/pkgconfig/com_err.pc
|
||||||
|
%_libdir/pkgconfig/ss.pc
|
||||||
|
%_includedir/com_err.h
|
||||||
|
%_includedir/et
|
||||||
|
%_includedir/ss
|
||||||
|
%_datadir/et
|
||||||
|
%_datadir/ss
|
||||||
|
%{_mandir}/man1/compile_et.1.gz
|
||||||
|
%{_mandir}/man1/mk_cmds.1.gz
|
||||||
|
%{_mandir}/man3/com_err.3.gz
|
||||||
|
|
||||||
|
%changelog
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 10 00:45:47 UTC 2013 - nfbrown@suse.com
|
||||||
|
|
||||||
|
- Created "-mini" version of package which doesn't
|
||||||
|
build "info" and so doesn't depend on makeinfo,
|
||||||
|
texinfo, and all of tex. This should allow packages
|
||||||
|
in the bootstrap cycle (such as krb5-mini) to
|
||||||
|
build-depends of libraries from here.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jun 27 10:54:12 UTC 2013 - jack@suse.cz
|
Thu Jun 27 10:54:12 UTC 2013 - jack@suse.cz
|
||||||
|
|
||||||
|
@ -16,6 +16,8 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%define build_mini 0
|
||||||
|
|
||||||
Name: e2fsprogs
|
Name: e2fsprogs
|
||||||
%if 0%{?suse_version} >= 1010
|
%if 0%{?suse_version} >= 1010
|
||||||
# Hint for ZYPP
|
# Hint for ZYPP
|
||||||
@ -25,6 +27,7 @@ BuildRequires: autoconf
|
|||||||
BuildRequires: libblkid-devel
|
BuildRequires: libblkid-devel
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: libuuid-devel
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkg-config
|
||||||
|
%if ! %{build_mini}
|
||||||
%if 0%{?suse_version} > 1220
|
%if 0%{?suse_version} > 1220
|
||||||
BuildRequires: makeinfo
|
BuildRequires: makeinfo
|
||||||
%endif
|
%endif
|
||||||
@ -35,10 +38,27 @@ BuildRequires: makeinfo
|
|||||||
%define install_info_delete sbin/install-info --delete
|
%define install_info_delete sbin/install-info --delete
|
||||||
%endif
|
%endif
|
||||||
Requires: %install_info_prereq
|
Requires: %install_info_prereq
|
||||||
|
%endif
|
||||||
# bug437293
|
# bug437293
|
||||||
%ifarch ppc64
|
%ifarch ppc64
|
||||||
Obsoletes: e2fsprogs-64bit
|
Obsoletes: e2fsprogs-64bit
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
Conflicts: e2fsprogs
|
||||||
|
Conflicts: e2fsprogs-devel
|
||||||
|
Conflicts: libext2fs2
|
||||||
|
Conflicts: libext2fs-devel
|
||||||
|
Conflicts: libcom_err2
|
||||||
|
Conflicts: libcom_err-devel
|
||||||
|
%else
|
||||||
|
Conflicts: e2fsprogs-mini
|
||||||
|
Conflicts: e2fsprogs-mini-devel
|
||||||
|
Conflicts: libext2fs2-mini
|
||||||
|
Conflicts: libext2fs-mini-devel
|
||||||
|
Conflicts: libcom_err2-mini
|
||||||
|
Conflicts: libcom_err-mini-devel
|
||||||
|
%endif
|
||||||
#
|
#
|
||||||
Version: 1.42.8
|
Version: 1.42.8
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -84,25 +104,45 @@ Requires: libuuid-devel
|
|||||||
%description devel
|
%description devel
|
||||||
Dummy development package for backwards compatibility.
|
Dummy development package for backwards compatibility.
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%package -n libext2fs2-mini
|
||||||
|
%else
|
||||||
%package -n libext2fs2
|
%package -n libext2fs2
|
||||||
|
%endif
|
||||||
Summary: Ext2fs library
|
Summary: Ext2fs library
|
||||||
License: LGPL-2.0
|
License: LGPL-2.0
|
||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%description -n libext2fs2-mini
|
||||||
|
%else
|
||||||
%description -n libext2fs2
|
%description -n libext2fs2
|
||||||
|
%endif
|
||||||
The basic Ext2fs shared library.
|
The basic Ext2fs shared library.
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%package -n libext2fs-mini-devel
|
||||||
|
%else
|
||||||
%package -n libext2fs-devel
|
%package -n libext2fs-devel
|
||||||
|
%endif
|
||||||
Summary: Development files for libext2fs
|
Summary: Development files for libext2fs
|
||||||
License: LGPL-2.0
|
License: LGPL-2.0
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires: libcom_err-devel
|
Requires: libcom_err-devel
|
||||||
Requires: libext2fs2 = %version
|
Requires: libext2fs2 = %version
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%description -n libext2fs-mini-devel
|
||||||
|
%else
|
||||||
%description -n libext2fs-devel
|
%description -n libext2fs-devel
|
||||||
|
%endif
|
||||||
Development files for libext2fs.
|
Development files for libext2fs.
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%package -n libcom_err2-mini
|
||||||
|
%else
|
||||||
%package -n libcom_err2
|
%package -n libcom_err2
|
||||||
|
%endif
|
||||||
Summary: E2fsprogs error reporting library
|
Summary: E2fsprogs error reporting library
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
@ -115,10 +155,18 @@ Obsoletes: libcom_err2-64bit
|
|||||||
Provides: libcom_err = %{version}
|
Provides: libcom_err = %{version}
|
||||||
Obsoletes: libcom_err <= 1.40
|
Obsoletes: libcom_err <= 1.40
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%description -n libcom_err2-mini
|
||||||
|
%else
|
||||||
%description -n libcom_err2
|
%description -n libcom_err2
|
||||||
|
%endif
|
||||||
com_err is an error message display library.
|
com_err is an error message display library.
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%package -n libcom_err-mini-devel
|
||||||
|
%else
|
||||||
%package -n libcom_err-devel
|
%package -n libcom_err-devel
|
||||||
|
%endif
|
||||||
Summary: Development files for libcom_err
|
Summary: Development files for libcom_err
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
@ -130,11 +178,15 @@ Obsoletes: libcom_err-devel-64bit
|
|||||||
Requires: glibc-devel
|
Requires: glibc-devel
|
||||||
Requires: libcom_err2 = %version
|
Requires: libcom_err2 = %version
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%description -n libcom_err-mini-devel
|
||||||
|
%else
|
||||||
%description -n libcom_err-devel
|
%description -n libcom_err-devel
|
||||||
|
%endif
|
||||||
Development files for the com_err error message display library.
|
Development files for the com_err error message display library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q -n e2fsprogs-%{version}
|
||||||
# e2fsprogs patches
|
# e2fsprogs patches
|
||||||
%patch1
|
%patch1
|
||||||
# libcom_err patches
|
# libcom_err patches
|
||||||
@ -154,6 +206,9 @@ autoreconf --force --install
|
|||||||
--disable-uuidd \
|
--disable-uuidd \
|
||||||
--disable-fsck \
|
--disable-fsck \
|
||||||
CFLAGS="$RPM_OPT_FLAGS"
|
CFLAGS="$RPM_OPT_FLAGS"
|
||||||
|
%if %{build_mini}
|
||||||
|
rm -rf doc
|
||||||
|
%endif
|
||||||
make %{?_smp_mflags} V=1
|
make %{?_smp_mflags} V=1
|
||||||
#Guarantee that tranlations match the source messages
|
#Guarantee that tranlations match the source messages
|
||||||
make -C po update-po
|
make -C po update-po
|
||||||
@ -164,7 +219,7 @@ make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir}
|
|||||||
# Let boot continue even if system clock is wrong
|
# Let boot continue even if system clock is wrong
|
||||||
install -p -m 644 %{SOURCE4} %{buildroot}/etc/e2fsck.conf
|
install -p -m 644 %{SOURCE4} %{buildroot}/etc/e2fsck.conf
|
||||||
|
|
||||||
%{find_lang} %{name}
|
%{find_lang} e2fsprogs
|
||||||
|
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
|
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
|
||||||
rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.ext4dev
|
rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.ext4dev
|
||||||
@ -209,21 +264,41 @@ done
|
|||||||
#EndUsrMerge
|
#EndUsrMerge
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
%if ! %{build_mini}
|
||||||
%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
||||||
|
%endif
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
%if ! %{build_mini}
|
||||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%post -n libext2fs2-mini -p /sbin/ldconfig
|
||||||
|
%else
|
||||||
%post -n libext2fs2 -p /sbin/ldconfig
|
%post -n libext2fs2 -p /sbin/ldconfig
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%postun -n libext2fs2-mini -p /sbin/ldconfig
|
||||||
|
%else
|
||||||
%postun -n libext2fs2 -p /sbin/ldconfig
|
%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
|
%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
|
%postun -n libcom_err2 -p /sbin/ldconfig
|
||||||
|
%endif
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f e2fsprogs.lang
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%doc RELEASE-NOTES README
|
%doc RELEASE-NOTES README
|
||||||
%config /etc/e2fsck.conf
|
%config /etc/e2fsck.conf
|
||||||
@ -270,7 +345,9 @@ done
|
|||||||
%{_sbindir}/filefrag
|
%{_sbindir}/filefrag
|
||||||
%{_sbindir}/e2freefrag
|
%{_sbindir}/e2freefrag
|
||||||
%{_sbindir}/e4defrag
|
%{_sbindir}/e4defrag
|
||||||
|
%if ! %{build_mini}
|
||||||
%{_infodir}/libext2fs.info.gz
|
%{_infodir}/libext2fs.info.gz
|
||||||
|
%endif
|
||||||
%{_mandir}/man1/chattr.1.gz
|
%{_mandir}/man1/chattr.1.gz
|
||||||
%{_mandir}/man1/lsattr.1.gz
|
%{_mandir}/man1/lsattr.1.gz
|
||||||
%{_mandir}/man5/e2fsck.conf.5.gz
|
%{_mandir}/man5/e2fsck.conf.5.gz
|
||||||
@ -281,7 +358,11 @@ done
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc README.SUSE
|
%doc README.SUSE
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%files -n libext2fs2-mini
|
||||||
|
%else
|
||||||
%files -n libext2fs2
|
%files -n libext2fs2
|
||||||
|
%endif
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
#UsrMerge
|
#UsrMerge
|
||||||
/%{_lib}/libext2fs.so.*
|
/%{_lib}/libext2fs.so.*
|
||||||
@ -290,7 +371,11 @@ done
|
|||||||
%{_libdir}/libext2fs.so.*
|
%{_libdir}/libext2fs.so.*
|
||||||
%{_libdir}/libe2p.so.*
|
%{_libdir}/libe2p.so.*
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%files -n libext2fs-mini-devel
|
||||||
|
%else
|
||||||
%files -n libext2fs-devel
|
%files -n libext2fs-devel
|
||||||
|
%endif
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%{_libdir}/libext2fs.so
|
%{_libdir}/libext2fs.so
|
||||||
%ifarch %sparc
|
%ifarch %sparc
|
||||||
@ -302,7 +387,11 @@ done
|
|||||||
%_libdir/pkgconfig/e2p.pc
|
%_libdir/pkgconfig/e2p.pc
|
||||||
%_libdir/pkgconfig/ext2fs.pc
|
%_libdir/pkgconfig/ext2fs.pc
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%files -n libcom_err2-mini
|
||||||
|
%else
|
||||||
%files -n libcom_err2
|
%files -n libcom_err2
|
||||||
|
%endif
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
#UsrMerge
|
#UsrMerge
|
||||||
/%{_lib}/libcom_err.so.*
|
/%{_lib}/libcom_err.so.*
|
||||||
@ -311,7 +400,11 @@ done
|
|||||||
%{_libdir}/libcom_err.so.*
|
%{_libdir}/libcom_err.so.*
|
||||||
%{_libdir}/libss.so.*
|
%{_libdir}/libss.so.*
|
||||||
|
|
||||||
|
%if %{build_mini}
|
||||||
|
%files -n libcom_err-mini-devel
|
||||||
|
%else
|
||||||
%files -n libcom_err-devel
|
%files -n libcom_err-devel
|
||||||
|
%endif
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%_bindir/compile_et
|
%_bindir/compile_et
|
||||||
%_bindir/mk_cmds
|
%_bindir/mk_cmds
|
||||||
|
6
pre_checkin.sh
Normal file
6
pre_checkin.sh
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
sed -e 's/Name:.*/Name: e2fsprogs-mini/' \
|
||||||
|
-e 's/spec file for package.*/&-mini/' \
|
||||||
|
-e 's/%define.*build_mini.*/%define build_mini 1/' e2fsprogs.spec > e2fsprogs-mini.spec
|
||||||
|
cp e2fsprogs.changes e2fsprogs-mini.changes
|
||||||
|
|
Loading…
Reference in New Issue
Block a user