Accepting request 936266 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/936266
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libedit?expand=0&rev=32

libedit-20180525-manpage-conflicts.patch

@@ -8,9 +8,10 @@ Make sure all manpages are prefixed with "el_" in order to avoid
 file conflicts with readline-doc.
 
 ---
-diff -up libedit-20180525-3.1/doc/Makefile.am.orig libedit-20180525-3.1/doc/Makefile.am
---- libedit-20180525-3.1/doc/Makefile.am.orig	2018-08-06 11:37:52.160085685 +0200
-+++ libedit-20180525-3.1/doc/Makefile.am	2018-08-06 11:39:04.352082128 +0200
+Index: libedit-20210910-3.1/doc/Makefile.am
+===================================================================
+--- libedit-20210910-3.1.orig/doc/Makefile.am
++++ libedit-20210910-3.1/doc/Makefile.am
 @@ -20,14 +20,14 @@ EL_MAN_LINKS = \
  		el_resize.3 \
  		el_set.3 \

libedit-20190324-3.1.tar.gz

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

libedit-20210910-3.1.tar.gz

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

libedit.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Dec  5 21:43:39 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 20210910:
+  * all: sync with upstream source
+  * see http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit
+- drop libedit-20180525-manpage-conflicts.patch (upstream)
+
 -------------------------------------------------------------------
 Thu Jul 16 11:04:44 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 

libedit.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libedit
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,24 +16,20 @@
 #
 
 
-%define pkg_version 20190324-3.1
-%define soname 0
-%define library_name libedit%{soname}
+%define pkg_version 20210910-3.1
+%define sover 0
 Name:           libedit
-Version:        3.1.snap20180525
+Version:        20210910.3.1
 Release:        0
 Summary:        Command Line Editing and History Library
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
-URL:            http://www.thrysoee.dk/editline/
-Source:         http://thrysoee.dk/editline/libedit-%{pkg_version}.tar.gz
+URL:            https://www.thrysoee.dk/editline/
+Source0:        https://www.thrysoee.dk/editline/libedit-%{pkg_version}.tar.gz
 Source1:        README.SUSE
 Source2:        baselibs.conf
-# PATCH-FIX-UPSTREAM libedit-20180525-manpage-conflicts.patch
 Patch0:         libedit-20180525-manpage-conflicts.patch
-#BuildRequires:  gcc-c++
 # For patch0
-BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -44,13 +40,13 @@ 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.
 
-%package -n %{library_name}
+%package -n libedit%{sover}
 Summary:        Command Line Editing and History Library
 Group:          System/Libraries
 Provides:       %{name} = %{version}-%{release}
 Obsoletes:      %{name} < %{version}
 
-%description -n %{library_name}
+%description -n libedit%{sover}
 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.
@@ -58,9 +54,9 @@ at a terminal prompt.
 %package -n libedit-devel
 Summary:        Development files for libedit
 Group:          Development/Libraries/C and C++
-Requires:       %{library_name} = %{version}
 Requires:       glibc-devel
-Provides:       %{library_name}-devel = %{version}-%{release}
+Requires:       libedit%{sover} = %{version}
+Provides:       libedit%{sover}-devel = %{version}-%{release}
 
 %description -n libedit-devel
 libedit is a command line editing and history library. It is designed
@@ -70,27 +66,26 @@ at a terminal prompt.
 This package holds the development files for libedit.
 
 %prep
-%setup -q -n %{name}-%{pkg_version}
+%autosetup -p1 -n %{name}-%{pkg_version}
 cp %{SOURCE1} .
-%patch0 -p1
 
 %build
 autoreconf -fiv
 %configure \
   --disable-static \
   --disable-silent-rules
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%post   -n %{library_name} -p /sbin/ldconfig
-%postun -n %{library_name} -p /sbin/ldconfig
+%post   -n libedit%{sover} -p /sbin/ldconfig
+%postun -n libedit%{sover} -p /sbin/ldconfig
 
-%files -n %{library_name}
-%{_libdir}/libedit.so.%{soname}
-%{_libdir}/libedit.so.%{soname}.*
+%files -n libedit%{sover}
+%{_libdir}/libedit.so.%{sover}
+%{_libdir}/libedit.so.%{sover}.*
 %{_mandir}/man5/editrc.5%{?ext_man}
 %license COPYING
 %doc ChangeLog