SPECS/gvisor-tap-vsock.spec

@@ -1,13 +1,3 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 1;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
-
 %global with_debug 1
 
 %if 0%{?with_debug}
@@ -19,34 +9,12 @@
 
 %global gomodulesmode GO111MODULE=on
 
-%global _gvisor_installdir %{_libexecdir}/podman
-
-%global desc_gvforwarder Forward traffic from a tap interface over vsock
-
 Name: gvisor-tap-vsock
-%if %{defined copr_username}
-Epoch: 103
-%else
 Epoch: 6
-%endif
-# DO NOT TOUCH the Version string!
-# The TRUE source of this specfile is:
-# https://github.com/containers/podman/blob/main/rpm/podman.spec
-# If that's what you're reading, Version must be 0, and will be updated by Packit for
-# copr and koji builds.
-# If you're reading this on dist-git, the version is automatically filled in by Packit.
 Version: 0.7.5
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT
-%if %{defined autorelease}
-Release: %autorelease
-%else
-Release: 1
-%endif
-%if %{defined golang_arches_future}
+Release: 1%{?dist}
 ExclusiveArch: %{golang_arches_future}
-%else
-ExclusiveArch: aarch64 ppc64le s390x x86_64
-%endif
 Summary: Go replacement for libslirp and VPNKit
 URL: https://github.com/containers/%{name}
 # All SourceN files fetched from upstream
@@ -57,34 +25,17 @@ BuildRequires: glibc-devel
 BuildRequires: glibc-static
 BuildRequires: golang
 BuildRequires: git-core
-%if %{defined rhel} && 0%{?rhel} == 8
-BuildRequires: go-srpm-macros
-%else
 BuildRequires: go-rpm-macros
-%endif
 BuildRequires: make
-%if %{defined copr_username}
-Obsoletes: podman-gvproxy < 102:4.7.0-1
-%else
 Obsoletes: podman-gvproxy < 5:4.7.0-1
-%endif
 Provides: podman-gvproxy = %{epoch}:%{version}-%{release}
-Requires: %{name}-gvforwarder = %{epoch}:%{version}-%{release}
 
 %description
 A replacement for libslirp and VPNKit, written in pure Go.
-It is based on the network stack of gVisor. Compared to libslirp,
-gvisor-tap-vsock brings a configurable DNS server and
-dynamic port forwarding.
-
-%package gvforwarder
-Summary: %{desc_gvforwarder}
-Provides: gvforwarder = %{epoch}:%{version}-%{release}
-Obsoletes: %{name} < 6:0.7.0-6
-Recommends: %{name} = %{epoch}:%{version}-%{release}
-
-%description gvforwarder
-%{desc_gvforwarder}
+It is based on the network stack of gVisor and is used to provide
+networking for podman-machine virtual machines. Compared to libslirp,
+gvisor-tap-vsock brings a configurable DNS server and dynamic
+port forwarding.
 
 %prep
 %autosetup -Sgit -n %{name}-%{version}
@@ -111,9 +62,9 @@ LDFLAGS=''
 
 %install
 # install gvproxy
-install -dp %{buildroot}%{_gvisor_installdir}
-install -p -m0755 bin/gvproxy %{buildroot}%{_gvisor_installdir}
-install -p -m0755 bin/gvforwarder %{buildroot}%{_gvisor_installdir}
+install -dp %{buildroot}%{_libexecdir}/podman
+install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/podman
+install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/podman
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -121,56 +72,42 @@ install -p -m0755 bin/gvforwarder %{buildroot}%{_gvisor_installdir}
 %files
 %license LICENSE
 %doc README.md
-%dir %{_gvisor_installdir}
-%{_gvisor_installdir}/gvproxy
-
-%files gvforwarder
-%dir %{_gvisor_installdir}
-%{_gvisor_installdir}/gvforwarder
+%dir %{_libexecdir}/podman
+%{_libexecdir}/podman/gvproxy
+%{_libexecdir}/podman/gvforwarder
 
 %changelog
-## START: Generated by rpmautospec
 * Tue Aug 27 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.5-1
-- gvisor-tap-vsock-0.7.5-1.el10
-- update to https://github.com/containers/gvisor-tap-
-  vsock/releases/tag/v0.7.5
-- Related: RHEL-34195
-
-* Tue Aug 06 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.4-1
-- Update to 0.7.4 upstream release
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6:0.7.3-4
-- Bump release for June 2024 mass rebuild
-
-* Tue Jun 04 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.3-3
-- Add gating.yaml, Related: RHEL-39410
-
-* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 6:0.7.3-2
-- Rebuild for golang 1.22.0
-
-* Tue Feb 06 2024 Packit <hello@packit.dev> - 6:0.7.3-1
-- [packit] 0.7.3 upstream release
+- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.5
+- Related: RHEL-27608
 
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6:0.7.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Mon Aug 05 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.4-1
+- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.4
+- Related: RHEL-27608
 
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6:0.7.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Mon Feb 12 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.3-2
+- Add gating.yaml
+- Related: Jira:RHEL-2112
 
-* Wed Jan 17 2024 Packit <hello@packit.dev> - 6:0.7.2-1
-- [packit] 0.7.2 upstream release
+* Fri Feb 09 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.3-1
+- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.3
+- Related: RHEL-2112
 
-* Wed Sep 27 2023 Packit <hello@packit.dev> - 6:0.7.1-1
-- [packit] 0.7.1 upstream release
+* Wed Jan 31 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.2-2
+- Update description - thanks to Derrick Ornelas
+- Resolves: RHELPLAN-168385
 
-* Wed Sep 13 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 6:0.7.0-6
-- obsolete older package correctly
+* Fri Jan 19 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.2-1
+- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.2
+- Related: RHEL-2112
 
-* Wed Sep 13 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 6:0.7.0-5
-- obsolete gvisor-tap-vsock correctly
+* Mon Oct 02 2023 Jindrich Novy <jnovy@redhat.com> - 6:0.7.1-1
+- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.1
+- Related: Jira:RHEL-2112
 
-* Tue Sep 12 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 6:0.7.0-4
-- move gvforwarder binary to a new gvforwarder subpackage
+* Wed Sep 27 2023 Jindrich Novy <jnovy@redhat.com> - 6:0.7.0-2
+- initial import
+- Resolves: Jira:RHELPLAN-167882
 
 * Tue Aug 01 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 6:0.7.0-3
 - correctly obsolete older podman-gvproxy
@@ -180,4 +117,3 @@ install -p -m0755 bin/gvforwarder %{buildroot}%{_gvisor_installdir}
 
 * Tue Aug 01 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 6:0.7.0-1
 - Resolves: #2224434 - initial upload
-## END: Generated by rpmautospec