+++ /dev/null
---- Makefile.orig Wed Aug 30 16:23:04 1995
-+++ Makefile Wed Aug 30 17:14:23 1995
-@@ -24,9 +24,9 @@
- # required ncurses and readline include files / libraries. Be sure that you
- # don't mix two two versions of ncurses.
-
--# NCURSES_INCLUDE = -I/usr/local/include -I/usr/local/include/ncurses
--# NCURSES_LIB = -L/usr/local/lib
--# READLINE_INCLUDE = -I/usr/include -I/usr/include/readline
-+NCURSES_INCLUDE = -I/usr/include/ncurses
-+# NCURSES_LIB = -L/usr//lib
-+READLINE_INCLUDE = -I/usr/include/readline
- # READLINE_LIB = -L/usr/lib
-
- # ------------------------------------------------------------------------
-@@ -65,11 +65,12 @@
-
- install: ext2ed
- install -d $(VAR_DIR)
-- install -d $(DOC_DIR)
- install -m 755 ext2ed $(BIN_DIR)
- install -m 644 ext2.descriptors $(VAR_DIR)
- install -m 644 ext2ed.conf $(VAR_DIR)
- install -m 644 doc/ext2ed.8 $(MAN_DIR)
-+
-+install.doc:
- install -m 644 doc/user-guide-0.1.sgml $(DOC_DIR)
- install -m 644 doc/user-guide-0.1.ps $(DOC_DIR)
- install -m 644 doc/Ext2fs-overview-0.1.sgml $(DOC_DIR)
+++ /dev/null
---- ext2ed-0.1/init.c.glibc Thu Aug 24 17:26:39 1995
-+++ ext2ed-0.1/init.c Wed Apr 15 18:47:41 1998
-@@ -427,9 +427,9 @@
- void init_signals (void)
-
- {
-- signal (SIGWINCH,(SignalHandler) signal_SIGWINCH_handler); /* Catch SIGWINCH */
-- signal (SIGTERM,(SignalHandler) signal_SIGTERM_handler);
-- signal (SIGSEGV,(SignalHandler) signal_SIGSEGV_handler);
-+ signal (SIGWINCH,(void *) signal_SIGWINCH_handler); /* Catch SIGWINCH */
-+ signal (SIGTERM,(void *) signal_SIGTERM_handler);
-+ signal (SIGSEGV,(void *) signal_SIGSEGV_handler);
-
- }
-
---- ext2ed-0.1/ext2ed.h.compat21 Tue Dec 22 12:37:16 1998
-+++ ext2ed-0.1/ext2ed.h Tue Dec 22 12:37:50 1998
-@@ -35,7 +35,7 @@
- #define DEBUG /* Activate self-sanity checks */
-
- #include <linux/ext2_fs.h> /* Main kernel ext2 include file */
--#include <linux/stat.h>
-+#include <sys/stat.h>
-
- #ifdef OLD_NCURSES /* The ncurses interface */
- #include <ncurses/ncurses.h>
-@@ -435,4 +435,4 @@
- extern void redraw_all (void);
- extern void close_windows (void);
-
--#endif /* EXT2ED_EDITOR_H */
-\ No newline at end of file
-+#endif /* EXT2ED_EDITOR_H */
+++ /dev/null
---- ext2ed-0.1/inode_com.c.ewt Thu Jul 4 12:05:29 1996
-+++ ext2ed-0.1/inode_com.c Thu Jul 4 12:06:11 1996
-@@ -214,7 +214,7 @@
-
- wprintw (show_win,"Inode type: ");
-
-- if (inode_num < EXT2_FIRST_INO) {
-+ if (inode_num < EXT2_GOOD_OLD_FIRST_INO) {
- switch (inode_num) {
- case EXT2_BAD_INO:
- wprintw (show_win,"Bad blocks inode - ");
CC = gcc
-CCFLAGS = -O $(FLAGS) -DVAR_DIR=\"$(VAR_DIR)\" $(NCURSES_INCLUDE) $(READLINE_INCLUDE)
-+CCFLAGS = $(RPM_OPT_FLAGS) $(FLAGS) -DVAR_DIR=\"$(VAR_DIR)\" $(NCURSES_INCLUDE) $(READLINE_INCLUDE)
++CCFLAGS = $(OPTFLAGS) $(FLAGS) -DVAR_DIR=\"$(VAR_DIR)\" $(NCURSES_INCLUDE) $(READLINE_INCLUDE)
LINKFLAGS = $(NCURSES_LIB) $(READLINE_LIB)
LIBS = -lreadline -lncurses
Summary(pl): Edytor systemu plików ext2 - TYLKO DLA DO¦WIADCZONYCH U¯YTKOWNIKÓW
Summary(tr): ext2 dosya sistemi düzenleyicisi
Name: ext2ed
-Version: 0.1
-Release: 23
+Version: 0.2
+Release: 1
License: GPL
Group: Applications/System
Source0: ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ext2/%{name}-%{version}.tar.gz
-Patch0: %{name}-config.patch
-Patch1: %{name}-inode.patch
-Patch2: %{name}-glibc.patch
-Patch3: %{name}-opt.patch
-Patch4: %{name}-FHS2.0.patch
+Patch0: %{name}-opt.patch
+Patch1: %{name}-FHS2.0.patch
BuildRequires: readline-devel >= 4.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%prep
%setup -q
-%patch0 -p0
+%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
rm -f ext2ed
-%{__make}
+%{__make} \
+ CC="%{__cc}" \
+ OPTFLAGS="%{rpmcflags}"
%install
rm -rf $RPM_BUILD_ROOT
DOC_DIR=$RPM_BUILD_ROOT \
MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man8
-gzip -9nf README doc/*.ps
-
%files
%defattr(644,root,root,755)
-%doc README.gz doc/*.sgml doc/*.ps.gz
-%attr(700,root,root) %dir /var/lib/ext2ed
-%attr(600,root,root) %config /var/lib/ext2ed/*
-%attr(700,root,root) %{_bindir}/ext2ed
+%doc README doc/*.sgml doc/*.ps
+%attr(750,root,root) %dir /var/lib/ext2ed
+/var/lib/ext2ed/ext2.descriptors
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /var/lib/ext2ed/ext2ed.conf
+%attr(744,root,root) %{_bindir}/ext2ed
%{_mandir}/man8/*
%clean