diff --git a/0001-Set-build-date-from-SOURCE_DATE_EPOCH.patch b/0001-Set-build-date-from-SOURCE_DATE_EPOCH.patch deleted file mode 100644 index a4be429..0000000 --- a/0001-Set-build-date-from-SOURCE_DATE_EPOCH.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2098a5128565a72fc1886e996a444cc111e43c36 Mon Sep 17 00:00:00 2001 -From: Witek Bedyk -Date: Tue, 26 Apr 2022 17:21:46 +0200 -Subject: [PATCH] Set build date from SOURCE_DATE_EPOCH - -Allow to override build date with SOURCE_DATE_EPOCH -in order to make builds reproducible. -See https://reproducible-builds.org/ for why this is good -and https://reproducible-builds.org/specs/source-date-epoch/ -for the definition of this variable. - -This PR was done while working on [reproducible builds for -openSUSE](https://en.opensuse.org/openSUSE:Reproducible_Builds). - -Signed-off-by: Witek Bedyk ---- - cmd/build.go | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/cmd/build.go b/cmd/build.go -index 18f1c5e..694b964 100644 ---- a/cmd/build.go -+++ b/cmd/build.go -@@ -20,6 +20,7 @@ import ( - "log" - "os" - "path" -+ "strconv" - "strings" - "text/template" - "time" -@@ -146,10 +147,17 @@ func getLdflags(info repository.Info) string { - var ldflags []string - - if len(strings.TrimSpace(config.Build.LDFlags)) > 0 { -+ var buildDate time.Time -+ unixBuildDate, err := strconv.ParseInt(os.Getenv("SOURCE_DATE_EPOCH"), 10, 64) -+ if err == nil { -+ buildDate = time.Unix(unixBuildDate, 0) -+ } else { -+ buildDate = time.Now() -+ } - var ( - tmplOutput = new(bytes.Buffer) - fnMap = template.FuncMap{ -- "date": time.Now().UTC().Format, -+ "date": buildDate.UTC().Format, - "host": os.Hostname, - "repoPath": RepoPathFunc, - "user": UserFunc, --- -2.34.1 - diff --git a/_service b/_service index 2535a10..8772251 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git @PARENT_TAG@ - v0.13.0 + v0.14.0 v(.*) enable @@ -16,6 +16,6 @@ promu - promu-0.13.0.tar.gz + promu-0.14.0.tar.gz diff --git a/_servicedata b/_servicedata index ff36b6d..39c75f7 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/prometheus/promu.git - b1a2edae78614c8b0ae9e2faa88d14098e96f6d2 \ No newline at end of file + a880d9756ae466605040585bc3b15005b55cc9f6 \ No newline at end of file diff --git a/golang-github-prometheus-promu.changes b/golang-github-prometheus-promu.changes index 9a53133..885ef46 100644 --- a/golang-github-prometheus-promu.changes +++ b/golang-github-prometheus-promu.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jan 10 16:18:52 UTC 2023 - kastl@b1-systems.de + +- Update to version 0.14.0: + * Add the ability to override tags per GOOS + * Remove ioutil + * Update common Prometheus files (#232) (#224) + * Validate environment variable value + * Set build date from SOURCE_DATE_EPOCH +- drop patch 0001-Set-build-date-from-SOURCE_DATE_EPOCH.patch that is + included upstream now + ------------------------------------------------------------------- Mon Oct 31 14:17:46 UTC 2022 - Witek Bedyk diff --git a/golang-github-prometheus-promu.spec b/golang-github-prometheus-promu.spec index abcf42b..11a7264 100644 --- a/golang-github-prometheus-promu.spec +++ b/golang-github-prometheus-promu.spec @@ -1,7 +1,7 @@ # # spec file for package golang-github-prometheus-promu # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: golang-github-prometheus-promu -Version: 0.13.0 +Version: 0.14.0 Release: 0 Summary: Prometheus Utility Tool License: Apache-2.0 @@ -25,7 +25,6 @@ Group: System/Management URL: https://github.com/prometheus/promu Source: promu-%{version}.tar.gz Source1: vendor.tar.gz -Patch1: 0001-Set-build-date-from-SOURCE_DATE_EPOCH.patch BuildRequires: golang-packaging ExcludeArch: s390 %{go_provides} diff --git a/promu-0.13.0.tar.gz b/promu-0.13.0.tar.gz deleted file mode 100644 index f136a59..0000000 --- a/promu-0.13.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e519b56eebb90c5665f92174f2edeb01d99ea41717e343de4e6ff1cbcd49595 -size 46851 diff --git a/promu-0.14.0.tar.gz b/promu-0.14.0.tar.gz new file mode 100644 index 0000000..91cfbaa --- /dev/null +++ b/promu-0.14.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e98bfe046101b2b1f2faf2e641f20bbadf5d4eb0780c2d637b56fc5472202fa7 +size 47594 diff --git a/vendor.tar.gz b/vendor.tar.gz index cfd3eeb..3c4a7cd 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:043f72452ac106081e9afe59aea4d2f4e84ae841b7663604dae426b36c2037e4 -size 1776289 +oid sha256:b4ee082451f0f1f63019f7891ba6f58f54c7c3815c057e2b26f50792fb5f71d7 +size 2236774