mirror of
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
synced 2024-11-24 02:25:03 +08:00
Makefile.in, .del-e2fsprogs-1.11.spec~42cd069e, resize2fs.h:
Fix up for release
This commit is contained in:
Theodore Ts'o
parent
e22d4616ef
commit
8e74e66983
@ -95,9 +95,10 @@ SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
|
||||
TAR=tar
|
||||
|
||||
$(top_srcdir)/.exclude-file:
|
||||
a=$(SRCROOT); \
|
||||
(cd $(top_srcdir)/.. ; find e2fsprogs \( -name \*~ -o -name \*.orig \
|
||||
-o -name CVS -o -name \*.rej \) -print \
|
||||
> .exclude-file)
|
||||
-o -name CVS -o -name \*.rej \) -print) \
|
||||
| sed -e "s/e2fsprogs/$$a/" > $(top_srcdir)/.exclude-file
|
||||
echo "$(SRCROOT)/build" >> $(top_srcdir)/.exclude-file
|
||||
echo "$(SRCROOT)/rpm.log" >> $(top_srcdir)/.exclude-file
|
||||
echo "$(SRCROOT)/.exclude-file" >> $(top_srcdir)/.exclude-file
|
||||
@ -111,9 +112,32 @@ source_tar_file: $(top_srcdir)/.exclude-file
|
||||
gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz)
|
||||
rm -f $(top_srcdir)/.exclude-file
|
||||
|
||||
|
||||
# +++ Dependency line eater +++
|
||||
#
|
||||
# Makefile dependencies follow. This must be the last section in
|
||||
# the Makefile.in file
|
||||
#
|
||||
extent.o: $(srcdir)/extent.c $(srcdir)/resize2fs.h \
|
||||
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/bitops.h
|
||||
ext2_block_move.o: $(srcdir)/ext2_block_move.c $(srcdir)/resize2fs.h \
|
||||
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/bitops.h
|
||||
ext2_inode_move.o: $(srcdir)/ext2_inode_move.c $(srcdir)/resize2fs.h \
|
||||
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/bitops.h
|
||||
resize2fs.o: $(srcdir)/resize2fs.c $(srcdir)/resize2fs.h \
|
||||
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/bitops.h
|
||||
main.o: $(srcdir)/main.c $(srcdir)/resize2fs.h \
|
||||
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/bitops.h
|
||||
sim_progress.o: $(srcdir)/sim_progress.c $(srcdir)/resize2fs.h \
|
||||
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
|
||||
$(top_srcdir)/lib/ext2fs/bitops.h
|
||||
|
||||
106
resize/e2fsprogs-1.11.spec
Normal file
106
resize/e2fsprogs-1.11.spec
Normal file
@ -0,0 +1,106 @@
|
||||
Summary: Tools for the second extended (ext2) filesystem
|
||||
Name: e2fsprogs
|
||||
Version: 1.11
|
||||
Release: 0
|
||||
Copyright: GPL
|
||||
Group: Utilities/System
|
||||
Source: tsx-11.mit.edu:/pub/linux/packages/ext2fs/e2fsprogs-1.11.tar.gz
|
||||
BuildRoot: /tmp/e2fsprogs-root
|
||||
|
||||
%description
|
||||
This package includes a number of utilities for creating, checking,
|
||||
and repairing ext2 filesystems.
|
||||
|
||||
%package devel
|
||||
Summary: e2fs static libs and headers
|
||||
Group: Development/Libraries
|
||||
|
||||
%description devel
|
||||
Libraries and header files needed to develop ext2 filesystem-specific
|
||||
programs.
|
||||
|
||||
%package -n resize2fs
|
||||
Summary: ext2 filesystem resizer
|
||||
Group: Utilities/System
|
||||
Requires: e2fsprogs
|
||||
|
||||
%description -n resize2fs
|
||||
This program will allow you to enlarge or shrink an ext2 filesystem.
|
||||
|
||||
%prep
|
||||
%setup
|
||||
|
||||
%build
|
||||
CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-elf-shlibs
|
||||
|
||||
make libs progs docs
|
||||
|
||||
%install
|
||||
export PATH=/sbin:$PATH
|
||||
make install DESTDIR="$RPM_BUILD_ROOT"
|
||||
make install-libs DESTDIR="$RPM_BUILD_ROOT"
|
||||
|
||||
mv $RPM_BUILD_ROOT/usr/sbin/debugfs $RPM_BUILD_ROOT/sbin/debugfs
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%attr(-, root, root) %doc README RELEASE-NOTES
|
||||
%attr(-, root, root) /sbin/e2fsck
|
||||
%attr(-, root, root) /sbin/fsck.ext2
|
||||
%attr(-, root, root) /sbin/debugfs
|
||||
%attr(-, root, root) /sbin/mke2fs
|
||||
%attr(-, root, root) /sbin/badblocks
|
||||
%attr(-, root, root) /sbin/tune2fs
|
||||
%attr(-, root, root) /sbin/dumpe2fs
|
||||
%attr(-, root, root) /sbin/fsck
|
||||
%attr(-, root, root) /usr/sbin/mklost+found
|
||||
%attr(-, root, root) /sbin/mkfs.ext2
|
||||
|
||||
%attr(-, root, root) /lib/libe2p.so.2.3
|
||||
%attr(-, root, root) /lib/libext2fs.so.2.3
|
||||
%attr(-, root, root) /lib/libss.so.2.0
|
||||
%attr(-, root, root) /lib/libcom_err.so.2.0
|
||||
%attr(-, root, root) /lib/libuuid.so.1.1
|
||||
|
||||
%attr(-, root, root) /usr/bin/chattr
|
||||
%attr(-, root, root) /usr/bin/lsattr
|
||||
%attr(-, root, root) /usr/man/man8/e2fsck.8
|
||||
%attr(-, root, root) /usr/man/man8/debugfs.8
|
||||
%attr(-, root, root) /usr/man/man8/tune2fs.8
|
||||
%attr(-, root, root) /usr/man/man8/mklost+found.8
|
||||
%attr(-, root, root) /usr/man/man8/mke2fs.8
|
||||
%attr(-, root, root) /usr/man/man8/dumpe2fs.8
|
||||
%attr(-, root, root) /usr/man/man8/badblocks.8
|
||||
%attr(-, root, root) /usr/man/man8/fsck.8
|
||||
%attr(-, root, root) /usr/man/man1/chattr.1
|
||||
%attr(-, root, root) /usr/man/man1/lsattr.1
|
||||
|
||||
%files devel
|
||||
%attr(-, root, root) /usr/info/libext2fs.info*
|
||||
%attr(-, root, root) /usr/lib/libe2p.a
|
||||
%attr(-, root, root) /usr/lib/libext2fs.a
|
||||
%attr(-, root, root) /usr/lib/libss.a
|
||||
%attr(-, root, root) /usr/lib/libcom_err.a
|
||||
%attr(-, root, root) /usr/lib/libuuid.a
|
||||
%attr(-, root, root) /usr/include/ss
|
||||
%attr(-, root, root) /usr/include/ext2fs
|
||||
%attr(-, root, root) /usr/include/et
|
||||
%attr(-, root, root) /usr/include/uuid
|
||||
%attr(-, root, root) /usr/lib/libe2p.so
|
||||
%attr(-, root, root) /usr/lib/libext2fs.so
|
||||
%attr(-, root, root) /usr/lib/libss.so
|
||||
%attr(-, root, root) /usr/lib/libcom_err.so
|
||||
%attr(-, root, root) /usr/lib/libuuid.so
|
||||
|
||||
%files -n resize2fs
|
||||
%attr(-, root, root) /usr/man/man8/resize2fs.8
|
||||
%attr(-, root, root) /usr/sbin/resize2fs
|
||||
|
||||
@ -21,8 +21,6 @@
|
||||
#include <linux/ext2_fs.h>
|
||||
|
||||
#include "ext2fs/ext2fs.h"
|
||||
#include "ext2fs/brel.h"
|
||||
#include "banalysis.h"
|
||||
|
||||
#ifdef __STDC__
|
||||
#define NOARGS void
|
||||
|
||||
Loading…
Reference in New Issue
Block a user