summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ed-autoconf.patch11
-rw-r--r--ed.spec16
2 files changed, 9 insertions, 18 deletions
diff --git a/ed-autoconf.patch b/ed-autoconf.patch
deleted file mode 100644
index b20e5f4..0000000
--- a/ed-autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ed-1.0/Makefile.in.orig 2008-05-04 17:57:10.000000000 +0200
-+++ ed-1.0/Makefile.in 2008-08-23 23:14:21.434113358 +0200
-@@ -59,7 +59,7 @@
- if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ; fi
- $(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1
- -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1
-- cd $(DESTDIR)$(mandir)/man1 && ln -s $(program_prefix)$(progname).1 $(program_prefix)r$(progname).1
-+ cd $(DESTDIR)$(mandir)/man1 ; echo ".so $(program_prefix)$(progname).1" >$(program_prefix)r$(progname).1
-
- install-strip : all
- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
diff --git a/ed.spec b/ed.spec
index 9c60c13..e67dfc2 100644
--- a/ed.spec
+++ b/ed.spec
@@ -9,18 +9,20 @@ Summary(ru.UTF-8): Строчный редактор GNU
Summary(tr.UTF-8): GNU satır düzenleyici
Summary(uk.UTF-8): Рядковий редактор GNU
Name: ed
-Version: 1.4
+Version: 1.5
Release: 1
License: GPL v3+
Group: Applications/Editors
-Source0: http://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.gz
-# Source0-md5: da0ddc0e0b0bec2da4b13b0d0d1bce2b
+Source0: http://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.lz
+# Source0-md5: 85353341854929bcd3526ed0814b1ed0
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
-Patch1: %{name}-autoconf.patch
-Patch2: %{name}-multilib.patch
+Patch1: %{name}-multilib.patch
URL: http://www.gnu.org/software/ed/
+BuildRequires: lzip
+BuildRequires: rpmbuild(macros) >= 1.402
+BuildRequires: tar >= 1:1.22
BuildRequires: texinfo
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,9 +90,9 @@ Ed - это строчно-ориентированный текстовый р
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-rm -f doc/ed.info
+# force rebuild
+%{__rm} doc/ed.info
%build
# not autoconf configure, but options compatible