Fix build

2 files changed, 21 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e018a5d80120..1a963f95581b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = confu-git
 	pkgdesc = Cross-platform C/C++ configuration system (git version, uses python3)
-	pkgver = r41.5030e44
-	pkgrel = 2
+	pkgver = r44.4f3d0e7
+	pkgrel = 1
 	url = https://github.com/Maratyszcza/confu/
 	arch = any
 	license = MIT
 	makedepends = git
 	makedepends = python
 	makedepends = python-setuptools
+	makedepends = python-six
 	makedepends = python-sphinx
 	makedepends = python-sphinx_rtd_theme
 	makedepends = python-yaml
 	makedepends = python2
 	makedepends = python2-setuptools
-	makedepends = python2-sphinx
-	makedepends = python2-sphinx_rtd_theme
+	makedepends = python2-six
 	makedepends = python2-yaml
 	makedepends = python-ninja-syntax
 	makedepends = python2-ninja-syntax
@@ -33,4 +33,3 @@ pkgname = confu2-git
 	depends = python2-six
 	depends = python2-yaml
 	depends = python2-ninja-syntax
-
diff --git a/PKGBUILD b/PKGBUILD
index 2464eb7a0cc7..b594040e8803 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,8 @@
 
 pkgbase=confu-git
 pkgname=('confu-git' 'confu2-git')
-_srcname=confu
-pkgver=r41.5030e44
-pkgrel=2
+pkgver=r44.4f3d0e7
+pkgrel=1
 pkgdesc='Cross-platform C/C++ configuration system (git version, uses python3)'
 arch=('any')
 url='https://github.com/Maratyszcza/confu/'
@@ -12,8 +11,8 @@ license=('MIT')
 makedepends=(
     # official repositories
         'git'
-        'python' 'python-setuptools' 'python-sphinx' 'python-sphinx_rtd_theme' 'python-yaml'
-        'python2' 'python2-setuptools' 'python2-sphinx' 'python2-sphinx_rtd_theme' 'python2-yaml'
+        'python' 'python-setuptools' 'python-six' 'python-sphinx' 'python-sphinx_rtd_theme' 'python-yaml'
+        'python2' 'python2-setuptools' 'python2-six' 'python2-yaml'
     # AUR:
         'python-ninja-syntax' 'python2-ninja-syntax'
 )
@@ -21,26 +20,22 @@ source=('git+https://github.com/Maratyszcza/confu.git')
 sha256sums=('SKIP')
 
 prepare() {
-    cp -a "$_srcname" "${_srcname}-py2"
+    cp -a confu confu-py2
 }
 
 pkgver() {
-    cd "$_srcname"
-    
-    # git, no tags available
-    printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    printf 'r%s.%s' "$(git -C confu rev-list --count HEAD)" "$(git -C confu rev-parse --short HEAD)"
 }
 
 build() {
     printf '%s\n' '  -> Building for Python3...'
-    cd "${_srcname}"
+    cd confu
     python setup.py build
-    python setup.py build_sphinx --all-files --source-dir="${srcdir}/${_srcname}/sphinx"
+    python setup.py build_sphinx --all-files --source-dir="${srcdir}/confu/sphinx"
     
     printf '%s\n' '  -> Building for Python2...'
-    cd "${srcdir}/${_srcname}-py2"
+    cd "${srcdir}/confu-py2"
     python2 setup.py build
-    python2 setup.py build_sphinx --all-files --source-dir="${srcdir}/${_srcname}-py2/sphinx"
 }
 
 package_confu-git() {
@@ -51,15 +46,15 @@ package_confu-git() {
             'python-ninja-syntax'
     )
     
-    cd "$_srcname"
+    cd confu
     python setup.py install --root="$pkgdir" --optimize=1
     
     # doc
-    mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
-    cp -a "${srcdir}/${_srcname}/build/sphinx/html/"* "${pkgdir}/usr/share/doc/${pkgname}"
+    install -d -m755 "${pkgdir}/usr/share/doc/${pkgname}"
+    cp -dr --no-preserve='ownership' "${srcdir}/confu/build/sphinx/html/"* "${pkgdir}/usr/share/doc/${pkgname}"
     
     # license
-    mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
     install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
@@ -72,7 +67,7 @@ package_confu2-git() {
             'python2-ninja-syntax'
     )
     
-    cd "${_srcname}-py2"
+    cd confu-py2
     python2 setup.py install --root="$pkgdir" --optimize=1
     mv "${pkgdir}/usr/bin/confu" "${pkgdir}/usr/bin/confu2"
     
@@ -80,10 +75,10 @@ package_confu2-git() {
     sed -i '1s/python$/python2/' "${pkgdir}/usr/lib/python2.7/site-packages/confu/recipes/"*.py
     
     # doc
-    mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
-    cp -a "${srcdir}/${_srcname}-py2/build/sphinx/html/"* "${pkgdir}/usr/share/doc/${pkgname}"
+    install -d -m755 "${pkgdir}/usr/share/doc/${pkgname}"
+    cp -dr --no-preserve='ownership' "${srcdir}/confu/build/sphinx/html/"* "${pkgdir}/usr/share/doc/${pkgname}"
     
     # license
-    mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
     install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }