Tomohiro "Tomo-p" KATO 2 роки тому
батько
коміт
e813df8f6b
1 змінених файлів з 18 додано та 12 видалено
  1. 18 12
      lib/libe/libedit/libedit-vl.spec

+ 18 - 12
lib/libe/libedit/libedit-vl.spec

@@ -1,16 +1,23 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-%define snap 20210216
+%define snap 20210714
 
 Summary:	The NetBSD Editline library
 Summary(ja):	NetBSD Editline ライブラリ
 Name:		libedit
 Version:	3.1
-Release:	5.%{snap}%{?_dist_release}
+Release:	6.%{snap}%{?_dist_release}
 Group:		system
 
 License:	BSD
 URL:		http://thrysoee.dk/editline/
 Source0:	http://thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
+# Version 20210419 changes internal symbols named libedit_strlcat and
+# libedit_strlcpy to plain strlcat and strlcpy.  None of those symbols are
+# mentioned in the public header files.  Many projects check for the existence
+# of functions named strlcat and strlcpy.  I am not prepared to deal with the
+# possible fallout of those functions suddenly existing in a low-level Fedora
+# library, so restore the old names for now.
+Patch0:         %{name}-strlcat.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	gawk
@@ -65,6 +72,10 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q -n %{name}-%{snap}-%{version}
+%autopatch -p0
+
+# Fix unused direct shared library dependencies.
+sed -i "s/lncurses/ltinfo/" configure
 
 # Suppress rpmlint error.
 iconv --from-code ISO8859-1 --to-code UTF-8 ./ChangeLog \
@@ -72,7 +83,7 @@ iconv --from-code ISO8859-1 --to-code UTF-8 ./ChangeLog \
 
 
 %build
-%configure --disable-static --enable-widec
+%configure --disable-static --disable-silent-rules
 
 # Trying to omit unused direct shared library dependencies leads to
 # undefined non-weak symbols.
@@ -93,15 +104,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%if %{build_compat32}
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
-%endif
-
-
 %files
 %defattr(-,root,root,-)
 %license COPYING
@@ -133,6 +135,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1-6.20210714
+- updated to 3.1-20210714.
+- dropped ldconfig scriptlets.
+
 * Sun Feb 21 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1-5.20210216
 - updated to 3.1-20210216.