From 8978f68f613493df05cbb918a3f881f52a7d882370d3248eff34b9ccccd5d10c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 6 Apr 2018 11:18:21 +0000 Subject: [PATCH 1/5] Accepting request 593953 from home:adamm:branches:Base:System - %install_info: if we are going to fail, at least fail on install not on attempted upgrades or uninstall [bsc#1084997] OBS-URL: https://build.opensuse.org/request/show/593953 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=456 --- rpm-suse_macros | 5 +---- rpm.changes | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index d681c28..7913bbd 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -222,11 +222,8 @@ # for %post %install_info(:-:) \ ALL_ARGS=(%{**}) \ - NUM_ARGS=${#ALL_ARGS[@]} \ if test -x /sbin/install-info ; then \ - if test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \ - /sbin/install-info "${ALL_ARGS[@]}" \ - fi \ + /sbin/install-info "${ALL_ARGS[@]}" \ fi ; # for %preun diff --git a/rpm.changes b/rpm.changes index 6e973ea..da2f820 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 6 10:05:18 UTC 2018 - adam.majer@suse.de + +- %install_info: if we are going to fail, at least fail on install + not on attempted upgrades or uninstall [bsc#1084997] + ------------------------------------------------------------------- Tue Mar 27 14:31:28 CEST 2018 - mls@suse.de From 8d96e2007a4512416115c297c32eccc228b6866b18e3af2e9cd13ba0a4f685b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 6 Apr 2018 11:32:18 +0000 Subject: [PATCH 2/5] ... OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=457 --- rpm-suse_macros | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index 7913bbd..413af76 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -231,7 +231,7 @@ test -n "$FIRST_ARG" || FIRST_ARG=$1 \ if test -x /sbin/install-info ; then \ if [ "$FIRST_ARG" = 0 ]; then \ - /sbin/install-info --quiet --delete %{**} \ + /sbin/install-info --quiet --delete %{**} || : \ fi ; \ fi ; From 2d16f5cbbb4cec181aeb9d5c3e10913a3a982d5a94eee1059e2bd52bb67706ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 6 Apr 2018 11:36:32 +0000 Subject: [PATCH 3/5] ... OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=458 --- python-rpm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-rpm.spec b/python-rpm.spec index eac0b12..6ca0189 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -41,7 +41,6 @@ BuildRequires: popt-devel BuildRequires: python-rpm-macros BuildRequires: xz-devel BuildRequires: zlib-devel -#!BuildIgnore: rpmlint-Factory Requires: rpm = %{version} %{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/rpm.spec)} %if "%{python_flavor}" == "python2" From 12ab3f3293a12f0255debb8fdcab2f974a4c6f3e3d648ede9231640ecf424ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 6 Apr 2018 12:12:03 +0000 Subject: [PATCH 4/5] - remove rpmlint-Factory buildignore OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=459 --- python-rpm.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-rpm.changes b/python-rpm.changes index 724aedc..f7b225e 100644 --- a/python-rpm.changes +++ b/python-rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 6 14:11:01 CEST 2018 - mls@suse.de + +- remove rpmlint-Factory buildignore + ------------------------------------------------------------------- Tue Mar 20 13:59:45 UTC 2018 - tchvatal@suse.com From c7d12891285a2d74a6d0181a22bf81c230bd30caa448b15c9ea54aba5b076836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 6 Apr 2018 12:17:21 +0000 Subject: [PATCH 5/5] update OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=460 --- rpm-suse_macros | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index 413af76..cad114f 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -223,7 +223,7 @@ %install_info(:-:) \ ALL_ARGS=(%{**}) \ if test -x /sbin/install-info ; then \ - /sbin/install-info "${ALL_ARGS[@]}" \ + /sbin/install-info "${ALL_ARGS[@]}" || : \ fi ; # for %preun