From: Jakub Bogusz Date: Sun, 7 Jul 2002 11:18:46 +0000 (+0000) Subject: - updated to 0.2, removed obsolete config,glibc,inode patches X-Git-Tag: RA-1_0 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fext2ed.git;a=commitdiff_plain;h=64020fe56857fa0c2bca9363a31261c1189446bc - updated to 0.2, removed obsolete config,glibc,inode patches - use proper CC and optflags (opt patch updated) - revised file list (but it seems ext2ed.conf should go to /etc and ext2.descriptors to /usr/share/ext2ed - now they are both in /var/lib) Changed files: ext2ed-config.patch -> 1.2 ext2ed-glibc.patch -> 1.2 ext2ed-inode.patch -> 1.2 ext2ed-opt.patch -> 1.2 ext2ed.spec -> 1.25 --- diff --git a/ext2ed-config.patch b/ext2ed-config.patch deleted file mode 100644 index 3a1a11f..0000000 --- a/ext2ed-config.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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) diff --git a/ext2ed-glibc.patch b/ext2ed-glibc.patch deleted file mode 100644 index 8764b89..0000000 --- a/ext2ed-glibc.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 /* Main kernel ext2 include file */ --#include -+#include - - #ifdef OLD_NCURSES /* The ncurses interface */ - #include -@@ -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 */ diff --git a/ext2ed-inode.patch b/ext2ed-inode.patch deleted file mode 100644 index 963dc55..0000000 --- a/ext2ed-inode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - "); diff --git a/ext2ed-opt.patch b/ext2ed-opt.patch index 5f49109..3c67eee 100644 --- a/ext2ed-opt.patch +++ b/ext2ed-opt.patch @@ -6,7 +6,7 @@ diff -Nru ext2ed-0.1/Makefile ext2ed-0.1.new/Makefile 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 diff --git a/ext2ed.spec b/ext2ed.spec index 260bf0e..7f485cf 100644 --- a/ext2ed.spec +++ b/ext2ed.spec @@ -4,16 +4,13 @@ Summary(fr): 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) @@ -54,15 +51,14 @@ uyarm %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 @@ -74,14 +70,13 @@ install -d $RPM_BUILD_ROOT/{%{_bindir},%{_mandir}/man8,var/lib/ext2ed} 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