Hello community, here is the log from the commit of package readline for openSUSE:Factory checked in at 2020-08-02 12:27:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/readline (Old) and /work/SRC/openSUSE:Factory/.readline.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "readline" Sun Aug 2 12:27:26 2020 rev:8 rq:821442 version:8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/readline/readline.changes 2020-02-21 16:39:57.337745039 +0100 +++ /work/SRC/openSUSE:Factory/.readline.new.3592/readline.changes 2020-08-02 12:27:28.631802815 +0200 @@ -1,0 +2,7 @@ +Thu Jul 16 19:13:54 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de> + +- add upstream keyring and verify source signature +- change custom handling of official upstream patches to standard, + and verify signatures on official patches + +------------------------------------------------------------------- Old: ---- readline-8.0-patches.tar.bz2 New: ---- readline-8.0.tar.gz.sig readline.keyring readline80-001 readline80-001.sig readline80-002 readline80-002.sig readline80-003 readline80-003.sig readline80-004 readline80-004.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ readline.spec ++++++ --- /var/tmp/diff_new_pack.MnMM80/_old 2020-08-02 12:27:31.871806146 +0200 +++ /var/tmp/diff_new_pack.MnMM80/_new 2020-08-02 12:27:31.875806150 +0200 @@ -16,51 +16,61 @@ # +%define rl_major 8 Name: readline -BuildRequires: autoconf -BuildRequires: fdupes -%if %suse_version > 1220 -BuildRequires: makeinfo -%endif -BuildRequires: ncurses-devel -BuildRequires: patchutils -BuildRequires: pkg-config -BuildRequires: sed -%define rextend %nil Version: 8.0 Release: 0 Summary: The readline library License: GPL-3.0-or-later Group: Development/Libraries/C and C++ -URL: http://www.gnu.org/software/readline/ +URL: https://www.gnu.org/software/readline/ # Git: http://git.savannah.gnu.org/cgit/bash.git -Source0: ftp://ftp.gnu.org/gnu/readline/readline-%{version}%{rextend}.tar.gz -Source1: readline-%{version}-patches.tar.bz2 +Source0: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz.sig Source2: baselibs.conf -Patch0: readline-%{version}.dif -Patch1: readline-6.3-input.dif -Patch2: readline-5.2-conf.patch -Patch3: readline-6.2-metamode.patch -Patch5: readline-6.2-xmalloc.dif -Patch6: readline-6.3-destdir.patch -Patch7: readline-6.3-rltrace.patch -Patch8: readline-7.0-screen.patch -%{expand: %%global rl_major %(echo %{version} | sed -r 's/.[0-9]+//g')} +Source4: https://tiswww.case.edu/php/chet/gpgkey.asc#/%{name}.keyring +# signatures for official patches +Source101: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-001.sig +Source102: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-002.sig +Source103: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-003.sig +Source104: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-004.sig +# official patches +Patch101: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-001 +Patch102: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-002 +Patch103: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-003 +Patch104: ftp://ftp.gnu.org/gnu/readline/readline-%{version}-patches/readline80-004 +# local patches +Patch200: readline-%{version}.dif +Patch201: readline-6.3-input.dif +Patch202: readline-5.2-conf.patch +Patch203: readline-6.2-metamode.patch +Patch205: readline-6.2-xmalloc.dif +Patch206: readline-6.3-destdir.patch +Patch207: readline-6.3-rltrace.patch +Patch208: readline-7.0-screen.patch +BuildRequires: autoconf +BuildRequires: fdupes +BuildRequires: ncurses-devel +BuildRequires: pkgconfig +# +%if 0%{?suse_version} > 1220 +BuildRequires: makeinfo +%endif %description The readline library is used by the Bourne Again Shell (bash, the standard command interpreter) for easy editing of command lines. This includes history and search functionality. -%package -n libreadline8 +%package -n libreadline%{rl_major} Summary: The Readline Library Group: System/Libraries -Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Suggests: readline-doc = %{version} +Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Provides: readline = %{version} Obsoletes: readline <= 6.3 -%description -n libreadline8 +%description -n libreadline%{rl_major} The readline library is used by the Bourne Again Shell (bash, the standard command interpreter) for easy editing of command lines. This includes history and search functionality. @@ -68,7 +78,7 @@ %package devel Summary: Development files for readline Group: Development/Libraries/C and C++ -Requires: libreadline8 = %{version} +Requires: libreadline%{rl_major} = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -88,9 +98,10 @@ %package doc Summary: Documentation how to Use and Program with the Readline Library Group: Documentation/Other +Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} +Supplements: (libreadline%{rl_major} and patterns-base-documentation) Provides: readline:%{_infodir}/readline.info.gz -Supplements: packageand(libreadline8:patterns-base-documentation) -PreReq: %install_info_prereq BuildArch: noarch %description doc @@ -98,27 +109,21 @@ as well as programming with the interface of the readline library. %prep -%setup -q -n readline-%{version}%{rextend} -b1 -for patch in ../readline-%{version}-patches/*; do - test -e $patch || break - let level=0 || true - file=$(lsdiff --files=1 $patch) - if test ! -e $file ; then - file=${file#*/} - let level++ || true - fi - sed -ri '/^\*\*\* \.\./{ s@\.\./readline-%{version}[^/]*/@@ }' $patch - echo Patch $patch - patch -s -p$level < $patch -done -%patch1 -p2 -b .zerotty -%patch2 -p2 -b .conf -%patch3 -p2 -b .metamode -%patch5 -p0 -b .xm -%patch6 -p0 -b .destdir -%patch7 -p2 -b .tmp -%patch8 -p2 -b .screen -%patch0 -p0 -b .0 +%setup -q +# official patches +%patch101 -b .001 +%patch102 -b .002 +%patch103 -b .003 +%patch104 -b .004 +# local patches +%patch201 -p2 -b .zerotty +%patch202 -p2 -b .conf +%patch203 -p2 -b .metamode +%patch205 -b .xm +%patch206 -b .destdir +%patch207 -p2 -b .tmp +%patch208 -p2 -b .screen +%patch200 -b .0 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -193,6 +198,7 @@ CFLAGS_FOR_BUILD="$CFLAGS" LDFLAGS_FOR_BUILD="$LDFLAGS" export CC_FOR_BUILD CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD CFLAGS LDFLAGS CC +# FIXME: you should use the %%configure macro ./configure --build=%{_target_cpu}-suse-linux \ --enable-static \ --enable-shared \ @@ -203,8 +209,8 @@ --infodir=%{_infodir} \ --docdir=%{_docdir}/%{name} \ --libdir=%{_libdir} -make -make documentation +%make_build +%make_build documentation %install %make_install htmldir=%{_docdir}/%{name} installdir=%{_docdir}/%{name}/examples \ @@ -224,10 +230,8 @@ %{buildroot}/%{_libdir}/pkgconfig/readline.pc rm -vrf %{buildroot}%{_datadir}/readline/ -%post -n libreadline8 -p /sbin/ldconfig - -%postun -n libreadline8 -p /sbin/ldconfig - +%post -n libreadline%{rl_major} -p /sbin/ldconfig +%postun -n libreadline%{rl_major} -p /sbin/ldconfig %post doc %install_info --info-dir=%{_infodir} %{_infodir}/history.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/readline.info.gz @@ -238,7 +242,7 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/readline.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/rluserman.info.gz -%files -n libreadline8 +%files -n libreadline%{rl_major} %license COPYING /%{_lib}/libhistory.so.%{rl_major} /%{_lib}/libhistory.so.%{version} @@ -256,11 +260,11 @@ %{_libdir}/libreadline.a %files doc -%doc %{_infodir}/history.info* -%doc %{_infodir}/readline.info* -%doc %{_infodir}/rluserman.info* -%doc %{_mandir}/man3/history.3* -%doc %{_mandir}/man3/readline.3* +%{_infodir}/history.info%{?ext_info} +%{_infodir}/readline.info%{?ext_info} +%{_infodir}/rluserman.info%{?ext_info} +%{_mandir}/man3/history.3%{?ext_man} +%{_mandir}/man3/readline.3%{?ext_man} %doc %{_docdir}/%{name}/ %changelog ++++++ readline-8.0-patches.tar.bz2 -> readline80-001 ++++++ Binary files /work/SRC/openSUSE:Factory/readline/readline-8.0-patches.tar.bz2 and /work/SRC/openSUSE:Factory/.readline.new.3592/readline80-001 differ ++++++ readline-8.0-patches.tar.bz2 -> readline80-002 ++++++ Binary files /work/SRC/openSUSE:Factory/readline/readline-8.0-patches.tar.bz2 and /work/SRC/openSUSE:Factory/.readline.new.3592/readline80-002 differ ++++++ readline-8.0-patches.tar.bz2 -> readline80-003 ++++++ Binary files /work/SRC/openSUSE:Factory/readline/readline-8.0-patches.tar.bz2 and /work/SRC/openSUSE:Factory/.readline.new.3592/readline80-003 differ ++++++ readline-8.0-patches.tar.bz2 -> readline80-004 ++++++ Binary files /work/SRC/openSUSE:Factory/readline/readline-8.0-patches.tar.bz2 and /work/SRC/openSUSE:Factory/.readline.new.3592/readline80-004 differ