From 2bf1c3831dadb51c5b57f63bc8e6ced051fc17c8e6ad27dbb5ac558a8aa8a35e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 15:02:30 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/libedit revision 5.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libedit?expand=0&rev=df7a87e8e153998ec701b30159d5818a --- libedit-20090923-3.0.tar.bz2 | 3 ++ libedit-20100424-3.0.tar.bz2 | 3 -- libedit-downgrade_autoconf.patch | 24 --------------- libedit-ncurses-pkg-config.patch | 41 +++++++++++++++++++++++++ libedit.changes | 7 ----- libedit.spec | 52 ++++++++++++++------------------ 6 files changed, 67 insertions(+), 63 deletions(-) create mode 100644 libedit-20090923-3.0.tar.bz2 delete mode 100644 libedit-20100424-3.0.tar.bz2 delete mode 100644 libedit-downgrade_autoconf.patch create mode 100644 libedit-ncurses-pkg-config.patch 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-20100424-3.0.tar.bz2 b/libedit-20100424-3.0.tar.bz2 deleted file mode 100644 index 029166a..0000000 --- a/libedit-20100424-3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f3ec1581a0b3a767fa0393eb47890965bdca5daee8c0e0b6e911d32671f0864 -size 366942 diff --git a/libedit-downgrade_autoconf.patch b/libedit-downgrade_autoconf.patch deleted file mode 100644 index 94b10e3..0000000 --- a/libedit-downgrade_autoconf.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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]) 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 910f3da..36a21d9 100644 --- a/libedit.changes +++ b/libedit.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/libedit.spec b/libedit.spec index 987209d..31bf077 100644 --- a/libedit.spec +++ b/libedit.spec @@ -1,7 +1,7 @@ # -# spec file for package libedit (Version 3.0.snap20100424) +# spec file for package libedit (Version 3.0.snap20090923) # -# Copyright (c) 2010 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,10 +19,10 @@ Name: libedit -Version: 3.0.snap20100424 -Release: 1 +Version: 3.0.snap20090923 +Release: 2 %define pkg_name libedit -%define pkg_version 20100424-3.0 +%define pkg_version 20090923-3.0 # License: BSD3c Group: Development/Libraries/C and C++ @@ -31,12 +31,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ ncurses-devel # Url: http://www.thrysoee.dk/editline/ -# http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.gz -Source: %{pkg_name}-%{pkg_version}.tar.bz2 +# 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 -Patch1: libedit-downgrade_autoconf.patch +# 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: Command Line Editing and History Library +Summary: A command line editing and history library %description libedit is a command line editing and history library. It is designed @@ -45,31 +46,28 @@ at a terminal prompt. - Authors: -------- Jess Thrysoee %define library_name libedit0 -%define soname 0 - -%package -n %{library_name} +%define debug_package_requires %{library_name} = %{version}-%{release} +%package -n libedit0 License: BSD3c Group: Development/Libraries/C and C++ Provides: %{pkg_name} = %{version}-%{release} Obsoletes: %{pkg_name} < %{version} # -Summary: Command Line Editing and History Library +Summary: A command line editing and history library -%description -n %{library_name} +%description -n libedit0 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 @@ -99,22 +97,19 @@ Authors: %prep %setup -n %{pkg_name}-%{pkg_version} %{__cp} %{S:1} . -%patch1 +%patch0 -p1 %build -NOCONFIGURE=1 autoreconf -fiv -%configure --disable-static --with-pic \ - --disable-silent-rules \ - --enable-widec - -%__make %{?jobs:-j%jobs} +autoreconf -f -i +%configure --disable-static --with-pic +%{__make} %{?jobs:-j%jobs} %install %makeinstall -%__rm "%{buildroot}%{_libdir}"/*.la +rm %{buildroot}%{_libdir}/libedit.la %clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%{__rm} -rf %{buildroot} %post -n %{library_name} -p /sbin/ldconfig @@ -122,9 +117,8 @@ NOCONFIGURE=1 autoreconf -fiv %files -n %{library_name} %defattr(-,root,root,-) -%{_libdir}/libedit.so.%{soname} -%{_libdir}/libedit.so.%{soname}.* -%{_mandir}/man5/editrc.5%{ext_man} +%{_libdir}/libedit.so.* +%{_mandir}/man5/editrc.5* %doc README.SuSE THANKS ChangeLog COPYING examples/*c %files -n libedit-devel @@ -132,7 +126,7 @@ NOCONFIGURE=1 autoreconf -fiv %{_libdir}/libedit.so %{_includedir}/histedit.h %{_includedir}/editline/ -%{_mandir}/man3/*.3%{ext_man} +%{_mandir}/man3/*.3* %{_libdir}/pkgconfig/libedit.pc %changelog From c87c99c859fc6785416a9c76819f8dafe03ae281794bf10b0281c0dd5fede29a Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Sat, 24 Apr 2010 21:35:21 +0000 Subject: [PATCH 2/5] 20100424 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libedit?expand=0&rev=33 --- libedit-20090923-3.0.tar.bz2 | 3 --- libedit-20100424-3.0.tar.bz2 | 3 +++ libedit-downgrade_autoconf.patch | 24 +++++++++++++++++ libedit-ncurses-pkg-config.patch | 41 ---------------------------- libedit-ncurses.patch | 10 +++++++ libedit.changes | 7 +++++ libedit.spec | 46 ++++++++++++++++++-------------- 7 files changed, 70 insertions(+), 64 deletions(-) delete mode 100644 libedit-20090923-3.0.tar.bz2 create mode 100644 libedit-20100424-3.0.tar.bz2 create mode 100644 libedit-downgrade_autoconf.patch delete mode 100644 libedit-ncurses-pkg-config.patch create mode 100644 libedit-ncurses.patch diff --git a/libedit-20090923-3.0.tar.bz2 b/libedit-20090923-3.0.tar.bz2 deleted file mode 100644 index 191b08b..0000000 --- a/libedit-20090923-3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf2fd1388122f2494fcc408aafc7aab4afeae3d8ea98d530fd2dded756985b86 -size 374234 diff --git a/libedit-20100424-3.0.tar.bz2 b/libedit-20100424-3.0.tar.bz2 new file mode 100644 index 0000000..029166a --- /dev/null +++ b/libedit-20100424-3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f3ec1581a0b3a767fa0393eb47890965bdca5daee8c0e0b6e911d32671f0864 +size 366942 diff --git a/libedit-downgrade_autoconf.patch b/libedit-downgrade_autoconf.patch new file mode 100644 index 0000000..94b10e3 --- /dev/null +++ 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]) diff --git a/libedit-ncurses-pkg-config.patch b/libedit-ncurses-pkg-config.patch deleted file mode 100644 index d659e36..0000000 --- a/libedit-ncurses-pkg-config.patch +++ /dev/null @@ -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 diff --git a/libedit-ncurses.patch b/libedit-ncurses.patch new file mode 100644 index 0000000..77bdb35 --- /dev/null +++ b/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 diff --git a/libedit.changes b/libedit.changes index 36a21d9..910f3da 100644 --- a/libedit.changes +++ b/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 diff --git a/libedit.spec b/libedit.spec index 31bf077..6c1c1d8 100644 --- a/libedit.spec +++ b/libedit.spec @@ -19,10 +19,10 @@ Name: libedit -Version: 3.0.snap20090923 -Release: 2 +Version: 3.0.snap20100424 +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++ @@ -31,13 +31,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 +# 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 # -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 -%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}"} %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.* -%{_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 +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 From 839bd1fbe284dedf058bb81f7ea6382bc4282afb68cd6611dc73b0dfaccda277 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 7 May 2010 15:47:16 +0000 Subject: [PATCH 3/5] - remove debug_package_requires OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libedit?expand=0&rev=34 --- libedit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libedit.spec b/libedit.spec index 6c1c1d8..2219bad 100644 --- a/libedit.spec +++ b/libedit.spec @@ -52,7 +52,6 @@ Authors: %define library_name libedit0 %define soname 0 -%define debug_package_requires %{library_name} = %{version}-%{release} %package -n %{library_name} License: BSD3c From 2a5ec4f6fc9ee77c2efa938e264817717b29ceeddd91bbaa93cade2833a30285 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 13 May 2010 22:34:19 +0000 Subject: [PATCH 4/5] Accepting request 39660 from devel:libraries:c_c++ checked in (request 39660) OBS-URL: https://build.opensuse.org/request/show/39660 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libedit?expand=0&rev=35 --- libedit-20090923-3.0.tar.bz2 | 3 ++ libedit-20100424-3.0.tar.bz2 | 3 -- libedit-downgrade_autoconf.patch | 24 ---------------- libedit-ncurses-pkg-config.patch | 41 ++++++++++++++++++++++++++++ libedit-ncurses.patch | 10 ------- libedit.changes | 7 ----- libedit.spec | 47 ++++++++++++++------------------ 7 files changed, 65 insertions(+), 70 deletions(-) create mode 100644 libedit-20090923-3.0.tar.bz2 delete mode 100644 libedit-20100424-3.0.tar.bz2 delete mode 100644 libedit-downgrade_autoconf.patch create mode 100644 libedit-ncurses-pkg-config.patch delete mode 100644 libedit-ncurses.patch 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-20100424-3.0.tar.bz2 b/libedit-20100424-3.0.tar.bz2 deleted file mode 100644 index 029166a..0000000 --- a/libedit-20100424-3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f3ec1581a0b3a767fa0393eb47890965bdca5daee8c0e0b6e911d32671f0864 -size 366942 diff --git a/libedit-downgrade_autoconf.patch b/libedit-downgrade_autoconf.patch deleted file mode 100644 index 94b10e3..0000000 --- a/libedit-downgrade_autoconf.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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]) 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-ncurses.patch b/libedit-ncurses.patch deleted file mode 100644 index 77bdb35..0000000 --- a/libedit-ncurses.patch +++ /dev/null @@ -1,10 +0,0 @@ -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 diff --git a/libedit.changes b/libedit.changes index 910f3da..36a21d9 100644 --- a/libedit.changes +++ b/libedit.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/libedit.spec b/libedit.spec index 2219bad..31bf077 100644 --- a/libedit.spec +++ b/libedit.spec @@ -19,10 +19,10 @@ Name: libedit -Version: 3.0.snap20100424 -Release: 0 +Version: 3.0.snap20090923 +Release: 2 %define pkg_name libedit -%define pkg_version 20100424-3.0 +%define pkg_version 20090923-3.0 # License: BSD3c Group: Development/Libraries/C and C++ @@ -31,12 +31,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ ncurses-devel # Url: http://www.thrysoee.dk/editline/ -# http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.gz -Source: %{pkg_name}-%{pkg_version}.tar.bz2 +# 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 -Patch1: libedit-downgrade_autoconf.patch +# 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: Command Line Editing and History Library +Summary: A command line editing and history library %description libedit is a command line editing and history library. It is designed @@ -45,30 +46,28 @@ at a terminal prompt. - Authors: -------- Jess Thrysoee %define library_name libedit0 -%define soname 0 +%define debug_package_requires %{library_name} = %{version}-%{release} -%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: Command Line Editing and History Library +Summary: A command line editing and history library -%description -n %{library_name} +%description -n libedit0 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 @@ -98,22 +97,19 @@ Authors: %prep %setup -n %{pkg_name}-%{pkg_version} %{__cp} %{S:1} . -%patch1 +%patch0 -p1 %build -NOCONFIGURE=1 autoreconf -fiv -%configure --disable-static --with-pic \ - --disable-silent-rules \ - --enable-widec - -%__make %{?jobs:-j%jobs} +autoreconf -f -i +%configure --disable-static --with-pic +%{__make} %{?jobs:-j%jobs} %install %makeinstall -%__rm "%{buildroot}%{_libdir}"/*.la +rm %{buildroot}%{_libdir}/libedit.la %clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%{__rm} -rf %{buildroot} %post -n %{library_name} -p /sbin/ldconfig @@ -121,9 +117,8 @@ NOCONFIGURE=1 autoreconf -fiv %files -n %{library_name} %defattr(-,root,root,-) -%{_libdir}/libedit.so.%{soname} -%{_libdir}/libedit.so.%{soname}.* -%{_mandir}/man5/editrc.5%{ext_man} +%{_libdir}/libedit.so.* +%{_mandir}/man5/editrc.5* %doc README.SuSE THANKS ChangeLog COPYING examples/*c %files -n libedit-devel @@ -131,7 +126,7 @@ NOCONFIGURE=1 autoreconf -fiv %{_libdir}/libedit.so %{_includedir}/histedit.h %{_includedir}/editline/ -%{_mandir}/man3/*.3%{ext_man} +%{_mandir}/man3/*.3* %{_libdir}/pkgconfig/libedit.pc %changelog From 3baddaf39671d4e0d7858d41ba09a6cfc4663e9ef486429da61be7dccfd90f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 31 Jul 2011 21:43:56 +0000 Subject: [PATCH 5/5] 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 --- libedit-20090923-3.0.tar.bz2 | 3 -- libedit-20100424-3.0-ncurses.patch | 38 ++++++++++++++++++ libedit-20100424-3.0.tar.bz2 | 3 ++ libedit-downgrade_autoconf.patch | 24 ++++++++++++ libedit-ncurses-pkg-config.patch | 41 ------------------- libedit.changes | 13 ++++++ libedit.spec | 63 +++++++++++++++++------------- 7 files changed, 114 insertions(+), 71 deletions(-) delete mode 100644 libedit-20090923-3.0.tar.bz2 create mode 100644 libedit-20100424-3.0-ncurses.patch create mode 100644 libedit-20100424-3.0.tar.bz2 create mode 100644 libedit-downgrade_autoconf.patch delete mode 100644 libedit-ncurses-pkg-config.patch diff --git a/libedit-20090923-3.0.tar.bz2 b/libedit-20090923-3.0.tar.bz2 deleted file mode 100644 index 191b08b..0000000 --- a/libedit-20090923-3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf2fd1388122f2494fcc408aafc7aab4afeae3d8ea98d530fd2dded756985b86 -size 374234 diff --git a/libedit-20100424-3.0-ncurses.patch b/libedit-20100424-3.0-ncurses.patch new file mode 100644 index 0000000..5ae559e --- /dev/null +++ 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 + diff --git a/libedit-20100424-3.0.tar.bz2 b/libedit-20100424-3.0.tar.bz2 new file mode 100644 index 0000000..029166a --- /dev/null +++ b/libedit-20100424-3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f3ec1581a0b3a767fa0393eb47890965bdca5daee8c0e0b6e911d32671f0864 +size 366942 diff --git a/libedit-downgrade_autoconf.patch b/libedit-downgrade_autoconf.patch new file mode 100644 index 0000000..94b10e3 --- /dev/null +++ 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]) diff --git a/libedit-ncurses-pkg-config.patch b/libedit-ncurses-pkg-config.patch deleted file mode 100644 index d659e36..0000000 --- a/libedit-ncurses-pkg-config.patch +++ /dev/null @@ -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 diff --git a/libedit.changes b/libedit.changes index 36a21d9..37d1973 100644 --- 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 diff --git a/libedit.spec b/libedit.spec index 31bf077..0177c60 100644 --- 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