v3

5 files changed, 10 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5edc149a39aa..89d4205ffb2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = gnome-mojave-timed-wallpaper
 	pkgdesc = Gnome time based mojave wallpaper
-	pkgver = v2
+	pkgver = v3
 	pkgrel = 1
 	url = https://github.com/julthon/gnome-mojave-timed-wallpaper
 	arch = any
 	depends = gnome-shell
 	depends = gnome-backgrounds
-	source = gnome-mojave-timed-wallpaper-v2.tar.gz::https://github.com/julthon/gnome-mojave-timed-wallpaper/releases/download/v2/gnome-mojave-timed-wallpaper_v2.tar.gz
-	md5sums = 1ffc2b56f4a9c332c3c6d575c11e00dc
+	source = gnome-mojave-timed-wallpaper-v3.tar.gz::https://github.com/julthon/gnome-mojave-timed-wallpaper/releases/download/v3/gnome-mojave-timed-wallpaper_v3.tar.gz
+	sha512sums = 17b049b5f5d423cce3c458caafef48dac05b6768f574370ced9621e73d52f37d7c1984292db2b96408ff982d613da88daa80c7a6c55abf11465b16901387607f
 
 pkgname = gnome-mojave-timed-wallpaper
 
diff --git a/PKGBUILD b/PKGBUILD
index 0981f9a77939..d9abab389239 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Julian Thonhauser <julthon@gmail.com>
 pkgname=gnome-mojave-timed-wallpaper
-pkgver=v2
+pkgver=v3
 pkgrel=1
 pkgdesc="Gnome time based mojave wallpaper"
 url="https://github.com/julthon/gnome-mojave-timed-wallpaper"
 arch=(any)
 depends=(gnome-shell gnome-backgrounds)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/julthon/gnome-mojave-timed-wallpaper/releases/download/$pkgver/gnome-mojave-timed-wallpaper_$pkgver.tar.gz")
-md5sums=('1ffc2b56f4a9c332c3c6d575c11e00dc')
+sha512sums=('17b049b5f5d423cce3c458caafef48dac05b6768f574370ced9621e73d52f37d7c1984292db2b96408ff982d613da88daa80c7a6c55abf11465b16901387607f')
 
 package() {
-  _instdir="$pkgdir/usr/share/backgrounds"
-  _hookdir="$pkgdir/usr/share/libalpm/hooks"
-  mkdir -p $_instdir $_hookdir
+  _instdir="$pkgdir/usr/share/backgrounds/gnome/"
+  _bgpropdir="$pkgdir/usr/share/gnome-background-properties"
+  mkdir -p $_instdir $_bgpropdir
   cp -dpr --no-preserve=ownership "$srcdir/mojave" $_instdir
-  cp -dp --no-preserve=ownership "$srcdir/adwaita-timed.xml" "$_instdir/mojave/adwaita-timed.xml"
-  cp -dp --no-preserve=ownership $startdir/*.hook "$_hookdir"
+  cp -dp --no-preserve=ownership "$srcdir/mojave-timed.xml" "$_instdir"
+  cp -dp --no-preserve=ownership "$srcdir/mojave.xml" "$_bgpropdir/mojave.xml"
 }
 
diff --git a/gnome-mojave-timed-wallpaper-01-install.hook b/gnome-mojave-timed-wallpaper-01-install.hook
deleted file mode 100644
index 9c863d7d735a..000000000000
--- a/gnome-mojave-timed-wallpaper-01-install.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Package
-Operation = Install
-Target = gnome-mojave-timed-wallpaper
-
-[Action]
-Description = Overwrite adwaita-timed.xml
-When = PostTransaction
-Exec = /usr/bin/bash -c "mv /usr/share/backgrounds/gnome/adwaita-timed.xml /usr/share/backgrounds/gnome/adwaita-timed.xml.bak; cp /usr/share/backgrounds/mojave/adwaita-timed.xml /usr/share/backgrounds/gnome/adwaita-timed.xml"
-NeedsTargets
-
diff --git a/gnome-mojave-timed-wallpaper-02-upgrade.hook b/gnome-mojave-timed-wallpaper-02-upgrade.hook
deleted file mode 100644
index e5e74bcc2c7e..000000000000
--- a/gnome-mojave-timed-wallpaper-02-upgrade.hook
+++ /dev/null
@@ -1,12 +0,0 @@
-[Trigger]
-Type = File
-Operation = Upgrade
-Operation = Install
-Target = usr/share/backgrounds/gnome/adwaita-timed.xml
-
-[Action]
-Description = Overwrite adwaita-timed.xml
-When = PostTransaction
-Exec = /usr/bin/cp /usr/share/backgrounds/mojave/adwaita-timed.xml /usr/share/backgrounds/gnome/adwaita-timed.xml
-NeedsTargets
-
diff --git a/gnome-mojave-timed-wallpaper-03-remove.hook b/gnome-mojave-timed-wallpaper-03-remove.hook
deleted file mode 100644
index 45b14a79613f..000000000000
--- a/gnome-mojave-timed-wallpaper-03-remove.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Package
-Operation = Remove
-Target = gnome-mojave-timed-wallpaper
-
-[Action]
-Description = Resetting adwaita-timed.xml
-When = PreTransaction
-Exec = /usr/bin/mv /usr/share/backgrounds/gnome/adwaita-timed.xml.bak /usr/share/backgrounds/gnome/adwaita-timed.xml
-NeedsTargets
-