[arch-commits] Commit in lirc/trunk (6 files)

[Lukas Fleischer]

    Date: Wednesday, August 6, 2014 @ 13:45:19
  Author: lfleischer
Revision: 219356

Use upstream unit files

Modified:
  lirc/trunk/PKGBUILD
  lirc/trunk/irexec.service
  lirc/trunk/lirc-utils.install
  lirc/trunk/lirc.install
Deleted:
  lirc/trunk/lirc.service
  lirc/trunk/lircm.service

--------------------+
 PKGBUILD           |   11 +----------
 irexec.service     |    8 ++++----
 lirc-utils.install |    8 +++++++-
 lirc.install       |   10 ++++------
 lirc.service       |   12 ------------
 lircm.service      |   12 ------------
 6 files changed, 16 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-06 07:48:53 UTC (rev 219355)
+++ PKGBUILD	2014-08-06 11:45:19 UTC (rev 219356)
@@ -16,16 +16,12 @@
 source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"
 	"wpc8769l-build-fix.patch"
         lirc.logrotate
-        lirc.service 
-        lircm.service 
         irexec.service
         lirc.tmpfiles)
 md5sums=('3b78c3cc872d5e2fa78b796c2efd46db'
          '9ec33169b3407f74264062d7679dd269'
          '3deb02604b37811d41816e9b4385fcc3'
-         'a9ab637e7207472e61e55a2fa75dc555'
-         '1847b9997685bc3ad2cf11bea4590a92'
-         '07131d117fcfe9dcd50c453c3a5e9531'
+         '32df3b9bc859565d6acf5f0e5b747083'
          'febf25c154a7d36f01159e84f26c2d9a')
 
 prepare() {
@@ -33,9 +29,6 @@
 
   patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch"
 
-  # Do not use upstream systemd units yet.
-  sed -i 's/\(SUBDIRS.*\) $(SYSTEMD_DIR)/\1/' Makefile.am
-
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
       -e 's/@X_LIBS@//g' \
@@ -91,8 +84,6 @@
 
   make DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service
-  install -Dm644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service
   install -Dm644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
   install -Dm644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
 

Modified: irexec.service
===================================================================
--- irexec.service	2014-08-06 07:48:53 UTC (rev 219355)
+++ irexec.service	2014-08-06 11:45:19 UTC (rev 219356)
@@ -1,11 +1,11 @@
 [Unit]
-Description=IR Exec
-After=lirc.service
-Wants=lirc.service
+Description=LIRC command handler
+After=network.target
 
 [Service]
+Type=forking
 ExecStart=/usr/bin/irexec --daemon
-Type=forking
 
 [Install]
 WantedBy=multi-user.target
+Wants=lircd.service

Modified: lirc-utils.install
===================================================================
--- lirc-utils.install	2014-08-06 07:48:53 UTC (rev 219355)
+++ lirc-utils.install	2014-08-06 11:45:19 UTC (rev 219356)
@@ -3,5 +3,11 @@
 }
 
 post_upgrade() {
-  post_install
+	post_install
+
+	if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then
+		echo ':: lirc.service and lircm.service have been replaced'
+		echo '   by the upstream unit files lircd.service and'
+		echo '   lircmd.service.'
+	fi
 }

Modified: lirc.install
===================================================================
--- lirc.install	2014-08-06 07:48:53 UTC (rev 219355)
+++ lirc.install	2014-08-06 11:45:19 UTC (rev 219356)
@@ -1,16 +1,14 @@
 EXTRAMODULES=extramodules-3.12-ARCH
 
 post_install() {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
+	echo ">>> Updating module dependencies. Please wait ..."
+	depmod "$(cat /usr/lib/modules/$EXTRAMODULES/version)" >/dev/null 2>&1
 }
 
 post_upgrade() {
-  post_install
+	post_install
 }
 
-# arg 1:  the old package version
 post_remove() {
-  post_install
+	post_install
 }

Deleted: lirc.service
===================================================================
--- lirc.service	2014-08-06 07:48:53 UTC (rev 219355)
+++ lirc.service	2014-08-06 11:45:19 UTC (rev 219356)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Linux Infrared Remote Control
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/lirc/lircd.pid
-ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 
-
-[Install]
-WantedBy=multi-user.target
-

Deleted: lircm.service
===================================================================
--- lircm.service	2014-08-06 07:48:53 UTC (rev 219355)
+++ lircm.service	2014-08-06 11:45:19 UTC (rev 219356)
@@ -1,12 +0,0 @@
-[Unit]
-Description=LIRC Mouse
-Requires=lirc.service
-After=network.target lirc.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/lircmd 
-
-[Install]
-WantedBy=multi-user.target
-