From 555aba99d98b1bfe8051a2f6d266c37eedc7d709acaaf54d3aef5dbcbd3f122f Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 31 Jan 2018 12:46:53 +0000 Subject: [PATCH] check script does not support macro inside Source. Hardcode major version. OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=364 --- python-libmount.spec | 5 ++--- util-linux-systemd.spec | 5 ++--- util-linux.spec | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/python-libmount.spec b/python-libmount.spec index 510e7dc..9174caa 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -117,7 +117,6 @@ BuildRequires: libmount-devel %endif #END SECOND STAGE DEPENDENCIES Version: 2.31.1 -%define major_version %(echo '%{version}' | (IFS='.' ; read MAJOR MINOR RELEASE ; echo $MAJOR.$MINOR) ) Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -126,7 +125,7 @@ Release: 0 # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -Source: https://www.kernel.org/pub/linux/utils/util-linux/v%{major_version}/util-linux-%{version}.tar.xz +Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source4: raw.service Source5: etc.raw @@ -136,7 +135,7 @@ Source8: login.pamd Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: https://www.kernel.org/pub/linux/utils/util-linux/v%{major_version}/util-linux-%{version}.tar.sign +Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-%{version}.tar.sign Source13: %{_name}.keyring Source14: runuser.pamd # klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050 diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 5a2ebb7..9463dcc 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -117,7 +117,6 @@ BuildRequires: libmount-devel %endif #END SECOND STAGE DEPENDENCIES Version: 2.31.1 -%define major_version %(echo '%{version}' | (IFS='.' ; read MAJOR MINOR RELEASE ; echo $MAJOR.$MINOR) ) Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -126,7 +125,7 @@ Release: 0 # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -Source: https://www.kernel.org/pub/linux/utils/util-linux/v%{major_version}/util-linux-%{version}.tar.xz +Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source4: raw.service Source5: etc.raw @@ -136,7 +135,7 @@ Source8: login.pamd Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: https://www.kernel.org/pub/linux/utils/util-linux/v%{major_version}/util-linux-%{version}.tar.sign +Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-%{version}.tar.sign Source13: %{_name}.keyring Source14: runuser.pamd # klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050 diff --git a/util-linux.spec b/util-linux.spec index fceb98a..bd65ce8 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -117,7 +117,6 @@ BuildRequires: libmount-devel %endif #END SECOND STAGE DEPENDENCIES Version: 2.31.1 -%define major_version %(echo '%{version}' | (IFS='.' ; read MAJOR MINOR RELEASE ; echo $MAJOR.$MINOR) ) Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -126,7 +125,7 @@ Release: 0 # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -Source: https://www.kernel.org/pub/linux/utils/util-linux/v%{major_version}/util-linux-%{version}.tar.xz +Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source4: raw.service Source5: etc.raw @@ -136,7 +135,7 @@ Source8: login.pamd Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: https://www.kernel.org/pub/linux/utils/util-linux/v%{major_version}/util-linux-%{version}.tar.sign +Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-%{version}.tar.sign Source13: %{_name}.keyring Source14: runuser.pamd # klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050