diff --git a/_service b/_service
index 1dfc0fd..4984800 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
https://github.com/cpuguy83/go-md2man
git
.git
- 1.0.5+git%cd.%h
- master
+ 1.0.6+git%cd.%h
+ v1.0.6
enable
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index 21d2be9..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- https://github.com/cpuguy83/go-md2man
- 2724a9c9051aa62e9cca11304e7dd518e9e41599
\ No newline at end of file
diff --git a/go-md2man-1.0.5+git20160104.2724a9c.tar.xz b/go-md2man-1.0.5+git20160104.2724a9c.tar.xz
deleted file mode 100644
index abc72e5..0000000
--- a/go-md2man-1.0.5+git20160104.2724a9c.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96cb2c778072c25342735d239524f9feb62e11398a1fe966ddceb8e411ab7947
-size 3328
diff --git a/go-md2man-1.0.6+git20160904.a65d4d2.tar.xz b/go-md2man-1.0.6+git20160904.a65d4d2.tar.xz
new file mode 100644
index 0000000..cb9de8e
--- /dev/null
+++ b/go-md2man-1.0.6+git20160904.a65d4d2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c5216c64e3325da616ca5009184c92def398a4fa12811c1eec54be6fa787ef9
+size 34148
diff --git a/golang-github-cpuguy83-go-md2man.changes b/golang-github-cpuguy83-go-md2man.changes
index 8e2f877..bb6112f 100644
--- a/golang-github-cpuguy83-go-md2man.changes
+++ b/golang-github-cpuguy83-go-md2man.changes
@@ -1,7 +1,53 @@
+-------------------------------------------------------------------
+Fri Mar 3 10:44:26 UTC 2017 - jmassaguerpla@suse.com
+
+- add provides go-go-md2man
+ this provides was there in previous versions and we can not remove
+ it or otherwise it breaks dependent packages (i.e. docker, k8s)
+
+-------------------------------------------------------------------
+Wed Dec 07 15:16:49 UTC 2016 - tboerger@suse.com
+
+- Update to version 1.0.6+git20160904.a65d4d2:
+ * Render raw html as is
+ * Add html entity output support
+ * fix escaping for curly braces
+ * fix wrong type for Entity func
+ * md2man usable as a library (again)
+ * Improve man page rendering
+ * use stdio for default input and output
+ * improve link
+ * add vendor
+
+-------------------------------------------------------------------
+Fri Dec 2 09:13:23 UTC 2016 - tboerger@suse.com
+
+- Recursively test all packages
+
+-------------------------------------------------------------------
+Fri Dec 2 09:13:23 UTC 2016 - tboerger@suse.com
+
+- Added rpmlintrc for common golang linting
+
+-------------------------------------------------------------------
+Fri Dec 2 09:13:23 UTC 2016 - tboerger@suse.com
+
+- Requires and BuildRequires for dependencies
+
+-------------------------------------------------------------------
+Fri Dec 2 09:13:23 UTC 2016 - tboerger@suse.com
+
+- Using the new golang-packaging now
+
+-------------------------------------------------------------------
+Fri Dec 2 09:13:23 UTC 2016 - tboerger@suse.com
+
+- Refactoed spec with a new unified layout
+
-------------------------------------------------------------------
Thu Dec 1 16:15:35 UTC 2016 - jmassaguerpla@suse.com
-- add golang-github-shurcool-sanitized_anchor_name-source dependency
+- add golang-github-shurcool-sanitized_anchor_name-source dependency
-------------------------------------------------------------------
Thu Dec 1 16:08:40 UTC 2016 - jmassaguerpla@suse.com
diff --git a/golang-github-cpuguy83-go-md2man.spec b/golang-github-cpuguy83-go-md2man.spec
index bf291ba..5ca8b0b 100644
--- a/golang-github-cpuguy83-go-md2man.spec
+++ b/golang-github-cpuguy83-go-md2man.spec
@@ -1,7 +1,7 @@
#
-# spec file for package golang-github-cpuguy83-go-md2man
+# spec file for package golang
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,50 +16,68 @@
#
-Name: golang-github-cpuguy83-go-md2man
-Version: 1.0.5+git20160104.2724a9c
+%global provider github
+%global provider_tld com
+%global project cpuguy83
+%global repo go-md2man
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path %{provider_prefix}
+
+Name: golang-%{provider}-%{project}-%{repo}
+Version: 1.0.6+git20160904.a65d4d2
Release: 0
Summary: Convert markdown into man pages
License: MIT
Group: Development/Languages/Golang
-Url: https://github.com/cpuguy83/go-md2man
-Source0: go-md2man-%{version}.tar.xz
-BuildRequires: golang-github-russross-blackfriday-source
-BuildRequires: golang-github-shurcool-sanitized_anchor_name-source
+Url: https://%{provider_prefix}
+Source0: %{repo}-%{version}.tar.xz
+Source1: rpmlintrc
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
BuildRequires: golang-packaging
BuildRequires: xz
-BuildRequires: golang(golang.org/x/net)
-Provides: go-go-md2man = %{version}
-Obsoletes: go-go-md2man < %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+BuildRequires: golang(github.com/russross/blackfriday)
+Requires: golang(github.com/russross/blackfriday)
+
+%{go_nostrip}
%{go_provides}
%description
-Tool to converts markdown into man pages
+Tool to converts markdown into man pages.
-%gosrc_package
+%package -n go-md2man
+Summary: Tool to converts markdown into man pages
+Group: Development/Languages/Golang
+Provides: go-go-md2man = %{version}
+AutoReqProv: Off
+
+%{go_exclusivearch}
+
+%description -n go-md2man
+Tool to converts markdown into man pages.
%prep
-%setup -q -n go-md2man-%{version}
+%setup -q -n %{repo}-%{version}
%build
-%{goprep} github.com/cpuguy83/go-md2man
-%{gobuild} ...
+%goprep %{import_path}
+%gobuild ...
%install
-%{goinstall}
-%{gosrc}
-%{go_filelist}
+%goinstall
+%gosrc
+%gofilelist
%check
-%{gotest} github.com/cpuguy83/go-md2man
+%gotest %{import_path}...
%files -f file.lst
%defattr(-,root,root,-)
%doc README.md LICENSE.md
-%files source
-%defattr(-,root,root,-)
-%{go_contribsrcdir}/*
+%files -n go-md2man
+%defattr(-,root,root)
+%{_bindir}/go-md2man
%changelog
diff --git a/rpmlintrc b/rpmlintrc
new file mode 100644
index 0000000..d37fdc2
--- /dev/null
+++ b/rpmlintrc
@@ -0,0 +1,8 @@
+# We are preventing the stripping to keep backtraces intact
+addFilter("unstripped-binary-or-object")
+
+# Golang doesn't support dynamic linking yet in a proper way
+addFilter("statically-linked-binary")
+
+# We are aware of that but shorter names are not possible
+addFilter("filename-too-long-for-joliet")