- updated to 1.6

- updated multilib patch

Changed files:
    ed-multilib.patch -> 1.5
    ed.spec -> 1.78

diff --git a/ed-multilib.patch b/ed-multilib.patch
index 0dd3868c521f63bf707cc0c81ad656d81d60709f..ccef80b3784e7a9cc38fdadd58d5c7beea1e2d11 100644 (file)
--- a/ed-multilib.patch
+++ b/ed-multilib.patch
@@ -1,15 +1,15 @@
---- ed-0.6/Makefile.in.orig    2007-07-11 18:44:28.507057421 +0200
-+++ ed-0.6/Makefile.in 2007-07-11 20:13:08.702238066 +0200
-@@ -15,10 +15,10 @@
- all : $(progname)
+--- ed-1.6/Makefile.in.orig    2011-04-16 13:17:15.000000000 +0200
++++ ed-1.6/Makefile.in 2012-01-04 19:47:48.352289420 +0100
+@@ -18,10 +18,10 @@
+ all : $(progname) r$(progname)
  
  $(progname) : $(objs)
--      $(CC) $(LDFLAGS) -o $(progname) $(objs)
-+      $(CC) $(LDFLAGS) $(CFLAGS) -o $(progname) $(objs)
+-      $(CC) $(LDFLAGS) -o $@ $(objs)
++      $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(objs)
  
  $(progname)_profiled : $(objs)
--      $(CC) $(LDFLAGS) -pg -o $(progname)_profiled $(objs)
-+      $(CC) $(LDFLAGS) $(CFLAGS) -pg -o $(progname)_profiled $(objs)
+-      $(CC) $(LDFLAGS) -pg -o $@ $(objs)
++      $(CC) $(LDFLAGS) $(CFLAGS) -pg -o $@ $(objs)
  
- main.o : main.c
-       $(CC) $(CPPFLAGS) $(CFLAGS) -DPROGVERSION=\"$(progversion)\" -c -o $@ $<
+ r$(progname) : r$(progname).in
+       cat $(VPATH)/r$(progname).in > $@

diff --git a/ed.spec b/ed.spec
index e67dfc283df37bfa0b2b9398a8637da20ece6e86..9f70187b57973808bc52e7209140b8907ad5d2c5 100644 (file)
--- a/ed.spec
+++ b/ed.spec
@@ -9,12 +9,12 @@ Summary(ru.UTF-8):    Строчный редактор GNU
 Summary(tr.UTF-8):     GNU satır düzenleyici
 Summary(uk.UTF-8):     Рядковий редактор GNU
 Name:          ed
-Version:       1.5
+Version:       1.6
 Release:       1
 License:       GPL v3+
 Group:         Applications/Editors
 Source0:       http://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.lz
-# Source0-md5: 85353341854929bcd3526ed0814b1ed0
+# Source0-md5: e3d4dcfd260b2ebb2855c86ffca1947f
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 13a5459ddffbd7f04aa3d67fce0d2134
 Patch0:                %{name}-info.patch
@@ -107,6 +107,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.ed-non-english-man-pages
 
 %clean
 rm -rf $RPM_BUILD_ROOT