Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreadline5 for openSUSE:Factory checked in at 2021-09-30 23:43:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreadline5 (Old) and /work/SRC/openSUSE:Factory/.libreadline5.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreadline5" Thu Sep 30 23:43:46 2021 rev:22 rq:922341 version:5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreadline5/libreadline5.changes 2019-09-05 12:03:14.291932196 +0200 +++ /work/SRC/openSUSE:Factory/.libreadline5.new.2443/libreadline5.changes 2021-09-30 23:45:05.640586073 +0200 @@ -1,0 +2,5 @@ +Thu Sep 30 10:18:22 UTC 2021 - Dr. Werner Fink + +- Move to /usr for UsrMerge (boo#1191091) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreadline5.spec ++++++ --- /var/tmp/diff_new_pack.7LjMyx/_old 2021-09-30 23:45:06.144586650 +0200 +++ /var/tmp/diff_new_pack.7LjMyx/_new 2021-09-30 23:45:06.144586650 +0200 @@ -1,7 +1,7 @@ # # spec file for package libreadline5 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -24,7 +24,7 @@ Summary: The Readline Library License: GPL-2.0-or-later Group: System/Libraries -Url: http://www.gnu.org/software/bash/bash.html +URL: http://www.gnu.org/software/bash/bash.html Source0: readline-%{rl_vers}.tar.bz2 Source1: readline-%{rl_vers}-patches.tar.bz2 Source2: baselibs.conf @@ -49,7 +49,6 @@ standard command interpreter) for easy editing of command lines. This includes history and search functionality. - %package -n readline5-devel Summary: Development files for the readline library version 5 Group: Development/Libraries/C and C++ @@ -64,7 +63,6 @@ This package contains all necessary include files and libraries needed to develop applications that require these. - %prep %setup -q -n readline-%{rl_vers} for p in ../readline-%{rl_vers}-patches/*; do @@ -79,7 +77,7 @@ %patch20 -p0 %build -%global _lto_cflags %{_lto_cflags} -ffat-lto-objects +%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects autoconf cflags () { @@ -130,6 +128,7 @@ %install make install htmldir=%{_defaultdocdir}/readline DESTDIR=%{buildroot} +%if !0%{?usrmerged} make install-shared libdir=/%{_lib} linkagedir=%{_libdir} DESTDIR=%{buildroot} rm -rf %{buildroot}%{_defaultdocdir}/bash rm -rf %{buildroot}%{_defaultdocdir}/readline @@ -140,6 +139,16 @@ # remove unpackaged files rm -fv %{buildroot}%{_libdir}/libhistory.so.* rm -fv %{buildroot}%{_libdir}/libreadline.so.* +%else + make install-shared libdir=%{_libdir} linkagedir=%{_libdir} DESTDIR=%{buildroot} + rm -rf %{buildroot}%{_defaultdocdir}/bash + rm -rf %{buildroot}%{_defaultdocdir}/readline + chmod 0755 %{buildroot}%{_libdir}/libhistory.so.%{rl_vers} + chmod 0755 %{buildroot}%{_libdir}/libreadline.so.%{rl_vers} + rm -f %{buildroot}%{_libdir}/libhistory.so.%{rl_vers}*old + rm -f %{buildroot}%{_libdir}/libreadline.so.%{rl_vers}*old +%endif + # remove unpackaged files rm -fv %{buildroot}%{_mandir}/man3/history.3* rm -fv %{buildroot}%{_infodir}/*.info* rm -rfv %{buildroot}%{_infodir}/dir @@ -149,7 +158,7 @@ # mv %{buildroot}%{_incdir}/readline %{buildroot}%{_incdir}/readline5 mkdir %{buildroot}%{_libdir}/readline5 -for lib in %{buildroot}%{_libdir}/lib*.* +for lib in %{buildroot}%{_libdir}/lib*.{a,so} do mv $lib %{buildroot}%{_libdir}/readline5/ done @@ -161,11 +170,22 @@ %files %defattr(-,root,root) +%if %{defined license} +%license COPYING +%else %doc COPYING +%endif +%if !0%{?usrmerged} /%{_lib}/libhistory.so.5 /%{_lib}/libhistory.so.%{rl_vers} /%{_lib}/libreadline.so.5 /%{_lib}/libreadline.so.%{rl_vers} +%else +%{_libdir}/libhistory.so.5 +%{_libdir}/libhistory.so.%{rl_vers} +%{_libdir}/libreadline.so.5 +%{_libdir}/libreadline.so.%{rl_vers} +%endif %files -n readline5-devel %defattr(-,root,root)