Accepting request 77511 from home:elvigia:branches:devel:libraries:c_c++

- Link with ncurses6w instead of ncurses5 - Do not inject artificial dependencies on other packages OBS-URL: https://build.opensuse.org/request/show/77511 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libedit?expand=0&rev=36
2011-07-31 21:43:56 +00:00 · 2011-07-31 21:43:56 +00:00 · 3baddaf396
commit 3baddaf396
parent 2a5ec4f6fc
7 changed files with 114 additions and 71 deletions
--- a/libedit-20090923-3.0.tar.bz2
+++ b/libedit-20090923-3.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf2fd1388122f2494fcc408aafc7aab4afeae3d8ea98d530fd2dded756985b86
-size 374234
--- a/libedit-20100424-3.0-ncurses.patch
+++ b/libedit-20100424-3.0-ncurses.patch
@ -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
+ 
--- a/libedit-20100424-3.0.tar.bz2
+++ b/libedit-20100424-3.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f3ec1581a0b3a767fa0393eb47890965bdca5daee8c0e0b6e911d32671f0864
+size 366942
--- a/libedit-downgrade_autoconf.patch
+++ b/libedit-downgrade_autoconf.patch
@ -0,0 +1,24 @@
+--- aclocal.m4.orig	2010-04-24 23:29:53.000000000 +0200
+++ aclocal.m4	2010-04-24 23:30:29.000000000 +0200
+@@ -13,8 +13,8 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.60],,
+[m4_warning([this file was generated for autoconf 2.60.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+--- configure.ac.orig	2010-04-24 23:30:34.000000000 +0200
+++ configure.ac	2010-04-24 23:30:42.000000000 +0200
+@@ -9,7 +9,7 @@
+ #    "./configure --disable-silent-rules" or "make V=1"
+ #
+ 
+-AC_PREREQ(2.65)
+AC_PREREQ(2.60)
+ AC_INIT(libedit, [EL_RELEASE],, libedit-[EL_TIMESTAMP])
+ AC_CONFIG_SRCDIR([src/strlcat.c])
+ AC_CONFIG_HEADER([config.h])
--- a/libedit-ncurses-pkg-config.patch
+++ b/libedit-ncurses-pkg-config.patch
@ -1,41 +0,0 @@
-Index: libedit-20090923-3.0/configure.ac
-===================================================================
--- libedit-20090923-3.0.orig/configure.ac
-+++ libedit-20090923-3.0/configure.ac
-@@ -20,9 +20,11 @@ AC_PROG_LN_S
- AC_PROG_AWK
- EL_MANTYPE
- 
-AC_CHECK_LIB(curses, tgetent,,
-   [AC_CHECK_LIB(ncurses, tgetent,,
-+CURSES=
-+AC_CHECK_LIB(curses, tgetent,[CURSES=curses],
-+   [AC_CHECK_LIB(ncurses, tgetent,[CURSES=ncurses],
-       [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )
-+AC_SUBST(CURSES)
- 
- # Checks for header files.
- AC_FUNC_ALLOCA
-Index: libedit-20090923-3.0/libedit.pc.in
-===================================================================
--- libedit-20090923-3.0.orig/libedit.pc.in
-+++ libedit-20090923-3.0/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 -lcurses
-+Libs: -L${libdir} -ledit -l@CURSES@
- Cflags: -I${includedir} -I${includedir}/editline
- 
-Index: libedit-20090923-3.0/examples/Makefile.am
-===================================================================
--- libedit-20090923-3.0.orig/examples/Makefile.am
-+++ libedit-20090923-3.0/examples/Makefile.am
-@@ -1,5 +1,5 @@
- 
-LDADD = $(top_builddir)/src/libedit.la
-+LDADD = $(top_builddir)/src/libedit.la -l@CURSES@
- AM_CFLAGS = -I$(top_srcdir)/src
- 
- noinst_PROGRAMS    = test fileman
--- a/libedit.changes
+++ b/libedit.changes
@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+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
+
+- update to 20100424:
+  * synchronized with the upstream source
+  * UTF-8 support was added
+
 -------------------------------------------------------------------
 Mon Dec 21 17:27:40 UTC 2009 - coolo@novell.com

--- a/libedit.spec
+++ b/libedit.spec
@ -1,7 +1,7 @@
 #
-# spec file for package libedit (Version 3.0.snap20090923)
+# spec file for package libedit (Version 3.0.snap20100424)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -19,25 +19,25 @@


 Name:           libedit
-Version:        3.0.snap20090923
-Release:        2
+Version:        3.0.snap20100424
+Release:        1
 %define pkg_name    libedit
-%define pkg_version 20090923-3.0
+%define pkg_version 20100424-3.0
 #
 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:         http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.bz2
+# http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.gz
+Source:         %{pkg_name}-%{pkg_version}.tar.bz2
 Source1:        README.SuSE
-# PATCH-FIX-UPSTREAM libedit-ncurses-pkg-config.patch vuntz@opensuse.org -- Use ncurses in pkg-config file, sent upstream by mail
-Patch0:         libedit-ncurses-pkg-config.patch
+Patch1:         libedit-downgrade_autoconf.patch
+Patch2:         libedit-20100424-3.0-ncurses.patch
 #
-Summary:        A command line editing and history library
+Summary:        Command Line Editing and History Library

 %description
 libedit is a command line editing and history library. It is designed
@ -46,28 +46,31 @@ at a terminal prompt.



+
 Authors:
 --------
    Jess Thrysoee

 %define library_name libedit0
-%define debug_package_requires %{library_name} = %{version}-%{release}
+%define soname 0
+
+%package -n %{library_name}

-%package -n libedit0
 License:        BSD3c
 Group:          Development/Libraries/C and C++
 Provides:       %{pkg_name} = %{version}-%{release}
 Obsoletes:      %{pkg_name} < %{version}
 #
-Summary:        A command line editing and history library
+Summary:        Command Line Editing and History Library

-%description -n libedit0
+%description -n %{library_name}
 libedit is a command line editing and history library. It is designed
 to be used by interactive programs that allow the user to type commands
 at a terminal prompt.



+
 Authors:
 --------
    Jess Thrysoee
@ -77,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

@ -97,19 +100,24 @@ Authors:
 %prep
 %setup -n %{pkg_name}-%{pkg_version}
 %{__cp} %{S:1} .
-%patch0 -p1
-
+%patch1
+%patch2
 %build
-autoreconf -f -i
-%configure --disable-static --with-pic
-%{__make} %{?jobs:-j%jobs}
+NOCONFIGURE=1 autoreconf -fiv
+%configure --disable-static --with-pic \
+    --disable-silent-rules \
+    --enable-widec
+
+%__make %{?jobs:-j%jobs}

 %install
 %makeinstall
-rm %{buildroot}%{_libdir}/libedit.la
-
+%__rm "%{buildroot}%{_libdir}"/*.la
 %clean
-%{__rm} -rf %{buildroot}
+%{?buildroot:%__rm -rf "%{buildroot}"}
+
+%check
+make check

 %post   -n %{library_name} -p /sbin/ldconfig

@ -117,8 +125,9 @@ rm %{buildroot}%{_libdir}/libedit.la

 %files -n %{library_name}
 %defattr(-,root,root,-)
-%{_libdir}/libedit.so.*
-%{_mandir}/man5/editrc.5*
+%{_libdir}/libedit.so.%{soname}
+%{_libdir}/libedit.so.%{soname}.*
+%{_mandir}/man5/editrc.5%{ext_man}
 %doc README.SuSE THANKS ChangeLog COPYING examples/*c

 %files -n libedit-devel
@ -126,7 +135,7 @@ rm %{buildroot}%{_libdir}/libedit.la
 %{_libdir}/libedit.so
 %{_includedir}/histedit.h
 %{_includedir}/editline/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3%{ext_man}
 %{_libdir}/pkgconfig/libedit.pc

 %changelog