WIP

.gitignore

@@ -1,6 +1,6 @@
 .osc
 _scmsync.obsinfo
 build.specials.obscpio
-git-bug/
+.assets/
 _buildconfig-*
 _buildinfo-*.xml

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "upstream"]
+	path = git-bug
+	url = https://github.com/openSUSE-Python/git-bug.git
+	branch = devel

_service

@@ -1,16 +1,3 @@
 <services>
-    <!-- service name="tar_scm" mode="manual">
-        <param name="versionprefix">0.8.1+git</param>
-        <param name="revision">v0.8.1</param>
-        <param name="url">https://github.com/git-bug/git-bug.git</param>
-        <param name="scm">git</param>
-        <param name="changesgenerate">enable</param>
-        <param name="changesauthor">mcepl@cepl.eu</param>
-    </service>
-    <service name="recompress" mode="manual">
-        <param name="file">*.tar</param>
-        <param name="compression">gz</param>
-    </service>
-    <service name="set_version" mode="manual"/ -->
     <service name="go_modules" mode="manual"/>
 </services>

_servicedata

@@ -3,4 +3,4 @@
                 <param name="url">https://github.com/MichaelMure/git-bug.git</param>
               <param name="changesrevision">d499b6e9d3333334614924669b74640a2d0b5485</param></service><service name="tar_scm">
                 <param name="url">https://github.com/git-bug/git-bug.git</param>
-              <param name="changesrevision">96c7a111a3cb075b5ce485f709c3eb82da121a50</param></service></servicedata>
+              <param name="changesrevision">0ab94c9b7ac53ca9ab56febcf5cc3f26959e8b8a</param></service></servicedata>

git-bug.changes

