Update and upstream changes

5 files changed, 29 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a22a0b9f739..a81e9e9273af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = auto-cpufreq-git
 	pkgdesc = Automatic CPU speed & power optimizer
-	pkgver = 1.5.5.r203.3985d3e
+	pkgver = 1.9.6.r3.gff72e1e
 	pkgrel = 1
 	url = https://github.com/AdnanHodzic/auto-cpufreq
 	install = auto-cpufreq.install
@@ -8,16 +8,19 @@ pkgbase = auto-cpufreq-git
 	license = LGPL-3.0
 	makedepends = git
 	makedepends = python-setuptools
+	makedepends = python-pip
 	depends = python-distro
 	depends = python-psutil
 	depends = python-click
 	depends = dmidecode
 	optdepends = cpufreqctl: CPU Power Manager
 	optdepends = gnome-shell-extension-cpufreq: CPU Power Manager for GNOME Shell
+	optdepends = thermald: recommended by upstream
 	provides = auto-cpufreq
 	conflicts = auto-cpufreq
 	source = git+https://github.com/AdnanHodzic/auto-cpufreq.git
+	source = auto-cpufreq.service
+	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = auto-cpufreq-git
-
diff --git a/.gitignore b/.gitignore
index 6829e513c684..0508835d4e34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 !PKGBUILD
 !.SRCINFO
 !auto-cpufreq.install
+!auto-cpufreq.service
diff --git a/PKGBUILD b/PKGBUILD
index 85ceacca6c34..c61056889237 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: crian <crian84 at gmail dot com>
 
 pkgname=auto-cpufreq-git
-pkgver=1.5.5.r203.3985d3e
+pkgver=1.9.6.r3.gff72e1e
 pkgrel=1
 pkgdesc='Automatic CPU speed & power optimizer'
 arch=('any')
@@ -9,18 +9,18 @@ url="https://github.com/AdnanHodzic/auto-cpufreq"
 license=('LGPL-3.0')
 depends=('python-distro' 'python-psutil' 'python-click' 'dmidecode')
 optdepends=('cpufreqctl: CPU Power Manager'
-            'gnome-shell-extension-cpufreq: CPU Power Manager for GNOME Shell')
-makedepends=('git' 'python-setuptools')
+            'gnome-shell-extension-cpufreq: CPU Power Manager for GNOME Shell'
+            'thermald: recommended by upstream')
+makedepends=('git' 'python-setuptools' 'python-pip')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 install="${pkgname%-git}.install"
-source=("git+${url}.git")
-sha256sums=('SKIP')
+source=("git+${url}.git" "${pkgname%-git}.service")
+sha256sums=('SKIP' 'SKIP')
 
 pkgver() {
     cd "$srcdir/${pkgname%-git}"
-    local srcversion="$(grep "version: '" snap/snapcraft.yaml | cut -d "'" -f 2)"
-    printf "%s.r%s.%s" $srcversion "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -39,5 +39,5 @@ package() {
     install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname%-git}/LICENSE"
     install -Dm644 README.md "$pkgdir/usr/share/doc/${pkgname%-git}/README"
     install -Dm755 scripts/cpufreqctl.sh -t "$pkgdir/usr/share/${pkgname%-git}/scripts"
-    install -Dm644 "scripts/${pkgname%-git}.service" -t "$pkgdir/usr/lib/systemd/system"
+    install -Dm644 "$srcdir/${pkgname%-git}.service" -t "$pkgdir/usr/lib/systemd/system"
 }
diff --git a/auto-cpufreq.install b/auto-cpufreq.install
index 00c7a59ea114..e9052aea90c7 100644
--- a/auto-cpufreq.install
+++ b/auto-cpufreq.install
@@ -27,4 +27,9 @@ post_remove() {
 
 	# Remove auto-cpufreq's cpufreqctl binary
 	rm /usr/bin/cpufreqctl.auto-cpufreq
+
+	# Restore original cpufreqctl binary if backup was made
+	if [ -f "/usr/bin/cpufreqctl.auto-cpufreq.bak" ]; then
+		mv /usr/bin/cpufreqctl.auto-cpufreq.bak /usr/bin/cpufreqctl
+	fi
 }
diff --git a/auto-cpufreq.service b/auto-cpufreq.service
new file mode 100644
index 000000000000..b3000a763b23
--- /dev/null
+++ b/auto-cpufreq.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=auto-cpufreq - Automatic CPU speed & power optimizer for Linux
+After=network.target network-online.target
+
+[Service]
+Type=simple
+User=root
+ExecStart=/usr/bin/auto-cpufreq --daemon
+[Install]
+WantedBy=multi-user.target