diff --git a/packaging/debian-sid/patches/0005-advisor-errtracker-use-upstream-bolt-package.patch b/packaging/debian-sid/patches/0005-advisor-errtracker-use-upstream-bolt-package.patch index 21deddcde21..b64911f08d4 100644 --- a/packaging/debian-sid/patches/0005-advisor-errtracker-use-upstream-bolt-package.patch +++ b/packaging/debian-sid/patches/0005-advisor-errtracker-use-upstream-bolt-package.patch @@ -31,19 +31,3 @@ index d74aa14fe..42a4ba051 100644 "github.com/snapcore/snapd/dirs" "github.com/snapcore/snapd/osutil" -diff --git a/errtracker/errtracker.go b/errtracker/errtracker.go -index d7507a9a3..1910b7d7c 100644 ---- a/errtracker/errtracker.go -+++ b/errtracker/errtracker.go -@@ -33,7 +33,7 @@ import ( - "strings" - "time" - -- "github.com/snapcore/bolt" -+ "github.com/boltdb/bolt" - "gopkg.in/mgo.v2/bson" - - "github.com/snapcore/snapd/arch" --- -2.17.1 - diff --git a/packaging/fedora/snapd.spec b/packaging/fedora/snapd.spec index 63a52cce4f4..3fe2c407fcc 100644 --- a/packaging/fedora/snapd.spec +++ b/packaging/fedora/snapd.spec @@ -353,7 +353,6 @@ Provides: golang(%{import_path}/desktop/notification) = %{version}-%{releas Provides: golang(%{import_path}/desktop/notification/notificationtest) = %{version}-%{release} Provides: golang(%{import_path}/dirs) = %{version}-%{release} Provides: golang(%{import_path}/docs) = %{version}-%{release} -Provides: golang(%{import_path}/errtracker) = %{version}-%{release} Provides: golang(%{import_path}/features) = %{version}-%{release} Provides: golang(%{import_path}/gadget) = %{version}-%{release} Provides: golang(%{import_path}/gadget/edition) = %{version}-%{release} @@ -538,7 +537,7 @@ BUILDTAGS="nosecboot" %if ! 0%{?with_bundled} # We don't need the snapcore fork for bolt - it is just a fix on ppc -sed -e "s:github.com/snapcore/bolt:github.com/boltdb/bolt:g" -i advisor/*.go errtracker/*.go +sed -e "s:github.com/snapcore/bolt:github.com/boltdb/bolt:g" -i advisor/*.go %endif # We have to build snapd first to prevent the build from