20100424

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libedit?expand=0&rev=33

libedit-20090923-3.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf2fd1388122f2494fcc408aafc7aab4afeae3d8ea98d530fd2dded756985b86
-size 374234

libedit-20100424-3.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f3ec1581a0b3a767fa0393eb47890965bdca5daee8c0e0b6e911d32671f0864
+size 366942

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])

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

libedit-ncurses.patch

@@ -0,0 +1,10 @@
+diff -ru libedit-20100424-3.0.orig/examples/Makefile.am libedit-20100424-3.0/examples/Makefile.am
+--- libedit-20100424-3.0.orig/examples/Makefile.am	2010-04-22 21:13:17.000000000 +0200
++++ libedit-20100424-3.0/examples/Makefile.am	2010-04-24 23:26:48.000000000 +0200
+@@ -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  = tc1 fileman

libedit.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
 

libedit.spec

@@ -19,10 +19,10 @@
 
 
 Name:           libedit
-Version:        3.0.snap20090923
+Version:        3.0.snap20100424
-Release:        2
+Release:        0
 %define pkg_name    libedit
-%define pkg_version 20090923-3.0
+%define pkg_version 20100424-3.0
 #
 License:        BSD3c
 Group:          Development/Libraries/C and C++
@@ -32,12 +32,11 @@ BuildRequires:  gcc-c++ ncurses-devel
 #
 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
+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
+Patch1:         libedit-downgrade_autoconf.patch
-Patch0:         libedit-ncurses-pkg-config.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 +45,31 @@ at a terminal prompt.
 
 
 
+
 Authors:
 --------
     Jess Thrysoee
 
 %define library_name libedit0
+%define soname 0
 %define debug_package_requires %{library_name} = %{version}-%{release}
 
-%package -n libedit0
+%package -n %{library_name}
 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
@@ -97,19 +99,22 @@ Authors:
 %prep
 %setup -n %{pkg_name}-%{pkg_version}
 %{__cp} %{S:1} .
-%patch0 -p1
+%patch1
 
 %build
-autoreconf -f -i
+NOCONFIGURE=1 autoreconf -fiv
-%configure --disable-static --with-pic
+%configure --disable-static --with-pic \
-%{__make} %{?jobs:-j%jobs}
+    --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}"}
 
 %post   -n %{library_name} -p /sbin/ldconfig
 
@@ -117,8 +122,9 @@ rm %{buildroot}%{_libdir}/libedit.la
 
 %files -n %{library_name}
 %defattr(-,root,root,-)
-%{_libdir}/libedit.so.*
+%{_libdir}/libedit.so.%{soname}
-%{_mandir}/man5/editrc.5*
+%{_libdir}/libedit.so.%{soname}.*
+%{_mandir}/man5/editrc.5%{ext_man}
 %doc README.SuSE THANKS ChangeLog COPYING examples/*c
 
 %files -n libedit-devel
@@ -126,7 +132,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