From ad89b255f6112767daea7a819d9cea0414245d5654a3dd8961ad1af6f64c4d9c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 4 Dec 2009 11:16:55 +0000 Subject: [PATCH] Accepting request 25514 from devel:libraries:c_c++ Copy from devel:libraries:c_c++/libedit based on submit request 25514 from user darix OBS-URL: https://build.opensuse.org/request/show/25514 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libedit?expand=0&rev=3 --- libedit-20080712-2.11.tar.bz2 | 3 -- libedit-20090923-3.0.tar.bz2 | 3 ++ libedit-ncurses-pkg-config.patch | 41 ++++++++++++++++++ libedit.changes | 29 +++++++++++++ libedit.spec | 74 +++++++------------------------- 5 files changed, 88 insertions(+), 62 deletions(-) delete mode 100644 libedit-20080712-2.11.tar.bz2 create mode 100644 libedit-20090923-3.0.tar.bz2 create mode 100644 libedit-ncurses-pkg-config.patch diff --git a/libedit-20080712-2.11.tar.bz2 b/libedit-20080712-2.11.tar.bz2 deleted file mode 100644 index db6f67f..0000000 --- a/libedit-20080712-2.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b7b74062ba91457bc9838fcb8c15493134b4737c660affb519dedab038d2a2c -size 350527 diff --git a/libedit-20090923-3.0.tar.bz2 b/libedit-20090923-3.0.tar.bz2 new file mode 100644 index 0000000..191b08b --- /dev/null +++ b/libedit-20090923-3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf2fd1388122f2494fcc408aafc7aab4afeae3d8ea98d530fd2dded756985b86 +size 374234 diff --git a/libedit-ncurses-pkg-config.patch b/libedit-ncurses-pkg-config.patch new file mode 100644 index 0000000..d659e36 --- /dev/null +++ b/libedit-ncurses-pkg-config.patch @@ -0,0 +1,41 @@ +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 diff --git a/libedit.changes b/libedit.changes index 1313960..6462420 100644 --- a/libedit.changes +++ b/libedit.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Dec 3 16:01:23 CET 2009 - vuntz@opensuse.org + +- Update to version 20090923-3.0: + + all: apply Apple patches from: + http://opensource.apple.com/source/libedit/libedit-11/patches +- Changes from previous versions: + + version-info: 0:33:0 + - all: Use predefined macro __sun to identify Solaris + - src/el.c: Ignore comment lines in .editrc + + version-info: 0:32:0 + - all: sync with upstream source. + + version-info: 0:31:0 + - all: sync with upstream source. + + version-info: 0:30:0 + - all: sync with upstream source. + + version-info: 0:29:0 + - all: sync with upstream source. + + version-info: 0:28:0 + - all: sync with upstream source. MAJOR.MINOR version is now + 3.0. This is due to NetBSD changing time_t and dev_t to 64 + bits. It does not really effect this package. + - configure.ac: Remove '--enable-debug' configure flag. The + autoconf way to control flags is by specifying them when + running configure, e.g. 'CFLAGS="-O0 -g" ./configure' +- Fix self-obsoletion of libedit. +- Add libedit-ncurses-pkg-config.patch to fix the pkg-config file + so that it references ncurses, and not curses. + ------------------------------------------------------------------- Sat Sep 6 18:21:16 CEST 2008 - mrueckert@suse.de diff --git a/libedit.spec b/libedit.spec index 7462521..86fa173 100644 --- a/libedit.spec +++ b/libedit.spec @@ -1,7 +1,7 @@ # -# spec file for package libedit (Version 2.11.snap20080712) +# spec file for package libedit (Version 3.0.snap20090923) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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,12 +19,12 @@ Name: libedit -Version: 2.11.snap20080712 +Version: 3.0.snap20090923 Release: 1 %define pkg_name libedit -%define pkg_version 20080712-2.11 +%define pkg_version 20090923-3.0 # -License: BSD 3-Clause +License: BSD3c Group: Development/Libraries/C and C++ # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,11 +34,13 @@ 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 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 # Summary: A command line editing and history library %description -libedit is a command line editing and history library. It is designed +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. @@ -52,15 +54,15 @@ Authors: %define debug_package_requires %{library_name} = %{version}-%{release} %package -n libedit0 -License: BSD 3-Clause +License: BSD3c Group: Development/Libraries/C and C++ Provides: %{pkg_name} = %{version}-%{release} -Obsoletes: %{pkg_name} <= %{version} +Obsoletes: %{pkg_name} < %{version} # Summary: A command line editing and history library %description -n libedit0 -libedit is a command line editing and history library. It is designed +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. @@ -71,7 +73,7 @@ Authors: Jess Thrysoee %package -n libedit-devel -License: BSD 3-Clause +License: BSD3c Group: Development/Libraries/C and C++ Requires: %{library_name} = %{version} Provides: %{library_name}-devel = %{version}-%{release} @@ -80,7 +82,7 @@ Requires: ncurses-devel Summary: Development files for libedit %description -n libedit-devel -libedit is a command line editing and history library. It is designed +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. @@ -95,8 +97,10 @@ Authors: %prep %setup -n %{pkg_name}-%{pkg_version} %{__cp} %{S:1} . +%patch0 -p1 %build +autoconf -f %configure --disable-static --with-pic %{__make} @@ -126,51 +130,3 @@ rm %{buildroot}%{_libdir}/libedit.la %{_libdir}/pkgconfig/libedit.pc %changelog -* Sat Sep 06 2008 mrueckert@suse.de -- update to 20080712-2.11 - * version-info: 0:27:0 - * configure.ac: Added '--enable-debug' configure flag, to produce - debugging information. - * examples/fileman.c: cast stat struct members, st_nlink and - st_size, appropriately (see also 'man 2 stat'). - Patch by Alex Elder. - * all: sync with upstream source. MINOR version is now 11. -- rename main package to libedit and split out a subpackage libedit0 -* Sat Sep 01 2007 mrueckert@suse.de -- update to 20070831-2.10 - * version-info: 0:26:0 - * libedit.pc.in,Makefile.am,configure.ac,patches/extra_dist_list.sh: - Added pkg-config support for libedit. Patch by Masatake YAMATO. -* Wed Aug 15 2007 mrueckert@suse.de -- update to 20070813-2.10 - * version-info: 0:25:0 - * all: sync with upstream source. -* Mon Jul 16 2007 mrueckert@suse.de -- fixed a few -n lines that wont work in abuild otherwise -* Mon Jun 11 2007 mrueckert@suse.de -- rename package to follow the library packaging policy. -- dont build the static lib -* Sat Mar 03 2007 mrueckert@suse.de -- update to 20070302-2.10: - * version-info: 0:24:0 - * all: sync with upstream source. - * A bug with el_push() has been fixed. -* Tue Jan 09 2007 mrueckert@suse.de -- update to 20061228-2.10: - * version-info: 0:23:0 - * src/shlib_version: Upstream bumped minor version from 9 to 10. - * all: sync with upstream source. More readline functions. -* Sun Oct 22 2006 mrueckert@suse.de -- update to 20061022-2.9: - synced with upstream source. -* Thu Aug 31 2006 mrueckert@suse.de -- removed changelog from README.SuSE -* Wed Aug 30 2006 mrueckert@suse.de -- update to 20060829-2.9: - Finally all files are bsd 3 clause. - This package should be GPL compatible now. -* Thu Aug 17 2006 mrueckert@suse.de -- run ldconfig -* Thu Aug 17 2006 mrueckert@suse.de -- updated to 20060816-2.9: - * sync with upstream sources