The package rpms/skopeo.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/skopeo.git/commit/?id=e37c250df02....
Change:
+ExclusiveArch: %{go_arches}
Thanks.
Full change:
============
commit e37c250df02d69d73fa60994a0e5756dcde9c5e6
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu May 26 13:41:21 2022 -0400
build deb packages using debbuild
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
(cherry picked from commit 9845ad0ca66bee29a27d11824e3ac87f77d0abac)
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/skopeo.spec b/skopeo.spec
index 056ee84..3ead967 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -1,5 +1,9 @@
%global with_bundled 1
+%if "%{_vendor}" == "debbuild"
+%define gobuild(o:) GO111MODULE=off go build -buildmode pie -tags="
${BUILDTAGS:-}" -a -v -x %{?**};
+%endif
+
%if 0%{?fedora}
%global with_debug 1
%else
@@ -28,22 +32,37 @@
%global git0 https://%{import_path}
%global built_tag v1.8.0
-%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
-%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
Name: %{repo}
Epoch: %{conditional_epoch}
-Version: %{gen_version}
+Version: 1.8.0
+%if "%{_vendor}" == "debbuild"
+Maintainer: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
+License: ASL-2.0+
+Release: 0%{?dist}
+%else
+License: ASL 2.0 and BSD and ISC and MIT
Release: %autorelease
+%endif
Summary: Inspect container images and repositories on registries
-License: ASL 2.0 and BSD and ISC and MIT
URL: %{git0}
-ExclusiveArch: %{go_arches}
Source0: %{git0}/archive/%{built_tag}.tar.gz
+BuildRequires: go-md2man
+%if "%{_vendor}" == "debbuild"
+BuildRequires: git
+BuildRequires: golang
+BuildRequires: libassuan-dev
+BuildRequires: libbtrfs-dev
+BuildRequires: libglib2.0-dev
+BuildRequires: libgpgme-dev
+BuildRequires: pkg-config
+BuildRequires: libdevmapper-dev
+Requires: containers-common >= 4:1
+%else
+ExclusiveArch: %{go_arches}
BuildRequires: btrfs-progs-devel
BuildRequires: git-core
BuildRequires: golang >= 1.16.6
-BuildRequires: go-md2man
BuildRequires: go-rpm-macros
BuildRequires: gpgme-devel
BuildRequires: libassuan-devel
@@ -70,6 +89,7 @@ Provides:
bundled(golang(github.com/spf13/cobra)) = v1.3.0
Provides:
bundled(golang(github.com/spf13/pflag)) = v1.0.5
Provides:
bundled(golang(github.com/stretchr/testify)) = v1.7.0
Provides:
bundled(golang(github.com/syndtr/gocapability)) =
v0.0.0_20200815063812_42c35b437635
+%endif
%description
Command line utility to inspect images and repositories directly on Docker
@@ -94,14 +114,13 @@ Requires: squashfs-tools
This package contains system tests for %{name}
%prep
-%autosetup -Sgit -n %{name}-%{built_tag_strip}
+%autosetup -Sgit
sed -i 's/install-binary: bin\/%{name}/install-binary:/' Makefile
sed -i 's/install-docs: docs/install-docs:/' Makefile
%build
+%if "%{_vendor}" != "debbuild"
%set_build_flags
-export GOPATH=$(pwd)/_build:$(pwd)
-export CGO_CFLAGS=$CFLAGS
# These extra flags present in $CFLAGS have been skipped for now as they break the build
CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g')
@@ -110,15 +129,19 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed
's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an
%ifarch x86_64
export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection=full"
%endif
+%endif
+
+export GOPATH=$(pwd)/_build:$(pwd)
+export CGO_CFLAGS=$CFLAGS
# unset LDFLAGS earlier set from set_build_flags
LDFLAGS=''
mkdir _build
-pushd _build
+cd _build
mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s $(dirs +1 -l) src/%{import_path}
-popd
+ln -s ../../../../ src/%{import_path}
+cd ..
mv vendor src
@@ -151,4 +174,6 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
%{_datadir}/%{name}/test
%changelog
+%if "%{_vendor}" != "debbuild"
%autochangelog
+%endif
commit f3eb8afe2c662dfb772fd8c25a3dc7296d28a145
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon May 9 10:44:23 2022 -0400
try autochangelog
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
(cherry picked from commit 29829e37730f1fd62b72cbf688586de82e210e3e)
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/skopeo.spec b/skopeo.spec
index 6be5def..056ee84 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -151,7 +151,4 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
%{_datadir}/%{name}/test
%changelog
-#%%autochangelog
-* Thu Mar 24 2022 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1:1.7.0
-- bump to v1.7.0
-- autospec misbehaves if the git logs ever used an unescaped rpm macro
+%autochangelog
commit 374157e784355731ef4993f44aec67c2da362da7
Author: RH Container Bot <rhcontainerbot(a)fedoraproject.org>
Date: Mon May 9 13:08:51 2022 +0000
auto bump to v1.8.0
(cherry picked from commit ae218a8769176956fe74a610e2f759838670e3b1)
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index 5371d55..05ecfee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -299,3 +299,4 @@
/v1.6.0.tar.gz
/v1.6.1.tar.gz
/v1.7.0.tar.gz
+/v1.8.0.tar.gz
diff --git a/skopeo.spec b/skopeo.spec
index 911a6e4..6be5def 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -27,7 +27,7 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global git0 https://%{import_path}
-%global built_tag v1.7.0
+%global built_tag v1.8.0
%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
diff --git a/sources b/sources
index 668b3c5..99a4b80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.7.0.tar.gz) =
7d17f98e86677150fb2ddba9edae18d8b1ac8f06fba575268e6ba54c60f7b371b5e5a9eab1a4fe19da6c7e85eb79c1eef169ad2a39eff979130ee8d141bd8d6b
+SHA512 (v1.8.0.tar.gz) =
697242244e533b597f481005754301efed8581018cdc297e071fa24347301ddf6111d1f1d3ccc6e87e3e5a9ea606e9c6b40c47bf69d2df6b44336fb260f546de