Update to 1.4.3-2

3 files changed, 33 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 501c56c72fbd..e8b066b9eefc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = backintime
 	pkgver = 1.4.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/bit-team/backintime
 	arch = any
 	license = GPL
@@ -10,9 +10,12 @@ pkgbase = backintime
 	checkdepends = systemd
 	checkdepends = python-pyfakefs
 	checkdepends = oxygen-icons
+	checkdepends = python-pylint
 	makedepends = python
 	source = backintime-1.4.3.tar.gz::https://github.com/bit-team/backintime/archive/refs/tags/v1.4.3.tar.gz
+	source = fix.patch
 	sha256sums = 89a1d9f1b766025d0219b7978e77ee91a5e25ef99ade164c1d8b5a9a3d273e65
+	sha256sums = 9c0eed1444db54891f4fad9397a892dce6c6962b2a8846b624778514f1769611
 
 pkgname = backintime
 	pkgdesc = Simple backup system inspired from the Flyback Project and TimeVault. Qt5 GUI version.
diff --git a/PKGBUILD b/PKGBUILD
index a3534899b69d..67c8d91880ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,20 @@
 pkgname=(backintime backintime-cli)
 _pkgname="backintime"
 pkgver=1.4.3
-pkgrel=1
+pkgrel=2
 arch=(any)
 url="https://github.com/bit-team/backintime"
 license=(GPL)
 makedepends=(python)
-checkdepends=(openssh python-dbus rsync systemd python-pyfakefs oxygen-icons)
-source=("$_pkgname-$pkgver.tar.gz::https://github.com/bit-team/$_pkgname/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('89a1d9f1b766025d0219b7978e77ee91a5e25ef99ade164c1d8b5a9a3d273e65')
+checkdepends=(openssh python-dbus rsync systemd python-pyfakefs oxygen-icons python-pylint)
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/bit-team/$_pkgname/archive/refs/tags/v$pkgver.tar.gz"
+fix.patch)
+sha256sums=('89a1d9f1b766025d0219b7978e77ee91a5e25ef99ade164c1d8b5a9a3d273e65'
+            '9c0eed1444db54891f4fad9397a892dce6c6962b2a8846b624778514f1769611')
 
 prepare() {
   cd "$_pkgname-$pkgver"
+  patch -p1 -i ../fix.patch
 }
 
 build() {
@@ -29,8 +32,7 @@ build() {
 
 check() {
   cd "$_pkgname-$pkgver/common"
-
-#  make test
+  make test
 }
 
 package_backintime-cli() {
diff --git a/fix.patch b/fix.patch
new file mode 100644
index 000000000000..e6b7fd430aac
--- /dev/null
+++ b/fix.patch
@@ -0,0 +1,21 @@
+From 3b6de69e076ebeed6421312575c06dc8f762a335 Mon Sep 17 00:00:00 2001
+From: aryoda <aryoda@users.noreply.github.com>
+Date: Fri, 2 Feb 2024 19:00:51 +0100
+Subject: [PATCH] Fix bug #1630: "make install" ignored $(DEST) in file
+ migration part
+
+PR #1633
+---
+diff --git a/qt/configure b/qt/configure
+index 0c4d3297..ac6cc873 100755
+--- a/qt/configure
++++ b/qt/configure
+@@ -149,7 +149,7 @@ printf "install:\n" >> ${MAKEFILE}
+ 
+ # Migration
+ printf "\t#clean-up installed old files that were renamed or moved in later BiT versions\n" >> ${MAKEFILE}
+-printf "\trm -f /etc/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf\n" >> ${MAKEFILE}
++printf "\trm -f \$(DEST)/etc/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf\n" >> ${MAKEFILE}
+ printf "\trm -f \$(DEST)/share/backintime/plugins/qt4plugin.py\n" >> ${MAKEFILE}
+ addNewline
+