This commit is contained in:
parent
1f91c9d49e
commit
88bf84a062
@ -1,12 +0,0 @@
|
||||
--- config/parse-types.sh
|
||||
+++ config/parse-types.sh
|
||||
@@ -22,6 +22,9 @@
|
||||
cp asm_types.h asm_types.c
|
||||
|
||||
cat >> asm_types.c <<EOF
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
#ifdef __U8_TYPEDEF
|
3
e2fsprogs-1.40.1.tar.bz2
Normal file
3
e2fsprogs-1.40.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4f1564d2832a292f0053ae654e2262515c1dfe1196fb839e14c4de4734c781a4
|
||||
size 3559536
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:46d1fb8e2b6ed5f078923e6f659ff69b34db720a0a929d5864e3b9e535bcd0a3
|
||||
size 3718339
|
@ -1060,7 +1060,7 @@ Index: misc/Makefile.in
|
||||
===================================================================
|
||||
--- misc/Makefile.in.orig
|
||||
+++ misc/Makefile.in
|
||||
@@ -67,245 +67,200 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
|
||||
@@ -67,174 +67,134 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
|
||||
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
|
||||
|
||||
.c.o:
|
||||
@ -1076,6 +1076,10 @@ Index: misc/Makefile.in
|
||||
- @$(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
|
||||
+ $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
|
||||
|
||||
default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk
|
||||
- @echo " PROFILE_TO_C mke2fs.conf"
|
||||
$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
|
||||
> default_profile.c
|
||||
profile.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
|
||||
@ -1270,98 +1274,6 @@ Index: misc/Makefile.in
|
||||
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
|
||||
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
|
||||
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
|
||||
$(DESTDIR)$(libdir) $(DESTDIR)/etc
|
||||
|
||||
install: all $(SMANPAGES) $(UMANPAGES) installdirs
|
||||
- @for i in $(SPROGS); do \
|
||||
+ for i in $(SPROGS); do \
|
||||
echo " INSTALL $(root_sbindir)/$$i"; \
|
||||
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
|
||||
done
|
||||
- @for i in $(USPROGS); do \
|
||||
+ for i in $(USPROGS); do \
|
||||
echo " INSTALL $(sbindir)/$$i"; \
|
||||
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
|
||||
done
|
||||
- @echo " LINK $(root_sbindir)/mkfs.ext2"
|
||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
|
||||
+ $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
|
||||
$(DESTDIR)$(root_sbindir)/mkfs.ext2
|
||||
- @echo " LINK $(root_sbindir)/mkfs.ext3"
|
||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
|
||||
+ $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
|
||||
$(DESTDIR)$(root_sbindir)/mkfs.ext3
|
||||
- @echo " LINK $(root_sbindir)/e2label"
|
||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
|
||||
+ $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
|
||||
$(DESTDIR)$(root_sbindir)/e2label
|
||||
- @echo " LINK $(root_sbindir)/findfs"
|
||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
|
||||
+ $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
|
||||
$(DESTDIR)$(root_sbindir)/findfs
|
||||
- @for i in $(UPROGS); do \
|
||||
+ for i in $(UPROGS); do \
|
||||
echo " INSTALL $(bindir)/$$i"; \
|
||||
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
|
||||
done
|
||||
- @for i in $(LPROGS); do \
|
||||
+ for i in $(LPROGS); do \
|
||||
echo " INSTALL $(libdir)/$$i"; \
|
||||
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(libdir)/$$i; \
|
||||
done
|
||||
- @for i in $(SMANPAGES); do \
|
||||
+ for i in $(SMANPAGES); do \
|
||||
for j in $(COMPRESS_EXT); do \
|
||||
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
|
||||
done; \
|
||||
echo " INSTALL_DATA $(man8dir)/$$i"; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
|
||||
done
|
||||
- @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
|
||||
+ $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
|
||||
$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
|
||||
- @echo " LINK mkfs.ext2.8"
|
||||
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
|
||||
+ $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
|
||||
$(DESTDIR)$(man8dir)/mkfs.ext2.8
|
||||
- @echo " LINK mkfs.ext3.8"
|
||||
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
|
||||
+ $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
|
||||
$(DESTDIR)$(man8dir)/mkfs.ext3.8
|
||||
- @for i in $(UMANPAGES); do \
|
||||
+ for i in $(UMANPAGES); do \
|
||||
for j in $(COMPRESS_EXT); do \
|
||||
$(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
|
||||
done; \
|
||||
echo " INSTALL_DATA $(man1dir)/$$i"; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
|
||||
done
|
||||
- @for i in $(FMANPAGES); do \
|
||||
+ for i in $(FMANPAGES); do \
|
||||
for j in $(COMPRESS_EXT); do \
|
||||
$(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
|
||||
done; \
|
||||
echo " INSTALL_DATA $(man5dir)/$$i"; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
|
||||
done
|
||||
- @if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
|
||||
+ if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
|
||||
echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
|
||||
$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
|
||||
$(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
|
||||
fi
|
||||
|
||||
install-strip: install
|
||||
- @for i in $(SPROGS); do \
|
||||
+ for i in $(SPROGS); do \
|
||||
echo " STRIP $(root_sbindir)/$$i"; \
|
||||
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
|
||||
done
|
||||
- @for i in $(USPROGS); do \
|
||||
+ for i in $(USPROGS); do \
|
||||
echo " STRIP $(sbindir)/$$i"; \
|
||||
$(STRIP) $(DESTDIR)$(sbindir)/$$i; \
|
||||
done
|
||||
Index: resize/Makefile.in
|
||||
===================================================================
|
||||
--- resize/Makefile.in.orig
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 9 12:52:41 CEST 2007 - mkoenig@suse.de
|
||||
|
||||
- update to version 1.40.1:
|
||||
* Bugfix release
|
||||
- removed patch (merged upstream)
|
||||
e2fsprogs-1.39-cleanup.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 4 19:02:51 CEST 2007 - mkoenig@suse.de
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package e2fsprogs (Version 1.40)
|
||||
# spec file for package e2fsprogs (Version 1.40.1)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -15,13 +15,11 @@ Name: e2fsprogs
|
||||
BuildRequires: libvolume_id-devel
|
||||
License: GPL v2 or later
|
||||
Group: System/Filesystems
|
||||
Provides: e2fsbn ext2fs
|
||||
Supplements: filesystem(ext2) filesystem(ext3)
|
||||
Obsoletes: ext2fs
|
||||
PreReq: %install_info_prereq
|
||||
Autoreqprov: on
|
||||
Version: 1.40
|
||||
Release: 2
|
||||
Version: 1.40.1
|
||||
Release: 1
|
||||
Summary: Utilities for the Second Extended File System
|
||||
URL: http://e2fsprogs.sourceforge.net
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
@ -40,7 +38,6 @@ Patch10: close.patch
|
||||
Patch11: fsck-ignore-mounted.patch
|
||||
Patch12: e2fsprogs-mkinstalldirs.patch
|
||||
Patch13: e2fsprogs-special_make_targets.patch
|
||||
Patch14: e2fsprogs-1.39-cleanup.patch
|
||||
Patch15: e2fsprogs-1.39-uuid_duplicates.patch
|
||||
Patch16: e2fsprogs-1.39-resize2fs_manpage.patch
|
||||
Patch17: e2fsprogs-strncat.patch
|
||||
@ -227,7 +224,6 @@ Authors:
|
||||
%patch10 -p1
|
||||
%patch11
|
||||
%patch12
|
||||
%patch14
|
||||
%patch15 -p1
|
||||
%patch16
|
||||
%patch17 -p1
|
||||
@ -309,7 +305,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-, root, root)
|
||||
%doc RELEASE-NOTES ChangeLog README doc/libblkid.txt
|
||||
%doc RELEASE-NOTES README doc/libblkid.txt
|
||||
%config /etc/mke2fs.conf
|
||||
/sbin/badblocks
|
||||
/sbin/debugfs
|
||||
@ -414,6 +410,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man3/com_err.3.gz
|
||||
|
||||
%changelog
|
||||
* Mon Jul 09 2007 - mkoenig@suse.de
|
||||
- update to version 1.40.1:
|
||||
* Bugfix release
|
||||
- removed patch (merged upstream)
|
||||
e2fsprogs-1.39-cleanup.patch
|
||||
* Wed Jul 04 2007 - mkoenig@suse.de
|
||||
- update to version 1.40
|
||||
- branch off libraries:
|
||||
|
Loading…
Reference in New Issue
Block a user