Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e83a865c3e6ebe90aca5994d8fcaf175faed9cae
commit e83a865c3e6ebe90aca5994d8fcaf175faed9cae Author: crazy <[email protected]> Date: Mon Jun 20 16:09:21 2016 +0200 lirc-0.9.4-1-x86_64 * Version bump ( I'm sure I broke something ) * follow upstream and use provided files for systemd * added lirc group like upstream want * removed our custom paths and use what upstream suggests here too * 'lirc-setup' is broken right now because some python2/python3 mess * ( I'll fix ASAP ) diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index e9174e7..db3a5aa 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: voroskoi <[email protected]> pkgname=lirc -pkgver=0.9.1 -pkgrel=2 +pkgver=0.9.4 +pkgrel=1 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" _F_archive_grepv="pre" @@ -15,43 +15,33 @@ subdepends=('glibc>=2.22-7') subgroups=('lib') subarchs=('i686 x86_64') -depends=('alsa-lib>=1.1.0-2' 'libusb>=0.1.5-4' 'libsystemd>=227-14') -makedepends=('help2man') +depends=('alsa-lib>=1.1.0-2' 'libusb>=0.1.5-4' 'libsystemd>=227-14' 'python3') +makedepends=('help2man' 'libxslt') rodepends=("liblirc=$pkgver") groups=('apps-extra') replaces=('lirc_modules') archs=('i686' 'x86_64') -backup=(etc/lirc{d,md}.conf etc/sysconfig/lirc) -source=(${source[@]} lirc.service lircmd.service lirc.logrotate lirc.sysconfig README.Frugalware) -sha1sums=('ca394102bf2808273c4e4037f5fa632a5a33c456' \ - '3f1b357af829af4e9afffa4b029dbd9e2a31de0b' \ - '636f9b99f5b5115fa040270a6171f440dd6b77c0' \ - '4342b004eb53d51fcbb9af2cf136bb4990874608' \ - '8f679ce34e7077c648f52497e0aff7480dc2a562' \ - '0b80c73e902920c028dca98a9006aaa313c6e120') -_F_systemd_units=(lirc= lircmd=) -Finclude systemd -Fconfopts="--enable-sandboxed --with-driver=userspace" +source+=(lirc.logrotate) +backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') +sha1sums=('23bcafb54f9ad62d75fe1825142f3e5ae9a2438e' \ + '4342b004eb53d51fcbb9af2cf136bb4990874608') + +options+=('scriptlet') build() { - Fbuild - # lircd.conf samples - Fmkdir /usr/share/remotes - Fcprrel remotes /usr/share/ + _F_make_opts="-j1" + Fbuild - Ffilerel contrib/lirc.rules /etc/udev/rules.d/60-lirc.rules - Fsed '\r' '' $Fdestdir/etc/udev/rules.d/60-lirc.rules + Ffilerel contrib/*.rules /etc/udev/rules.d/ + Fsed '\r' '' $Fdestdir/etc/udev/rules.d/*.rules Fmkdir /etc/{logrotate.d,sysconfig} Ffile lirc.logrotate /etc/logrotate.d/ - Ffile lirc.sysconfig /etc/sysconfig/lirc Fmkdir /etc/tmpfiles.d cat > $Fdestdir/etc/tmpfiles.d/lirc.conf << EOF d /var/run/lirc 0755 root root - EOF - Ffile /lib/systemd/system/lirc.service - Ffile /lib/systemd/system/lircmd.service - Fgenscriptlet + Fsplit liblirc usr/{include,lib} } diff --git a/source/apps-extra/lirc/README.Frugalware b/source/apps-extra/lirc/README.Frugalware deleted file mode 100644 index 6946583..0000000 --- a/source/apps-extra/lirc/README.Frugalware +++ /dev/null @@ -1,17 +0,0 @@ -After installing lirc you need to take the following steps: - -1. Find a lird.conf for your remote control on http://lirc.sourceforge.net/remotes/[remotes] - You can also take a look on '/usr/share/remotes' directory if you do not have an internet connection. - If you do not find your remote controller, try `irrecord myremote` command. -2. Copy your lircd.conf to '/etc/' directory as root. -3. Add evdev to '/etc/sysconfig/modules'. -4. Load the module with `modprobe evdev`. -5. Edit '/etc/sysconfig/lirc' if necessary. -+ ----------------------------------------------- -$ cat /proc/bus/input/devices | grep -e N -e H ----------------------------------------------- -+ -will show you the event# you should use. (Default is 2.) - -6. Start lircd and lircmd with `sudo service lirc start`. diff --git a/source/apps-extra/lirc/lirc.install b/source/apps-extra/lirc/lirc.install new file mode 100644 index 0000000..c9ba40d --- /dev/null +++ b/source/apps-extra/lirc/lirc.install @@ -0,0 +1,26 @@ +post_common() { + + getent group lirc 2>&1 > /dev/null || /usr/sbin/groupadd -g 86 lirc + +} + +post_install() { + post_common + + true +} + +post_upgrade() { + post_common + +} + +post_remove() { + + getent group lirc 2>&1 > /dev/null && /usr/sbin/groupdel lirc +} + +op=$1 +shift +$op $* + diff --git a/source/apps-extra/lirc/lirc.service b/source/apps-extra/lirc/lirc.service deleted file mode 100644 index 99df695..0000000 --- a/source/apps-extra/lirc/lirc.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=LIRC Infrared Signal Decoder -After=network.target - -[Service] -Type=forking -EnvironmentFile=/etc/sysconfig/lirc -PIDFile=/var/run/lirc/lircd.pid -ExecStart=/usr/sbin/lircd $LIRCD_OPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/source/apps-extra/lirc/lirc.sysconfig b/source/apps-extra/lirc/lirc.sysconfig deleted file mode 100644 index 35cd67f..0000000 --- a/source/apps-extra/lirc/lirc.sysconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Note: in addition to these parameters, you need to have working -# configuration file for lircd (and lircmd if enabled). - -# Options to lircd(8). Typically, at least a remote controller driver -# ("-H foo") needs to be specified here. Run "/usr/sbin/lircd -H help" to get -# a listing of supported drivers. -LIRCD_OPTIONS="-H dev/input --device=/dev/input/event2" - -# Options to lircmd(8). -LIRCMD_OPTIONS="" diff --git a/source/apps-extra/lirc/lircmd.service b/source/apps-extra/lirc/lircmd.service deleted file mode 100644 index fc52978..0000000 --- a/source/apps-extra/lirc/lircmd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=LIRC Infrared Mouse Event Signal Decoder -Requires=lirc.service -After=network.target lirc.service - -[Service] -Type=forking -EnvironmentFile=/etc/sysconfig/lirc -ExecStart=/usr/sbin/lircmd $LIRCMD_OPTIONS - -[Install] -WantedBy=multi-user.target _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
