SHA256
3
0
forked from pool/libedit

Accepting request 77512 from devel:libraries:c_c++

- Link with ncurses6w instead of ncurses5 
- Do not inject artificial dependencies on other packages (forwarded request 77511 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/77512
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libedit?expand=0&rev=10
This commit is contained in:
Sascha Peilicke 2011-08-01 07:44:16 +00:00 committed by Git OBS Bridge
commit aa0fa710ef
3 changed files with 51 additions and 4 deletions

View File

@ -0,0 +1,38 @@
--- configure.ac.orig
+++ configure.ac
@@ -34,7 +34,7 @@ EL_MANTYPE
AC_CHECK_LIB(curses, tgetent,,
- [AC_CHECK_LIB(ncurses, tgetent,,
+ [AC_CHECK_LIB(ncursesw, tgetent,,
[AC_MSG_ERROR([libcurses or libncurses are required!])] )] )
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -44,6 +44,7 @@ libedit_la_SOURCES = chared.c common.c e
histedit.h key.h map.h chartype.h parse.h prompt.h read.h refresh.h \
search.h sig.h sys.h el_term.h tty.h vis.h filecomplete.h \
editline/readline.h
+libedit_la_CFLAGS = $(shell ncursesw6-config --cflags)
if WIDECHAR
libedit_la_SOURCES += eln.c
endif
@@ -53,5 +54,5 @@ nobase_include_HEADERS = histedit.h edit
nodist_libedit_la_SOURCES = $(BUILT_SOURCES)
-libedit_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION)
+libedit_la_LDFLAGS = $(shell ncursesw6-config --libs) -no-undefined -version-info $(LT_VERSION)
--- libedit.pc.in.orig
+++ libedit.pc.in
@@ -7,6 +7,6 @@ Name: libedit
Description: command line editor library provides generic line editing, history, and tokenization functions.
Version: @VERSION@
Requires:
-Libs: -L${libdir} -ledit @LIBS@
+Libs: -ledit
Cflags: -I${includedir} -I${includedir}/editline

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jul 31 20:45:38 UTC 2011 - crrodriguez@opensuse.org
- Link with ncurses6w instead of ncurses5
- Do not inject artificial dependencies on other packages
-------------------------------------------------------------------
Sat Apr 24 20:17:13 UTC 2010 - pascal.bleser@opensuse.org

View File

@ -28,13 +28,14 @@ License: BSD3c
Group: Development/Libraries/C and C++
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ ncurses-devel
BuildRequires: gcc-c++ ncurses-devel pkgconfig
#
Url: http://www.thrysoee.dk/editline/
# http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.gz
Source: %{pkg_name}-%{pkg_version}.tar.bz2
Source1: README.SuSE
Patch1: libedit-downgrade_autoconf.patch
Patch2: libedit-20100424-3.0-ncurses.patch
#
Summary: Command Line Editing and History Library
@ -79,7 +80,7 @@ License: BSD3c
Group: Development/Libraries/C and C++
Requires: %{library_name} = %{version}
Provides: %{library_name}-devel = %{version}-%{release}
Requires: ncurses-devel
Requires: glibc-devel
#
Summary: Development files for libedit
@ -100,7 +101,7 @@ Authors:
%setup -n %{pkg_name}-%{pkg_version}
%{__cp} %{S:1} .
%patch1
%patch2
%build
NOCONFIGURE=1 autoreconf -fiv
%configure --disable-static --with-pic \
@ -112,10 +113,12 @@ NOCONFIGURE=1 autoreconf -fiv
%install
%makeinstall
%__rm "%{buildroot}%{_libdir}"/*.la
%clean
%{?buildroot:%__rm -rf "%{buildroot}"}
%check
make check
%post -n %{library_name} -p /sbin/ldconfig
%postun -n %{library_name} -p /sbin/ldconfig