diff --git a/_service b/_service
index e3945b5..c445bf0 100644
--- a/_service
+++ b/_service
@@ -3,10 +3,10 @@
https://github.com/SUSE/container-suseconnect.git
git
container-suseconnect
-
-
- 1.1.0
- v1.1.0
+ .git
+ git.%H
+ 2.0.0
+ v2.0.0
*.tar
diff --git a/container-suseconnect-1.1.0.tar.bz2 b/container-suseconnect-1.1.0.tar.bz2
deleted file mode 100644
index 407ba72..0000000
--- a/container-suseconnect-1.1.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8feb3af9e916ac71941a719134228e3d078cdf84f013545b5073b7947e4de12
-size 16709
diff --git a/container-suseconnect-2.0.0.tar.bz2 b/container-suseconnect-2.0.0.tar.bz2
new file mode 100644
index 0000000..21d2af7
--- /dev/null
+++ b/container-suseconnect-2.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10ccadc87a95d8114cf709097d6941c80d5eb96810713e995ab1c785119d86a4
+size 55888
diff --git a/container-suseconnect.changes b/container-suseconnect.changes
index 49384fd..c5eec17 100644
--- a/container-suseconnect.changes
+++ b/container-suseconnect.changes
@@ -1,14 +1,20 @@
+-------------------------------------------------------------------
+Tue Dec 11 11:30:59 UTC 2018 - sgrunert@suse.com
+
+- Update to 2.0.0
+- Update build to use golang-packaging
+
-------------------------------------------------------------------
Thu Mar 1 14:27:26 UTC 2018 - jmassaguerpla@suse.com
-- Remove gcc since the latest go versions already support s390x, ppc64le
+- Remove gcc since the latest go versions already support s390x, ppc64le
Remove 0001-Added-TLS-root-CA-certificates-for-SLE-11.patch: this
was needed for gcc builds. (fix bsc#1083189)
-------------------------------------------------------------------
Wed Jul 27 14:29:18 UTC 2016 - cbrauner@suse.de
-- add aarch64 to supported gc architectures
+- add aarch64 to supported gc architectures
-------------------------------------------------------------------
Wed Nov 11 14:26:23 UTC 2015 - fcastelli@suse.com
@@ -38,7 +44,7 @@ Thu Jun 18 16:49:20 UTC 2015 - jmassaguerpla@suse.com
-------------------------------------------------------------------
Tue Jun 16 16:08:09 UTC 2015 - jmassaguerpla@suse.com
-- Update to v1.0.0
+- Update to v1.0.0
-------------------------------------------------------------------
Thu Jun 11 09:56:16 UTC 2015 - fcastelli@suse.com
@@ -69,4 +75,3 @@ Wed Jun 3 10:05:17 UTC 2015 - fcastelli@suse.com
Fri May 29 12:33:03 UTC 2015 - dmacvicar@suse.de
- initial package
-
diff --git a/container-suseconnect.spec b/container-suseconnect.spec
index 92ae65e..1a2d4b4 100644
--- a/container-suseconnect.spec
+++ b/container-suseconnect.spec
@@ -15,39 +15,51 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-Name: container-suseconnect
-Version: 1.1.0
+%global project container-suseconnect
+%global import_path github.com/SUSE/%{project}
+%global zypp_path /usr/lib/zypp/plugins/services
+
+Name: %{project}
+Version: 2.0.0
Release: 0
-License: Apache-2.0
Summary: Provides access to repositories inside containers
-Url: https://github.com/SUSE/container-suseconnect
+License: Apache-2.0
Group: Development/Languages/Other
-Source0: %{name}-%{version}.tar.bz2
-BuildRequires: go >= 1.4
-Requires: libzypp > 9.34
-BuildRequires: libzypp > 9.34
+Url: https://%{import_path}
+Source0: %{project}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: libzypp > 9.34
+
+BuildRequires: libzypp > 9.34
+BuildRequires: golang-packaging
+
+%go_nostrip
+%go_provides
+%go_exclusivearch
%description
container-suseconnect gives access to package repositories inside containers
using the host machine entitlements.
%prep
-%setup -q
+%setup -q -n %{project}-%{version}
%build
-go build
-
-%check
-go test
+export GO111MODULE=off
+%goprep %{import_path}
+%gobuild cmd/container-suseconnect
%install
-%{__mkdir_p} %{buildroot}/usr/lib/zypp/plugins/services
-%{__install} -m755 container-suseconnect-%{version} %{buildroot}/usr/lib/zypp/plugins/services/container-suseconnect
+%goinstall
+%gosrc
+%gofilelist
+%__mkdir_p %{buildroot}/%{zypp_path}
+%__ln_s %{_bindir}/%{project} %{buildroot}/%{zypp_path}/%{project}-zypp
-%files
-%defattr(-,root,root)
+%files -f file.lst
+%defattr(-,root,root,-)
%doc README.md LICENSE
-/usr/lib/zypp/plugins/services/container-suseconnect
-
+%{_bindir}/%{project}
+%{zypp_path}/%{project}-zypp
+%changelog
diff --git a/rpmlintrc b/rpmlintrc
new file mode 100644
index 0000000..8d16c2a
--- /dev/null
+++ b/rpmlintrc
@@ -0,0 +1 @@
+addFilter("no-manual-page-for-binary")