readline: Update to 7.0

Requires shipping a compat package for libreadline 6.x

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/compat-readline/compat-readline.nm b/compat-readline/compat-readline.nm
new file mode 100644 (file)
index 0000000..5425043
--- /dev/null
+++ b/compat-readline/compat-readline.nm
@@ -0,0 +1,66 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-readline
+version    = 6.3
+release    = 1
+
+thisapp    = readline-%{version}
+
+groups     = System/Libraries
+url        = ftp://ftp.gnu.org/gnu/readline/
+license    = GPLv3+
+summary    = A library for editing typed command lines
+
+description
+       The Readline library provides a set of functions that allow users to
+       edit command lines. Both Emacs and vi editing modes are available.
+       The Readline library includes additional functions for maintaining a
+       list of previously-entered command lines for recalling or editing
+       those lines, and for performing csh-like history expansion on
+       previous commands.
+end
+
+source_dl  = ftp://ftp.gnu.org/gnu/readline/
+
+build
+       requires
+               ncurses-devel
+       end
+
+       make_build_targets += \
+               SHLIB_LIBS=-lncurses
+
+       test
+               make check
+       end
+
+       install
+               # Only install libraries.
+               mkdir -pv %{BUILDROOT}%{libdir}
+
+               install -m 755 shlib/libhistory.so.6.3 %{BUILDROOT}%{libdir}
+               ln -svf libhistory.so.6.3 %{BUILDROOT}%{libdir}/libhistory.so.6
+
+               install -m 755 shlib/libreadline.so.6.3 %{BUILDROOT}%{libdir}
+               ln -svf libreadline.so.6.3 %{BUILDROOT}%{libdir}/libreadline.so.6
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       readline = %{thisver}
+               end
+
+               conflicts
+                       readline <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/compat-readline/patches/readline-5.0-no_rpath.patch b/compat-readline/patches/readline-5.0-no_rpath.patch
new file mode 100644 (file)
index 0000000..befad63
--- /dev/null
+++ b/compat-readline/patches/readline-5.0-no_rpath.patch
@@ -0,0 +1,13 @@
+ripped from Fedora
+
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -102,7 +102,7 @@
+       SHOBJ_LD='${CC}'
+       SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ 
+-      SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
++      SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+       SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+       ;;
+ 

diff --git a/readline/patches/readline-5.0-no_rpath.patch b/readline/patches/readline-5.0-no_rpath.patch
new file mode 100644 (file)
index 0000000..befad63
--- /dev/null
+++ b/readline/patches/readline-5.0-no_rpath.patch
@@ -0,0 +1,13 @@
+ripped from Fedora
+
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -102,7 +102,7 @@
+       SHOBJ_LD='${CC}'
+       SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ 
+-      SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
++      SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+       SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+       ;;
+ 

diff --git a/readline/readline.nm b/readline/readline.nm
index 70f40cd720b7969d671cb5ce0564084266442432..e45b366647b16e8462192f9d831aa9b04f24f820 100644 (file)
--- a/readline/readline.nm
+++ b/readline/readline.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = readline
-version    = 6.3
+version    = 7.0
 release    = 1
 
 groups     = System/Libraries
@@ -25,7 +25,6 @@ source_dl  = ftp://ftp.gnu.org/gnu/readline/
 
 build
        requires
-               audit-devel
                ncurses-devel
        end