From 6c8d9abb4446a59f08114e11d1e0e991015c74c738dd3dbcc83cf4e1b117df54 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 13 Jul 2016 16:08:18 +0000 Subject: [PATCH] Accepting request 407891 from home:dimstar:Factory - BuildIgnore util-linux: it's part of VMInstall, hence part of every package build. util-linux itself can be built without its own presence though. Helps with some rare bootstrap issues (when librtas changes soname for example). - Drop usage of gpg-offline: this has long been migrated to a source service that checks signatures on checkin already (osc service lr source_validatory). OBS-URL: https://build.opensuse.org/request/show/407891 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=313 --- python-libmount.changes | 11 +++++++++++ python-libmount.spec | 13 +++---------- util-linux-systemd.changes | 11 +++++++++++ util-linux-systemd.spec | 13 +++---------- util-linux.changes | 11 +++++++++++ util-linux.spec | 13 +++---------- 6 files changed, 42 insertions(+), 30 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index b98970d..b4f40fb 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 11 07:29:18 UTC 2016 - dimstar@opensuse.org + +- BuildIgnore util-linux: it's part of VMInstall, hence part of + every package build. util-linux itself can be built without its + own presence though. Helps with some rare bootstrap issues (when + librtas changes soname for example). +- Drop usage of gpg-offline: this has long been migrated to a + source service that checks signatures on checkin already (osc + service lr source_validatory). + ------------------------------------------------------------------- Mon Jun 13 11:37:33 UTC 2016 - dimstar@opensuse.org diff --git a/python-libmount.spec b/python-libmount.spec index 406f70a..9b5a6fd 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -44,7 +44,6 @@ Name: python-libmount %define build_util_linux_systemd 0 %define build_python_libmount 1 # To prevent dependency loops, verify signature only in third stage. -%define verify_sig 1 %define main_summary %summary_pl %define main_group %group_pl %else @@ -52,7 +51,6 @@ Name: python-libmount %define build_util_linux 0 %define build_util_linux_systemd 1 %define build_python_libmount 0 -%define verify_sig 0 %define main_summary %summary_uls %define main_group %group_uls %else @@ -62,12 +60,10 @@ Name: python-libmount %define build_util_linux 1 %define build_util_linux_systemd 1 %define build_python_libmount 1 -%define verify_sig 1 %else %define build_util_linux 1 %define build_util_linux_systemd 0 %define build_python_libmount 0 -%define verify_sig 0 %endif %endif %endif @@ -89,12 +85,12 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +# util-linux is part of VMInstall, but we can well build without it +# Helps shorten a cycle and eliminate a bootstrap issue +#!BuildIgnore: util-linux %ifarch ppc ppc64 ppc64le BuildRequires: librtas-devel %endif -%if %verify_sig -BuildRequires: gpg-offline -%endif %if %build_util_linux_systemd BuildRequires: socat BuildRequires: systemd-rpm-macros @@ -390,9 +386,6 @@ library. %endif %prep -%if %verify_sig -xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - -%endif %setup -q -n %{_name}-%{version} -b 40 %patch -p1 %patch4 -p1 diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index b98970d..b4f40fb 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 11 07:29:18 UTC 2016 - dimstar@opensuse.org + +- BuildIgnore util-linux: it's part of VMInstall, hence part of + every package build. util-linux itself can be built without its + own presence though. Helps with some rare bootstrap issues (when + librtas changes soname for example). +- Drop usage of gpg-offline: this has long been migrated to a + source service that checks signatures on checkin already (osc + service lr source_validatory). + ------------------------------------------------------------------- Mon Jun 13 11:37:33 UTC 2016 - dimstar@opensuse.org diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index d7fffed..ec91bf3 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -44,7 +44,6 @@ Name: util-linux-systemd %define build_util_linux_systemd 0 %define build_python_libmount 1 # To prevent dependency loops, verify signature only in third stage. -%define verify_sig 1 %define main_summary %summary_pl %define main_group %group_pl %else @@ -52,7 +51,6 @@ Name: util-linux-systemd %define build_util_linux 0 %define build_util_linux_systemd 1 %define build_python_libmount 0 -%define verify_sig 0 %define main_summary %summary_uls %define main_group %group_uls %else @@ -62,12 +60,10 @@ Name: util-linux-systemd %define build_util_linux 1 %define build_util_linux_systemd 1 %define build_python_libmount 1 -%define verify_sig 1 %else %define build_util_linux 1 %define build_util_linux_systemd 0 %define build_python_libmount 0 -%define verify_sig 0 %endif %endif %endif @@ -89,12 +85,12 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +# util-linux is part of VMInstall, but we can well build without it +# Helps shorten a cycle and eliminate a bootstrap issue +#!BuildIgnore: util-linux %ifarch ppc ppc64 ppc64le BuildRequires: librtas-devel %endif -%if %verify_sig -BuildRequires: gpg-offline -%endif %if %build_util_linux_systemd BuildRequires: socat BuildRequires: systemd-rpm-macros @@ -389,9 +385,6 @@ library. %endif %prep -%if %verify_sig -xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - -%endif %setup -q -n %{_name}-%{version} -b 40 %patch -p1 %patch4 -p1 diff --git a/util-linux.changes b/util-linux.changes index b98970d..b4f40fb 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 11 07:29:18 UTC 2016 - dimstar@opensuse.org + +- BuildIgnore util-linux: it's part of VMInstall, hence part of + every package build. util-linux itself can be built without its + own presence though. Helps with some rare bootstrap issues (when + librtas changes soname for example). +- Drop usage of gpg-offline: this has long been migrated to a + source service that checks signatures on checkin already (osc + service lr source_validatory). + ------------------------------------------------------------------- Mon Jun 13 11:37:33 UTC 2016 - dimstar@opensuse.org diff --git a/util-linux.spec b/util-linux.spec index 8ad1021..f93e1ae 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -44,7 +44,6 @@ Name: util-linux %define build_util_linux_systemd 0 %define build_python_libmount 1 # To prevent dependency loops, verify signature only in third stage. -%define verify_sig 1 %define main_summary %summary_pl %define main_group %group_pl %else @@ -52,7 +51,6 @@ Name: util-linux %define build_util_linux 0 %define build_util_linux_systemd 1 %define build_python_libmount 0 -%define verify_sig 0 %define main_summary %summary_uls %define main_group %group_uls %else @@ -62,12 +60,10 @@ Name: util-linux %define build_util_linux 1 %define build_util_linux_systemd 1 %define build_python_libmount 1 -%define verify_sig 1 %else %define build_util_linux 1 %define build_util_linux_systemd 0 %define build_python_libmount 0 -%define verify_sig 0 %endif %endif %endif @@ -89,12 +85,12 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +# util-linux is part of VMInstall, but we can well build without it +# Helps shorten a cycle and eliminate a bootstrap issue +#!BuildIgnore: util-linux %ifarch ppc ppc64 ppc64le BuildRequires: librtas-devel %endif -%if %verify_sig -BuildRequires: gpg-offline -%endif %if %build_util_linux_systemd BuildRequires: socat BuildRequires: systemd-rpm-macros @@ -389,9 +385,6 @@ library. %endif %prep -%if %verify_sig -xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - -%endif %setup -q -n %{_name}-%{version} -b 40 %patch -p1 %patch4 -p1