Update dependencies

2 files changed, 37 insertions, 30 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d331f7cd603f..6ebd4bb4b0ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,28 @@
 # Maintainer: Khalid Eldehairy <khalid # kdehairy / com>
 _pacparser_pkgver=1.3.7
-_txdbus_pkgver=1.0.14
+_txdbus_pkgver=1.1.0
 _systemd_pkgver=0.9.5
 _service_identity_pkgver=17.0.0
 
 pkgname=pac4cli-git
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Proxy-auto-discovery for command line applications"
 arch=('i686' 'x86_64')
 url="https://github.com/tkluck/pac4cli"
 license=('GPL3')
-depends=('python>=3.6' 'python-twisted' 'python-pyopenssl' 'libsystemd' 'networkmanager' 'python-pyopenssl' 
-		'python-pyasn1' 'python-pyasn1-modules' 'python-attrs')
-makedepends=('git' 'python-pyasn1' 'python-pyasn1-modules' 'python-attrs' 'python-idna')
-provides=('python-pacparser')
+depends=('python>=3.6' 'python-twisted' 'python-pyopenssl' 'libsystemd'
+'networkmanager' 'python-pyopenssl' 'python-pyasn1' 'python-pyasn1-modules'
+'python-attrs' 'python-systemd')
+makedepends=('git' 'python-pyasn1' 'python-pyasn1-modules' 'python-attrs'
+'python-idna' 'python-setuptools')
+provides=('python-pacparser' 'python-txdbus')
 install=${pkgname%-git}.install
 source=("${pkgname%-git}::git+https://github.com/tkluck/pac4cli.git"
 		"https://github.com/pacparser/pacparser/archive/${_pacparser_pkgver}.tar.gz"
-		"https://github.com/cocagne/txdbus/archive/${_txdbus_pkgver}.tar.gz"
-		"https://files.pythonhosted.org/packages/source/s/systemd/systemd-${_systemd_pkgver}.tar.gz"
+		"https://pypi.io/packages/source/t/txdbus/txdbus-${_txdbus_pkgver}.tar.gz"
 		"https://files.pythonhosted.org/packages/source/s/service_identity/service_identity-${_service_identity_pkgver}.tar.gz")
-md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+md5sums=('SKIP' '6ea7f2bf2e93eb7e8e58f75b77885c22' 'f17c9204c7f56365c297ba68e6840900' 'f509cb41ca2f8420bd8496291136d6cc')
 
 pkgver() {
 	cd "$srcdir/${pkgname%-git}"
@@ -32,29 +33,25 @@ pkgver() {
 build() {
 	#builds pacparser
 	cd "${srcdir}/pacparser-${_pacparser_pkgver}"
-	PYTHON=python3 make all pymod -C src
+	make all pymod -C src
 
 	#service_identity
 	cd "${srcdir}/service_identity-${_service_identity_pkgver}"
-	python3 setup.py build
+	python setup.py build
 }
 
 package() {
 	#package pacparser
 	cd "${srcdir}/pacparser-${_pacparser_pkgver}"
-	PYTHON=python3 make DESTDIR="${pkgdir}" -C src install-pymod
+	make DESTDIR="${pkgdir}" -C src install-pymod
 
 	#txdbus
 	cd "${srcdir}/txdbus-${_txdbus_pkgver}"
-	python3 setup.py install --root="${pkgdir}/" --prefix=/usr --optimize=1
-
-	#systemd
-	cd "${srcdir}/systemd-${_systemd_pkgver}"
-	python3 setup.py install --root="${pkgdir}/" --prefix=/usr --optimize=1
+	python setup.py install --root="${pkgdir}/" --prefix=/usr --optimize=1
 
 	#service_identity
 	cd "${srcdir}/service_identity-${_service_identity_pkgver}"
-	python3 setup.py install --root="${pkgdir}/" --prefix=/usr --optimize=1 --skip-build
+	python setup.py install --root="${pkgdir}/" --prefix=/usr --optimize=1 --skip-build
 
 	#package pac4cli
 	cd "${srcdir}/${pkgname%-git}"
@@ -64,5 +61,5 @@ package() {
 		exit 1;
 	fi
 	git checkout ${LATEST_TAG}										# checkout latest release tag
-	PYTHON=python3 make pythonsitedir=/usr/lib/python3.6/site-packages DESTDIR="${pkgdir}" prefix=/usr install
+	make DESTDIR="${pkgdir}" prefix=/usr install
 }
diff --git a/pac4cli.install b/pac4cli.install
index d898246eba63..27db59d65ca4 100644
--- a/pac4cli.install
+++ b/pac4cli.install
@@ -1,35 +1,45 @@
+source "/usr/share/makepkg/util/message.sh"
+
 pre_install() {
+	colorize
 	# check for already defined http(s)_proxy
 	RESULT=$(grep -r -E '(http_proxy=)|(HTTP_PROXY=)|(https_proxy=)|(HTTPS_PROXY=)' \
 			${DESTDIR}/${PREFIX}/etc/profile.d | cut -d':' -f1 | sort | uniq)
 	if [[ "x${RESULT}" != "x" ]];then 
-		echo "Found these scripts setting the enviroment variables http_proxy & HTTP_PROXY:"
+		warning "Found these scripts setting the enviroment variables http_proxy & HTTP_PROXY:"
 		while read -ra FILES; do
 			for FILE in "${FILES[@]}"; do 
 				echo ${FILE}
 			done
 		done  <<< "${RESULT}"
-		echo "You have to either remove those definitions, or set them manually to 'localhost:3128'."
-		echo "Otherwise, pac4cli may fail to work properly."
+		warning "You have to either remove those definitions, or set them manually to 'localhost:3128'."
+		warning "Otherwise, pac4cli may fail to work properly."
 	fi
 }
 
 pre_upgrade() {
-	IS_ENABLED=$(systemctl is-enabled pac4cli 2>/dev/null)
+	colorize
 	IS_ACTIVE=$(systemctl is-active pac4cli 2>/dev/null)
-
-	systemctl stop pac4cli
+	if [[ "xIS_ACTIVE" == "xactive" ]]; then
+		msg2 "Stopping pac4cli service..."
+		systemctl stop pac4cli
+	fi
 }
 
 post_upgrade() {
-	if [[ "x$IS_ENABLED" == "xenabled" ]]; then
-		systemctl enable pac4cli
-	fi
-	if [[ "x$IS_ENABLED" != "x" && "x$IS_ACTIVE" == "xactive" ]]; then
-		systemctl start pac4cli
+	colorize
+	if [[ "x$IS_ACTIVE" == "xactive" ]]; then
+		warning "You need to reload systemd daemons and start pac4cli service."
+		warning "# systemd daemon-reload"
+		warning "# systemd start pac4cli"
 	fi
 }
 
+post_install() {
+	colorize
+	msg "You need to restart your machine and then start pac4cli service."
+}
+
 pre_remove() {
 	systemctl stop pac4cli
 	systemctl disable pac4cli