update to v1.5.2

Signed-off-by: haozi007 <liuhao27@huawei.com>

skopeo.spec

@@ -20,8 +20,8 @@
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{import_path}
-%global commit0 63085f5bef1131aa9ec0907a5c8d66b67de7c4b2
+
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global build_version v1.5.2
 
 %define epoch 1
 
@@ -29,19 +29,19 @@ ExcludeArch: ppc64
 
 Name: %{repo}
 Epoch: 1
-Version: 1.1.0
+Version: 1.5.2
-Release: 7.dev.git%{shortcommit0}
+Release: 1
 Summary: Work with remote images registries - retrieving information, images, signing content
 License: ASL 2.0
-URL: https://github.com/containers/skopeo
+URL: %{git0}
-Source0: https://github.com/containers/skopeo/archive/v1.1.0.tar.gz
+Source0: %{git0}/archive/%{build_version}.tar.gz
 Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz
 Source2: registries.conf
 
-BuildRequires: go-srpm-macros golang git pkgconfig(devmapper) make
+BuildRequires: go-srpm-macros git-core pkgconfig(devmapper) make
+BuildRequires: golang >= 1.16.6
 BuildRequires: gpgme-devel libassuan-devel btrfs-progs-devel ostree-devel glib2-devel
 Requires: containers-common = %{epoch}:%{version}-%{release}
-
 Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
 Provides: bundled(golang(github.com/BurntSushi/toml)) = master
 Provides: bundled(golang(github.com/containerd/continuity)) = d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371
@@ -218,21 +218,21 @@ Obsoletes: atomic <= 1.13.1-2
 Conflicts: atomic-registries <= 1.22.1-1
 Obsoletes: docker-rhsubscription <= 2:1.13.1-31
 Provides: %{name}-containers = %{version}-%{release}
-Obsoletes: %{name}-containers <= 0.1.31-2
+Obsoletes: %{name}-containers <= %{version}-%{release}
 
 %description -n containers-common
 This package installs a default signature store configuration and a default
 policy under `/etc/containers/`.
 
 %prep
-%autosetup -Sgit -n %{name}-%{commit0}
+%autosetup -Sgit -n %{name}-%{version}
 tar -xf %SOURCE1
 
 %build
-cd go-md2man-*
+pushd go-md2man-*
 go build -mod=vendor -o go-md2man .
 export GOMD2MAN=$(realpath go-md2man)
-cd -
+popd
 mkdir -p src/github.com/containers
 ln -s ../../../ src/%{import_path}
 
@@ -246,22 +246,32 @@ done
 
 %if ! 0%{?with_bundled}
 rm -rf vendor/
-export GOPATH=$(pwd):%{gopath}
+export GOPATH=$(pwd)
 %else
-export GOPATH=$(pwd):$(pwd)/vendor:%{gopath}
+export GOPATH=$(pwd):$(pwd)/vendor
 %endif
 
+mkdir -p bin
 export GO111MODULE=off
-export GOPROXY=off
+
-go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d '  \n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x -o %{name} ./cmd/%{name}
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d '  \n') -extldflags '-Wl,-z,relro -Wl,-z,now '" -a -v -x -o bin/%{name} ./cmd/%{name}
 %{__make} docs
  
 %install
-make DESTDIR=%{buildroot} install
+make \
-mkdir -p %{buildroot}%{_sysconfdir}
+    PREFIX=%{buildroot}%{_prefix} \
+    install-docs install-completions
 
-mkdir -p %{buildroot}%{_datadir}/containers
+install -m0755 -d -p %{buildroot}%{_bindir}
+install -m0755 bin/skopeo %{buildroot}%{_bindir}/%{name}
+
+install -m0755 -d -p %{buildroot}%{_sysconfdir}/containers
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/containers/registries.conf
+install -m0755 -d -p %{buildroot}/var/lib/containers/sigstore
+install -m0755 -d -p %{buildroot}%{_sysconfdir}/containers/registries.d
+install -m0644 default.yaml %{buildroot}%{_sysconfdir}/containers/registries.d/default.yaml
+install -m0644 default-policy.json %{buildroot}%{_sysconfdir}/containers/policy.json
+
 
 # source codes for building projects
 %if 0%{?with_devel}
@@ -320,24 +330,29 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %endif
 
 %files -n containers-common
-%dir %{_sysconfdir}/containers
+%dir /etc/containers
-%config(noreplace) %{_sysconfdir}/containers/registries.conf
+%config(noreplace) /etc/containers/registries.conf
-%dir %{_sysconfdir}/containers/registries.d
+%dir /etc/containers/registries.d
-%config(noreplace) %{_sysconfdir}/containers/policy.json
+%config(noreplace) /etc/containers/registries.d/default.yaml
-%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
+%config(noreplace) /etc/containers/policy.json
-%dir %{_sharedstatedir}/containers/sigstore
+%dir /var/lib/containers/sigstore
-%dir %{_datadir}/containers
 
 %files
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}*
+%{_prefix}/share/man/man1/%{name}*
-%dir %{_datadir}/bash-completion
+%dir %{_prefix}/share/bash-completion
-%dir %{_datadir}/bash-completion/completions
+%dir %{_prefix}/share/bash-completion/completions
-%{_datadir}/bash-completion/completions/%{name}
+%{_prefix}/share/bash-completion/completions/%{name}
 
 %changelog
+* Mon Nov 29 2021 haozi007<liuhao27@huawei.com> - 1.1.0-7.dev.git63085f5
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:udpate skopeo to 1.5.2
+
 * Thu Nov 25 2021 haozi007<liuhao27@huawei.com> - 1.1.0-7.dev.git63085f5
 - Type:bugfix
 - ID:NA