From 9cfa4f6611a0adf59b1ef38289caa290be7df9fd Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Fri, 28 Apr 2023 09:00:16 -0500 Subject: [PATCH] Revert "Use forge source" This reverts commit 6b3daa415ea1ab964126ff7fa1935e35f2ae857b. Thanks to Neal for telling me about the forge source pending deprecation[0]. I was unaware. [0] https://pagure.io/packaging-committee/pull-request/1270 Signed-off-by: Major Hayden --- cloud-init.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/cloud-init.spec b/cloud-init.spec index 7204fa4..c91b53c 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,16 +1,11 @@ -%global srcname cloud-init -%global forgeurl https://github.com/canonical/cloud-init +Name: cloud-init Version: 23.1.2 -%global tag %{version} -%forgemeta - -Name: %{srcname} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Cloud instance init scripts License: ASL 2.0 or GPLv3 -URL: %forgeurl +URL: http://launchpad.net/cloud-init -Source0: %forgesource +Source0: https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz Source1: cloud-init-tmpfiles.conf # https://github.com/canonical/cloud-init/pull/2073 @@ -90,7 +85,7 @@ ssh keys and to let the user run various scripts. %prep -%forgeautosetup -p1 +%autosetup -p1 # Change shebangs sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \ @@ -188,9 +183,6 @@ python3 -m pytest tests/unittests %changelog -* Fri Apr 28 2023 Major Hayden - 23.1.2-2 -- Switch to forge source - * Thu Apr 27 2023 Major Hayden - 23.1.2-1 - Update to 23.1.2 - Includes fix for CVE-2023-1786