@@ -1,50 +1,3 @@
--------------------------------------------------------------------
-Mon May 19 08:38:03 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
-
-- Update to version 0.10.1:
-  - cli: ignore missing sections when removing configuration (ddb22a2f)
-- Update to version 0.10.0:
-  - bridge: correct command used to create a new bridge (9942337b)
-  - web: simplify header navigation (7e95b169)
-  - webui: remark upgrade + gfm + syntax highlighting (6ee47b96)
-  - BREAKING CHANGE: dev-infra: remove gokart (89b880bd)
-- Update to version 0.10.0
-  - bridge: correct command used to create a new bridge (9942337b)
-  - web: simplify header navigation (7e95b169)
-  - web: remark upgrade + gfm + syntax highlighting (6ee47b96)
-- Update to version 0.9.0:
-  - completion: remove errata from string literal (aa102c91)
-  - tui: improve readability of the help bar (23be684a)
-
--------------------------------------------------------------------
-Tue May 06 10:21:55 UTC 2025 - mcepl@cepl.eu
-
-- Update to version 0.8.1+git.1746484874.96c7a111:
-  * docs: update install, contrib, and usage documentation (#1222)
-  * fix: resolve the remote URI using url.*.insteadOf (#1394)
-  * build(deps): bump the go_modules group across 1 directory with 3 updates (#1376)
-  * chore: gofmt simplify gitlab/export_test.go (#1392)
-  * fix: checkout repo before setting up go environment (#1390)
-  * feat: bump to go v1.24.2 (#1389)
-  * chore: update golang.org/x/net (#1379)
-  * fix: use -0700 when formatting time (#1388)
-  * fix: use correct url for gitlab PATs (#1384)
-  * refactor: remove depdendency on pnpm for auto-label action (#1383)
-  * feat: add action: auto-label (#1380)
-  * feat: remove lifecycle/frozen (#1377)
-  * build(deps): bump the npm_and_yarn group across 1 directory with 12 updates (#1378)
-  * feat: support new exclusion label: lifecycle/pinned (#1375)
-  * fix: refactor how gitlab title changes are detected (#1370)
-  * revert: "Create Dependabot config file" (#1374)
-  * refactor: rename //:git-bug.go to //:main.go (#1373)
-  * build(deps): bump github.com/vektah/gqlparser/v2 from 2.5.16 to 2.5.25 (#1361)
-  * fix: set GitLastTag to an empty string when git-describe errors (#1355)
-  * chore: update go-git to v5@masterupdate_mods (#1284)
-  * refactor: Directly swap two variables to optimize code (#1272)
-  * Update README.md Matrix link to new room (#1275)
-- Remove upstreamed patch:
-  - CVE-2025-22869-bump-go-crypto-ssh.patch
-
 -------------------------------------------------------------------
 Tue Mar 25 15:29:50 UTC 2025 - mcepl@cepl.eu
 

git-bug.obsinfo

@@ -1,4 +0,0 @@
-name: git-bug
-version: 0.8.0+git.1742269202.0ab94c9
-mtime: 1742269202
-commit: 0ab94c9b7ac53ca9ab56febcf5cc3f26959e8b8a

git-bug.spec

@@ -17,18 +17,15 @@
 
 
 Name:           git-bug
-Version:        0.10.1
+Version:        0.8.1+git.1746484874.96c7a111
 Release:        0
 Summary:        Distributed, offline-first bug tracker embedded in git, with bridges
 License:        MIT
 URL:            https://github.com/MichaelMure/git-bug
-Source0:        https://github.com/MichaelMure/%{name}/archive/refs/tags/v%{version}.tar.gz#/git-bug-%{version}.tar.gz
+#!CreateArchive: git-bug
-# Source0:        git-bug-%%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.xz
 Source1:        vendor.tar.gz
-# PATCH-FIX-UPSTREAM remote-config.patch gh#MichaelMure/git-bug!1076 mcepl@suse.com
+BuildRequires:  golang(API) = 1.23
-# try reading git-bug.remote config value before defaulting to 'origin' when no explicit REMOTE argument
-Patch0:         remote-config.patch
-BuildRequires:  golang(API) = 1.24
 # # PATCH-FEATURE-UPSTREAM 501-export.patch gh#MichaelMure/git-bug!501 mcepl@suse.com
 # # add a command to export bugs as raw operations
 # Patch0:         501-export.patch
@@ -88,15 +85,10 @@ BuildArch:      noarch
 zsh shell completions for git-bug
 
 %prep
-%autosetup -p1 -a1
+%setup -q -a1
 
 %build
-# COMMANDS_PATH="github.com/git-bug/git-bug/commands"
+%make_build build
-# LDFLAGS="-X ${COMMANDS_PATH}.GitCommit=${GIT_COMMIT} \
-# 	-X ${COMMANDS_PATH}.GitLastTag=${GIT_LAST_TAG} \
-# 	-X ${COMMANDS_PATH}.GitExactTag=${GIT_EXACT_TAG}"
-export GOFLAGS="-buildmode=pie"
-go build
 
 %install
 install -Dm755 git-bug %{buildroot}%{_bindir}/git-bug
@@ -112,7 +104,7 @@ install -Dm0644 misc/completion/zsh/git-bug  \
 
 %check
 # before we mark network requiring tests (gh#git-bug/git-bug#1313)
-go test -v -bench=. ./... || true
+%make_build test || true
 
 %files
 %license LICENSE

remote-config.patch

@@ -1,106 +0,0 @@
-From 65cfe2b3fff11d34b5ffc9f7e5d24aefb505497f Mon Sep 17 00:00:00 2001
-From: William Ahern <william@25thandClement.com>
-Date: Thu, 27 Jul 2023 22:06:45 -0700
-Subject: [PATCH] pull, push: try reading git-bug.remote config value before
- defaulting to 'origin' when no explicit REMOTE argument
-
----
- commands/pull.go     |   16 +++++++++++-----
- commands/push.go     |   16 +++++++++++-----
- repository/config.go |   11 +++++++++++
- 3 files changed, 33 insertions(+), 10 deletions(-)
-
-Index: git-bug-0.8.1+git.1746484874.96c7a111/commands/pull.go
-===================================================================
---- git-bug-0.8.1+git.1746484874.96c7a111.orig/commands/pull.go	2025-05-06 00:41:14.000000000 +0200
-+++ git-bug-0.8.1+git.1746484874.96c7a111/commands/pull.go	2025-05-06 12:25:33.320505683 +0200
-@@ -8,6 +8,7 @@
- 	"github.com/git-bug/git-bug/commands/completion"
- 	"github.com/git-bug/git-bug/commands/execenv"
- 	"github.com/git-bug/git-bug/entity"
-+	"github.com/git-bug/git-bug/repository"
- )
- 
- func newPullCommand(env *execenv.Env) *cobra.Command {
-@@ -25,13 +26,18 @@
- }
- 
- func runPull(env *execenv.Env, args []string) error {
--	if len(args) > 1 {
-+	var remote string
-+	switch {
-+	case len(args) > 1:
- 		return errors.New("Only pulling from one remote at a time is supported")
--	}
--
--	remote := "origin"
--	if len(args) == 1 {
-+	case len(args) == 1:
- 		remote = args[0]
-+	default:
-+		v, err := repository.GetDefaultString("git-bug.remote", env.Repo.AnyConfig(), "origin")
-+		if err != nil {
-+			return err
-+		}
-+		remote = v
- 	}
- 
- 	env.Out.Println("Fetching remote ...")
-Index: git-bug-0.8.1+git.1746484874.96c7a111/commands/push.go
-===================================================================
---- git-bug-0.8.1+git.1746484874.96c7a111.orig/commands/push.go	2025-05-06 00:41:14.000000000 +0200
-+++ git-bug-0.8.1+git.1746484874.96c7a111/commands/push.go	2025-05-06 12:25:33.320753379 +0200
-@@ -7,6 +7,7 @@
- 
- 	"github.com/git-bug/git-bug/commands/completion"
- 	"github.com/git-bug/git-bug/commands/execenv"
-+	"github.com/git-bug/git-bug/repository"
- )
- 
- func newPushCommand(env *execenv.Env) *cobra.Command {
-@@ -24,13 +25,18 @@
- }
- 
- func runPush(env *execenv.Env, args []string) error {
--	if len(args) > 1 {
-+	var remote string
-+	switch {
-+	case len(args) > 1:
- 		return errors.New("Only pushing to one remote at a time is supported")
--	}
--
--	remote := "origin"
--	if len(args) == 1 {
-+	case len(args) == 1:
- 		remote = args[0]
-+	default:
-+		v, err := repository.GetDefaultString("git-bug.remote", env.Repo.AnyConfig(), "origin")
-+		if err != nil {
-+			return err
-+		}
-+		remote = v
- 	}
- 
- 	stdout, err := env.Backend.Push(remote)
-Index: git-bug-0.8.1+git.1746484874.96c7a111/repository/config.go
-===================================================================
---- git-bug-0.8.1+git.1746484874.96c7a111.orig/repository/config.go	2025-05-06 00:41:14.000000000 +0200
-+++ git-bug-0.8.1+git.1746484874.96c7a111/repository/config.go	2025-05-06 12:25:33.320922899 +0200
-@@ -60,6 +60,17 @@
- 	RemoveAll(keyPrefix string) error
- }
- 
-+func GetDefaultString(key string, cfg ConfigRead, def string) (string, error) {
-+	val, err := cfg.ReadString(key)
-+	if err == nil {
-+		return val, nil
-+	} else if errors.Is(err, ErrNoConfigEntry) {
-+		return def, nil
-+	} else {
-+		return "", err
-+	}
-+}
-+
- func ParseTimestamp(s string) (time.Time, error) {
- 	timestamp, err := strconv.Atoi(s)
- 	if err != nil {