Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at 2020-12-07 14:59:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bash (Old) and /work/SRC/openSUSE:Factory/.bash.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bash" Mon Dec 7 14:59:49 2020 rev:167 rq:852327 version:5.0.18 Changes: -------- --- /work/SRC/openSUSE:Factory/bash/bash.changes 2020-10-08 13:05:44.394822368 +0200 +++ /work/SRC/openSUSE:Factory/.bash.new.5913/bash.changes 2020-12-07 14:59:51.544682099 +0100 @@ -1,0 +2,10 @@ +Thu Nov 19 15:47:13 UTC 2020 - Ludwig Nussel <[email protected]> + +- remove obsolete info macros + +------------------------------------------------------------------- +Fri Oct 16 07:08:31 UTC 2020 - Ludwig Nussel <[email protected]> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.KUTOiB/_old 2020-12-07 14:59:53.236683869 +0100 +++ /var/tmp/diff_new_pack.KUTOiB/_new 2020-12-07 14:59:53.240683873 +0100 @@ -88,9 +88,11 @@ BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun): update-alternatives +Provides: /bin/bash +Provides: /bin/sh %global _sysconfdir /etc %global _incdir %{_includedir} -%global _ldldir /%{_lib}/bash +%global _ldldir /%{_libdir}/bash %global _minsh 0 %description @@ -105,7 +107,6 @@ Group: Documentation/HTML Provides: bash:%{_infodir}/bash.info.gz Supplements: packageand(bash:patterns-base-documentation) -PreReq: %install_info_prereq BuildArch: noarch %description doc @@ -192,6 +193,17 @@ whoami Print out username of current user. +%if 0%{?usrmerged} +%package legacybin +Summary: Legacy usrmove helper files +Group: System/Shells +Requires: bash = %{version}-%{release} +Requires: this-is-only-for-build-envs +Conflicts: rpmlib(X-CheckUnifiedSystemdir) + +%description legacybin +Legacy usrmove helper files for the build system. Do not install. +%endif %prep %if %{with sjis} @@ -440,13 +452,11 @@ %install %make_install - make -C examples/loadables/ install-supported DESTDIR=%{buildroot} libdir=/%{_lib} + make -C examples/loadables/ install-supported DESTDIR=%{buildroot} libdir=%{_libdir} mv -vf %{buildroot}%{_ldldir}/*.h %{buildroot}%{_includedir}/bash/ mv -vf %{buildroot}%{_ldldir}/*.inc %{buildroot}%{_datadir}/bash - rm -rf %{buildroot}%{_libdir}/bash rm -rf %{buildroot}/%{_lib}/pkgconfig sed -ri '/CC = gcc/s@(CC = gcc).*@\1@' %{buildroot}%{_libdir}/pkgconfig/bash.pc - mkdir -p %{buildroot}/bin mkdir -p %{buildroot}%{_sysconfdir}/alternatives # # It should be noted that the move of /bin/bash to /usr/bin/bash @@ -454,6 +464,7 @@ # remains here :( # The same had happen for the system POSIX shell /bin/sh # + mkdir -p %{buildroot}/bin ln -sf %{_bindir}/bash %{buildroot}/bin/bash ln -sf %{_bindir}/sh %{buildroot}/bin/sh ln -sf bash %{buildroot}%{_bindir}/rbash @@ -495,24 +506,18 @@ %fdupes -s %{buildroot}%{_datadir}/bash/helpfiles sed -ri '1{ s@/bin/sh@/bin/bash@ }' %{buildroot}%{_bindir}/bashbug -%post -p /bin/bash +%post -p /usr/bin/bash %{_sbindir}/update-alternatives --quiet --force \ --install %{_bindir}/sh sh %{_bindir}/bash 10100 -%preun -p /bin/bash +%preun -p /usr/bin/bash if test "$1" = 0; then %{_sbindir}/update-alternatives --quiet --remove sh %{_bindir}/bash fi -%post doc -%install_info --info-dir=%{_infodir} %{_infodir}/bash.info.gz - -%preun doc -%install_info_delete --info-dir=%{_infodir} %{_infodir}/bash.info.gz - %clean -LD_LIBRARY_PATH=%{buildroot}/%{_lib} \ -ldd -u -r %{buildroot}/bin/bash || true +LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ +ldd -u -r %{buildroot}%{_bindir}/bash || true %{?buildroot: %__rm -rf %{buildroot}} %files @@ -523,8 +528,10 @@ %config %attr(644,root,root) %{_sysconfdir}/skel/.profile %ghost %config %{_sysconfdir}/alternatives/sh %dir %{_sysconfdir}/bash_completion.d +%if !0%{?usrmerged} /bin/bash /bin/sh +%endif %{_bindir}/bash %{_bindir}/bashbug %{_bindir}/rbash @@ -560,4 +567,10 @@ %defattr(-,root,root) %{_ldldir} +%if 0%{?usrmerged} +%files legacybin +/bin/bash +/bin/sh +%endif + %changelog _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
