Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/e5d7687358a7b36561e0bd204910aaab3902f7fa)

4 files changed, 6 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3597eea7e3b1..1a361e17b239 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.1.1
-# Wed Dec 26 10:25:09 UTC 2018
+# Wed Dec 26 13:01:28 UTC 2018
 pkgbase = vdr-epg-daemon
 	pkgver = 1.1.146
-	pkgrel = 1
+	pkgrel = 2
 	url = http://projects.vdr-developer.org/projects/vdr-epg-daemon
 	arch = x86_64
 	arch = i686
@@ -21,11 +21,7 @@ pkgbase = vdr-epg-daemon
 	makedepends = libxslt
 	makedepends = python
 	source = https://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/vdr-epg-daemon-1.1.146.tar.bz2
-	source = epgd.service
-	source = epghttpd.service
 	md5sums = 6a892aedd6af850be6880d702b9222d5
-	md5sums = c1b7f66bc84dbedba2ec4104ebefaba4
-	md5sums = d84f1a9383e22baa922455eaf9dd60b6
 
 pkgname = epgd
 	pkgdesc = write epg data to a mysql database
diff --git a/PKGBUILD b/PKGBUILD
index beac495c06fa..f4606580906e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,25 +4,17 @@
 pkgbase=vdr-epg-daemon
 pkgname=('epgd' 'mariadb-epglv')
 pkgver=1.1.146
-pkgrel=1
+pkgrel=2
 url='http://projects.vdr-developer.org/projects/vdr-epg-daemon'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 makedepends=('curl' 'git' 'imlib2' 'jansson' 'libarchive' 'libjpeg' 'libmariadbclient' 'libmicrohttpd' 'libxslt' 'python')
-source=("https://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/$pkgbase-$pkgver.tar.bz2"
-        "epgd.service"
-        "epghttpd.service")
-md5sums=('6a892aedd6af850be6880d702b9222d5'
-         'c1b7f66bc84dbedba2ec4104ebefaba4'
-         'd84f1a9383e22baa922455eaf9dd60b6')
+source=("https://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/$pkgbase-$pkgver.tar.bz2")
+md5sums=('6a892aedd6af850be6880d702b9222d5')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
   make -j1 PREFIX=/usr
-
-  echo "done once"
-
-  make -j1 PREFIX=/usr
 }
 
 package_epgd() {
@@ -31,12 +23,7 @@ package_epgd() {
 
   cd "$srcdir/$pkgbase-$pkgver"
 
-  make -j1 PREFIX=/usr DESTDIR="$pkgdir" install
-  rm "$pkgdir/etc/systemd/system/epgd.service"
-  rm "$pkgdir/etc/systemd/system/epghttpd.service"
-
-  install -Dm644 "${srcdir}/epgd.service" $pkgdir/usr/lib/systemd/system/epgd.service
-  install -Dm644 "${srcdir}/epghttpd.service" $pkgdir/usr/lib/systemd/system/epghttpd.service
+  make -j1 PREFIX=/usr SYSTEMDDEST="$pkgdir/usr/lib/systemd/system" DESTDIR="$pkgdir" install
 
   rm "$pkgdir/usr/lib/mysql/plugin/mysqlepglv.so"
   cd $pkgdir
diff --git a/epgd.service b/epgd.service
deleted file mode 100644
index ac905995115c..000000000000
--- a/epgd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description = Database driven EPG Data collector
-After = mariadb.service
-
-[Service]
-Type = forking
-ExecStart = /usr/bin/epgd
-Restart = always
-
-[Install]
-WantedBy = multi-user.target
diff --git a/epghttpd.service b/epghttpd.service
deleted file mode 100644
index 0839c45568b1..000000000000
--- a/epghttpd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description = EPG HTTP Daemon that provides a web interface
-After = epgd.service
-
-[Service]
-Type = forking
-ExecStart = /usr/bin/epghttpd
-Restart = always
-
-[Install]
-WantedBy = multi-user.target