Arch Linux User Repository

It must be done the other way odensc, more specific packages (like -bin, -git) should set conflict with less specific (like this one).

Would you mind setting skaffold-bin as a conflict so it's removed when you install this package?

Why does this have dependency on kubectl-bin instead of kubectl?

Indeed the _upstream_pkgname was a copy/paste mistake.

Thanks for accepting my contribution ! Keep up the good packaging work !

@stefanc_diff I had tried download the files based on the .SRCINFO, but the URL wasn't complete, I suppose the _upstream_pkgname variable was not defined.

I'll include the files in a moment. Thanks for your contribution.

@maximbaz Thanks for verifying access to the docs !

${_upstream_pkgname} variable This is a common variable I use in my PKGBUILDs to separate the arch/AUR pkg name ( denoted by${pkgname}` from the upstream pkg name denoted by the variable above.

This helps with packaging when the ${pkgname} needed by AUR/arch pkg system would be skaffold-bin (as an example) but the upstream pkg name is skaffold

For this pkg though ${_upstream_pkgname} == ${pkgname}

The "cleanup the package() phase a bit" phrase This refers to using the 4 install commands in the package() phase instead of cp and chmod commands

Sharing the patch in comments or gist is totally fine. I confirm that the links are accessible, html and pdf open fine for me.

frealgagu, I'm fine adding these to /usr/share/doc as proposed, let me know if you also agree and I can do it (or just do it yourself ;)). Agree about LICENSE not being necessary to include.

stefanc_diff, I'm only not sure where does the variable ${_upstream_pkgname} come from in your patch, I assume you wanted to use ${pkgname} here. Also not sure to which change in your patch the phrase "cleanup the package() phase a bit" refers to :)

@frealgagu

1) Please have a look again in the patch I've sent ( variables _doc_html && _doc_pdf ) and you'll be able to see that these are openly available , no login necessary. When I test PKGBUILDs I always test them in a clean chroot using the arch devtools pkg. If these docs where behind some login page my builds wouldn't build, but my builds are running, retrieving the docs and building fine. These docs are useful to have offline/on_workstation since skaffold is not the easiest tool to grasp, being also a very new tool.

2) I comprehend your point about the LICENSE, that was the least important file in the git patch.

How do you think it is best to get this patch in ?

@stefanc_diff you need to be logged in to storage.googleapis.com in order to be able to download the docs, so it's not something you can add to a PKGBUILD. LICENSE file is not necessary to be included in license files because that is Apache and not a custom license.

@frealgagu @maximbaz I have a patch for this package to add docs to the pkg and cleanup the package() phase a bit. How do you want to get this patch in ? - patch file - content of the patch file in the comments - commit to repo

I've tried the last option, but I can only clone the repo not push back to it. Do I need to be added on the comaintainer list for this package to be able to push to it?

Just in case the comaintainer thing is too complicated here is the git patch for these changes I was mentioning

commit c408649ab6aba2e304a64f3e8a9b2ea0ab8bf5de
Author: Stefan Cocora <obfuscated>
Date:   Wed Dec 5 15:28:29 2018 +0000

    [feature] Add manuals to the src built version of skaffold v0.19.0

    Add documentation to the pkg
    Use the install tool during package() phase

diff --git a/.SRCINFO b/.SRCINFO
index 9c175dd..81a8ede 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skaffold
        pkgdesc = A command line tool that facilitates continuous development for Kubernetes applications
        pkgver = 0.19.0
-       pkgrel = 2
+       pkgrel = 3
        url = https://github.com/GoogleContainerTools/skaffold
        arch = x86_64
        license = Apache
@@ -12,8 +12,14 @@ pkgbase = skaffold
        optdepends = minikube: To use Minikube
        source = skaffold-0.19.0.tar.gz::https://github.com/GoogleContainerTools/skaffold/archive/v0.19.0.tar.gz
        source = build_info.patch
+       source = index.html::https://storage.googleapis.com//releases/v0.19.0/docs/index.html
+       source = index.pdf::https://storage.googleapis.com//releases/v0.19.0/docs/index.pdf
+       source = LICENSE::https://raw.githubusercontent.com/GoogleContainerTools//master/LICENSE
        sha256sums = 48fee7f29e6dac4a301d3facf607796b04b7d1ee0b433fd083e3100bf38f7a38
        sha256sums = af5bd6a9a1e9e2f7d941ffdbd4aebd37e32bb390be03c52a578f3931997f220d
+       sha256sums = 932bb93b9d321d1e3dc974d171cea360a04f2e233d3bc759a32cc34859296285
+       sha256sums = 8645efc4d2da7d6a0aeb23b2bc81d069bfd490e06ff78df82aab13a36e1ab85a
+       sha256sums = 43a2aa523a99dddb6c131e67e11334493e64c67f03b0d8f6745b6b3f34157d65

 pkgname = skaffold

diff --git a/PKGBUILD b/PKGBUILD
index 6589da4..c1aab6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Fredy García <frealgagu at gmail dot com>
 # Maintainer: Maxim Baz <$pkgname at maximbaz dot com>

 _pkgauthor=GoogleContainerTools
 _commit=9eb0dfc1bf634b97462c66b4dfb80e4cea378ade
 pkgname=skaffold
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A command line tool that facilitates continuous development for Kubernetes applications"
 arch=("x86_64")
 url="https://github.com/${_pkgauthor}/${pkgname}"
@@ -14,10 +15,22 @@ depends=("docker" "kubectl-bin")
 makedepends=("go-pie")
 optdepends=("google-cloud-sdk: To use GKE"
             "minikube: To use Minikube")
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgauthor}/${pkgname}/archive/v${pkgver}.tar.gz"
-        "build_info.patch")
-sha256sums=("48fee7f29e6dac4a301d3facf607796b04b7d1ee0b433fd083e3100bf38f7a38"
-            "af5bd6a9a1e9e2f7d941ffdbd4aebd37e32bb390be03c52a578f3931997f220d")
+_doc_html="index.html"
+_doc_pdf="index.pdf"
+source=(
+  "${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgauthor}/${pkgname}/archive/v${pkgver}.tar.gz"
+  "build_info.patch"
+  "${_doc_html}::https://storage.googleapis.com/${_upstream_pkgname}/releases/v${pkgver}/docs/index.html"
+  "${_doc_pdf}::https://storage.googleapis.com/${_upstream_pkgname}/releases/v${pkgver}/docs/index.pdf"
+  "LICENSE::https://raw.githubusercontent.com/${_pkgauthor}/${_upstream_pkgname}/master/LICENSE"
+)
+sha256sums=(
+  "48fee7f29e6dac4a301d3facf607796b04b7d1ee0b433fd083e3100bf38f7a38"
+  "af5bd6a9a1e9e2f7d941ffdbd4aebd37e32bb390be03c52a578f3931997f220d"
+  "932bb93b9d321d1e3dc974d171cea360a04f2e233d3bc759a32cc34859296285"
+  "8645efc4d2da7d6a0aeb23b2bc81d069bfd490e06ff78df82aab13a36e1ab85a"
+  "43a2aa523a99dddb6c131e67e11334493e64c67f03b0d8f6745b6b3f34157d65"
+)

 prepare() {
   mkdir -p "${srcdir}/gopath/src/github.com/${_pkgauthor}"
@@ -35,4 +48,9 @@ build() {

 package() {
   install -Dm755 "${srcdir}/gopath/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+
+  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  install -Dm644 "${srcdir}/${_doc_html}" "${pkgdir}/usr/share/doc/${pkgname}/html/${_doc_html}"
+  install -Dm644 "${srcdir}/${_doc_pdf}" "${pkgdir}/usr/share/doc/${pkgname}/pdf/${_doc_pdf}"
 }