use codeberg upstream

3 files changed, 28 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3dfa1c296613..3cb935ac825d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,25 @@
 pkgbase = tea4cups-py3-git
-	pkgdesc = A unofficial python3 fork of Tea4cups
-	pkgver = 3.1.5_alpha+r14.4ffc26a
+	pkgdesc = Tea4cups with Python3
+	pkgver = 3.14alpha_unofficial+r129.5ea2f1a
 	pkgrel = 1
-	url = https://gitlab.com/dadosch/tea4cups/tree/python3/
+	url = https://codeberg.org/dadosch/tea4cups
 	install = tea4cups.install
 	arch = any
 	license = GPL2
 	depends = cups
 	depends = python
 	depends = python-requests
-	provides = tea4cups=3.1.5_alpha+r14.4ffc26a
-	provides = tea4cups-py3=3.1.5_alpha+r14.4ffc26a
-	provides = tea4cups-py3-doc=3.1.5_alpha+r14.4ffc26a
+	provides = tea4cups=3.14alpha_unofficial+r129.5ea2f1a
+	provides = tea4cups-py3=3.14alpha_unofficial+r129.5ea2f1a
+	provides = tea4cups-py3-doc=3.14alpha_unofficial+r129.5ea2f1a
 	conflicts = tea4cups-svn
 	backup = etc/cups/tea4cups.conf
-	source = tea4cups-py3::git+https://gitlab.com/dadosch/tea4cups#branch=python3
-	source = doc_from_website.txt
+	source = tea4cups-py3::git+https://codeberg.org/dadosch/tea4cups
+	source = tea4cups-spool-directory.patch
 	source = doc_debianwiki.html::http://wiki.debian.org/Tea4CUPS
 	source = tea4cups.install
 	sha256sums = SKIP
-	sha256sums = 6221890bbd1ab3806efeec8624161c80742d1c5fce24c9094e4f8f8466ba2923
+	sha256sums = 47524f08e3f3e261a7d4c0e0e57b487a6bcba3497435d45d6d3b0d4c5f9f3e05
 	sha256sums = SKIP
 	sha256sums = 315c82e6e9d352ecb32d511c9290790ac2a52e60e82d4727bff350fcf03aacf0
 
diff --git a/PKGBUILD b/PKGBUILD
index 3dad8163c5b6..2be159eab16e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=tea4cups-py3-git
 _pkgname=tea4cups-py3
-pkgver=3.1.5_alpha+r14.4ffc26a
+pkgver=3.14alpha_unofficial+r129.5ea2f1a
 
 pkgrel=1
-pkgdesc="A unofficial python3 fork of Tea4cups"
+pkgdesc="Tea4cups with Python3"
 
-url="https://gitlab.com/dadosch/tea4cups/tree/python3/"
+url="https://codeberg.org/dadosch/tea4cups"
 license=('GPL2')
 arch=('any')
 conflicts=('tea4cups-svn')
@@ -25,14 +25,14 @@ backup=('etc/cups/tea4cups.conf')
 install=tea4cups.install
 _doc_debianwiki_url='http://wiki.debian.org/Tea4CUPS'
 source=(
-  "${_pkgname}::git+https://gitlab.com/dadosch/tea4cups#branch=python3"
-  'doc_from_website.txt'
+  "${_pkgname}::git+https://codeberg.org/dadosch/tea4cups"
+  "tea4cups-spool-directory.patch"
   "doc_debianwiki.html::${_doc_debianwiki_url}"
   "${install}"
 )
 sha256sums=(
   'SKIP'                                                             # svn+http://svn.pykota.com/tea4cups/trunk
-  '6221890bbd1ab3806efeec8624161c80742d1c5fce24c9094e4f8f8466ba2923' # doc_from_website.txt
+  '47524f08e3f3e261a7d4c0e0e57b487a6bcba3497435d45d6d3b0d4c5f9f3e05' # tea4cups-spool-directory.patch
   'SKIP'                                                             # doc_debianwiki.html
   '315c82e6e9d352ecb32d511c9290790ac2a52e60e82d4727bff350fcf03aacf0' # "${install}"
 )
@@ -66,7 +66,10 @@ prepare() {
   cat > website.url <<< "${url}"
   
   cd "${srcdir}/${_pkgname}"
-  
+
+
+  msg2 "Patching tea4cups.conf to use the spool directory '${_tea4cups_spool}' ..."
+  patch -N -p1 --follow-symlinks -i "${srcdir}/tea4cups-spool-directory.patch"  
 }
 
 package() {
@@ -77,11 +80,10 @@ package() {
   
   install -v -m 644 -D "tea4cups.conf"  "${pkgdir}/etc/cups/tea4cups.conf"
 
-  for _docfile in CREDITS NEWS README TODO; do
+  for _docfile in CREDITS NEWS README.md TODO; do
     install -v -m 644 -D "${_docfile}"  "${pkgdir}/usr/share/doc/${_pkgname}/${_docfile}"
   done
   
-  install -v -m 644 -D "${srcdir}/doc_from_website.txt"  "${pkgdir}/usr/share/doc/${_pkgname}/doc_from_website.txt"
   install -v -m 644 -D "${srcdir}/website.url"  "${pkgdir}/usr/share/doc/${_pkgname}/website.url"
   install -v -m 644 -D "${srcdir}/doc_debianwiki.html"   "${pkgdir}/usr/share/doc/${_pkgname}/doc_debianwiki.html"
   install -v -m 644 -D "${srcdir}/doc_debianwiki.url"   "${pkgdir}/usr/share/doc/${_pkgname}/doc_debianwiki.url"
diff --git a/tea4cups-spool-directory.patch b/tea4cups-spool-directory.patch
new file mode 100644
index 000000000000..8e987672d801
--- /dev/null
+++ b/tea4cups-spool-directory.patch
@@ -0,0 +1,8 @@
+diff -U0 -r tea4cups/tea4cups.conf tea4cups.patchedconf/tea4cups.conf
+--- tea4cups/tea4cups.conf	2019-03-20 14:18:28.574117737 +0100
++++ tea4cups.patchedconf/tea4cups.conf	2019-03-20 14:29:57.025127482 +0100
+@@ -42,2 +42,2 @@
+-# directory : /var/spool/tea4cups/
+-directory : /var/spool/cups/
++directory : /var/spool/tea4cups/
++# directory : /var/spool/cups/