Hello community,
here is the log from the commit of package bash-completion for openSUSE:Factory
checked in at 2020-10-08 13:08:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bash-completion (Old)
and /work/SRC/openSUSE:Factory/.bash-completion.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bash-completion"
Thu Oct 8 13:08:41 2020 rev:51 rq:839531 version:2.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/bash-completion/bash-completion.changes
2020-08-23 09:19:19.674623567 +0200
+++
/work/SRC/openSUSE:Factory/.bash-completion.new.4249/bash-completion.changes
2020-10-08 13:09:43.991039291 +0200
@@ -1,0 +2,18 @@
+Mon Sep 28 15:32:10 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Convert to _multibuild. The pre_checkin.sh script was quite
+ broken anyway and it was less effort to convert than to try to
+ fix that one.
+
+-------------------------------------------------------------------
+Mon Sep 28 14:37:58 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Do not BuildRequire util-linux: there is no need to have this in
+ the build root.
+- Drop cmake BuildRequires: this is only here for the
+ /usr/share/cmake directory ownership, which in turn even causes
+ problems of left-over directories (e.g. install bash-completion,
+ on a system without cmake, uninstall bash-completion,
+ /usr/share/cmake remains left on the disk).
+
+-------------------------------------------------------------------
Old:
----
bash-completion-doc.changes
bash-completion-doc.spec
pre_checkin.sh
New:
----
_multibuild
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bash-completion.spec ++++++
--- /var/tmp/diff_new_pack.H5cU7P/_old 2020-10-08 13:09:44.747039975 +0200
+++ /var/tmp/diff_new_pack.H5cU7P/_new 2020-10-08 13:09:44.751039979 +0200
@@ -16,21 +16,34 @@
#
-# WARNING: After editing this file please call pre_checkin.sh to update
bash-completion-doc.spec.
-# Do not change %%build_core.
+%global flavor @BUILD_FLAVOR@%{nil}
+
+%if "%{flavor}" == "doc"
+%define build_core 0
+%define build_doc 1
+%define nsuffix -doc
+%else
%define build_core 1
-# Always set %%build_doc to 0 before submit to OBS.
%define build_doc 0
-Name: bash-completion
+%endif
+
+%global _name bash-completion
+Name: %{_name}%{?nsuffix}
Version: 2.11
Release: 0
+%if %{build_core}
Summary: Programmable Completion for Bash
License: GPL-2.0-or-later
+%else
+Summary: The Documentation of Programmable Completion for Bash
+License: GPL-2.0-or-later
+Provides: bash-completion:%{_defaultdocdir}/%{_name}/AUTHORS
+%endif
URL: https://github.com/scop/bash-completion/
-Source0:
https://github.com/scop/bash-completion/releases/download/%{version}/%{name}-%{version}.tar.xz
+Source0:
https://github.com/scop/bash-completion/releases/download/%{version}/%{_name}-%{version}.tar.xz
Source1: bash-completion-rpmlintrc
# PATCH-FIX-UPSTREAM bnc#717151 -- Terminal tab autocompletion error
-Patch0: %{name}-2.4.patch
+Patch0: %{_name}-2.4.patch
# PATCH-FIX-SUSE bnc#1012212 -- bash tab-autocompletion hangs on TAR-archiving
with --create key
Patch1: tar-completion.patch
# PATCH-FIX-SUSE bnc#903362 -- tab completion for file names prints error
@@ -63,12 +76,14 @@
BuildRequires: libxslt-tools
%endif
%if %{build_core}
-BuildRequires: cmake
-BuildRequires: util-linux
Requires: bash
%endif
-%if %{build_core}
+
%description
+%if %{build_doc}
+This package contains the package documentation file of the
+package bash-completion.
+%else
bash-completion is a collection of shell functions that take advantage
of the programmable completion feature of Bash 2.04 and later.
@@ -79,23 +94,10 @@
%description devel
This package contains the package configuration file of the
package bash-completion.
-
-%endif
-
-%if %{build_doc}
-%package doc
-Summary: The Documentation of Programmable Completion for Bash
-Provides: bash-completion:%{_defaultdocdir}/%{name}/AUTHORS
-BuildArch: noarch
-
-%description doc
-This package contains the package documentation file of the
-package bash-completion.
-
%endif
%prep
-%autosetup -p1
+%autosetup -p1 -n %{_name}-%{version}
%build
autoreconf -fiv
@@ -125,18 +127,12 @@
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/hwclock
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/ionice
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/look
-if test -e %{_datadir}/bash-completion/completions/mount
-then
- rm -vf %{buildroot}%{_datadir}/bash-completion/completions/mount
-fi
+rm -vf %{buildroot}%{_datadir}/bash-completion/completions/mount
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/newgrp
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/renice
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/rtcwake
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/su
-if test -e %{_datadir}/bash-completion/completions/umount
-then
- rm -vf %{buildroot}%{_datadir}/bash-completion/completions/umount
-fi
+rm -vf %{buildroot}%{_datadir}/bash-completion/completions/umount
# shipping in devscripts now
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/bts
# Seems to be broken (boo#1161136)
@@ -144,22 +140,23 @@
%endif
%if %{build_doc}
pushd doc
- mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/html
- install -m 0644 html/* %{buildroot}%{_defaultdocdir}/%{name}/html/
+ mkdir -p %{buildroot}%{_defaultdocdir}/%{_name}/html
+ install -m 0644 html/* %{buildroot}%{_defaultdocdir}/%{_name}/html/
popd
-install -m 0644 AUTHORS %{buildroot}%{_defaultdocdir}/%{name}/
-install -m 0644 README.md %{buildroot}%{_defaultdocdir}/%{name}/README
+install -m 0644 AUTHORS %{buildroot}%{_defaultdocdir}/%{_name}/
+install -m 0644 README.md %{buildroot}%{_defaultdocdir}/%{_name}/README
%endif
-%if %{build_core}
%files
+%if "%{flavor}" == "doc"
+%dir %{_defaultdocdir}/%{_name}
+%{_defaultdocdir}/%{_name}/AUTHORS
+%{_defaultdocdir}/%{_name}/README
+%{_defaultdocdir}/%{_name}/html/
+%else
%license COPYING
-%if %{build_doc}
-%exclude %{_defaultdocdir}/%{name}/AUTHORS
-%exclude %{_defaultdocdir}/%{name}/README
-%exclude %{_defaultdocdir}/%{name}/html/
-%endif
%{_datadir}/bash-completion
+%dir %{_datadir}/cmake
%{_datadir}/cmake/bash-completion
%config %{_sysconfdir}/profile.d/bash_completion.sh
@@ -169,16 +166,6 @@
# It would cause failure of directory ownership check.
# Own this directory to prevent it.
%dir %{_datadir}/bash-completion
-
-%endif
-
-%if %{build_doc}
-%files doc
-%dir %{_defaultdocdir}/%{name}
-%{_defaultdocdir}/%{name}/AUTHORS
-%{_defaultdocdir}/%{name}/README
-%{_defaultdocdir}/%{name}/html/
-
%endif
%changelog
++++++ _multibuild ++++++
<multibuild>
<flavor>doc</flavor>
</multibuild>
