Date: Friday, May 15, 2015 @ 13:02:07
Author: spupykin
Revision: 133495
archrelease: copy trunk to community-i686, community-x86_64
Added:
apcupsd/repos/community-i686/PKGBUILD
(from rev 133494, apcupsd/trunk/PKGBUILD)
apcupsd/repos/community-i686/apcupsd-tmpfiles.conf
(from rev 133494, apcupsd/trunk/apcupsd-tmpfiles.conf)
apcupsd/repos/community-i686/apcupsd.install
(from rev 133494, apcupsd/trunk/apcupsd.install)
apcupsd/repos/community-i686/apcupsd.service
(from rev 133494, apcupsd/trunk/apcupsd.service)
apcupsd/repos/community-x86_64/PKGBUILD
(from rev 133494, apcupsd/trunk/PKGBUILD)
apcupsd/repos/community-x86_64/apcupsd-tmpfiles.conf
(from rev 133494, apcupsd/trunk/apcupsd-tmpfiles.conf)
apcupsd/repos/community-x86_64/apcupsd.install
(from rev 133494, apcupsd/trunk/apcupsd.install)
apcupsd/repos/community-x86_64/apcupsd.service
(from rev 133494, apcupsd/trunk/apcupsd.service)
Deleted:
apcupsd/repos/community-i686/PKGBUILD
apcupsd/repos/community-i686/apcupsd-tmpfiles.conf
apcupsd/repos/community-i686/apcupsd.service
apcupsd/repos/community-x86_64/PKGBUILD
apcupsd/repos/community-x86_64/apcupsd-tmpfiles.conf
apcupsd/repos/community-x86_64/apcupsd.service
----------------------------------------+
/PKGBUILD | 132 +++++++++++++++++++++++++++++++
/apcupsd-tmpfiles.conf | 6 +
/apcupsd.service | 16 +++
community-i686/PKGBUILD | 65 ---------------
community-i686/apcupsd-tmpfiles.conf | 3
community-i686/apcupsd.install | 3
community-i686/apcupsd.service | 8 -
community-x86_64/PKGBUILD | 65 ---------------
community-x86_64/apcupsd-tmpfiles.conf | 3
community-x86_64/apcupsd.install | 3
community-x86_64/apcupsd.service | 8 -
11 files changed, 160 insertions(+), 152 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-05-15 11:01:47 UTC (rev 133494)
+++ community-i686/PKGBUILD 2015-05-15 11:02:07 UTC (rev 133495)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluew...@xinu.at>
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Todd Musall <tmus...@comcast.net>
-# Contributor: Massimiliano Torromeo <massimiliano.torro...@gmail.com>
-
-pkgname=apcupsd
-pkgver=3.14.13
-pkgrel=1
-pkgdesc="Power mangement and controlling most of APC's UPS models"
-arch=(i686 x86_64)
-url="http://www.apcupsd.org";
-license=('GPL')
-depends=('gcc-libs' 'systemd-sysvcompat')
-optdepends=('gd: for CGI'
- 'gconf: for frontend'
- 'gtk2: for frontend')
-makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
-backup=(etc/apcupsd/apcupsd.conf
- etc/apcupsd/hosts.conf
- etc/apcupsd/multimon.conf
- etc/apcupsd/apcupsd.css
- etc/apcupsd/changeme
- etc/apcupsd/commfailure
- etc/apcupsd/commok
- etc/apcupsd/offbattery
- etc/apcupsd/onbattery
- etc/apcupsd/apccontrol)
-source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig}
- apcupsd.service
- apcupsd-tmpfiles.conf)
-sha256sums=('57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9'
- 'SKIP'
- '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
- 'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f')
-validpgpkeys=(635B9D943945DCA05BE9AB0A24E84804A57B2D90)
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \
- --sbindir=/usr/bin \
- --enable-cgi --enable-usb --enable-net \
- --with-upstype=usb --with-upscable=usb \
- --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
- --enable-pthreads --enable-gapcmon
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- sed -i 's#^LOCKFILE .*$#LOCKFILE /run/apcupsd#'
"$pkgdir/etc/apcupsd/apcupsd.conf"
-
- install -Dm644 "$srcdir/apcupsd.service"
"$pkgdir/usr/lib/systemd/system/apcupsd.service"
- install -Dm644 "$srcdir/apcupsd-tmpfiles.conf"
"$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
-
- chmod 755 "$pkgdir"/usr/bin/*
-
- install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
- mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
-
- rm -rf "$pkgdir/usr/share/hal"
-}
Copied: apcupsd/repos/community-i686/PKGBUILD (from rev 133494,
apcupsd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-05-15 11:02:07 UTC (rev 133495)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Florian Pritz <bluew...@xinu.at>
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Todd Musall <tmus...@comcast.net>
+# Contributor: Massimiliano Torromeo <massimiliano.torro...@gmail.com>
+
+pkgname=apcupsd
+pkgver=3.14.13
+pkgrel=2
+pkgdesc="Power mangement and controlling most of APC's UPS models"
+arch=(i686 x86_64)
+url="http://www.apcupsd.org";
+license=('GPL')
+depends=('gcc-libs' 'systemd-sysvcompat')
+optdepends=('gd: for CGI'
+ 'gconf: for frontend'
+ 'gtk2: for frontend')
+makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
+install=apcupsd.install
+backup=(etc/apcupsd/apcupsd.conf
+ etc/apcupsd/hosts.conf
+ etc/apcupsd/multimon.conf
+ etc/apcupsd/apcupsd.css
+ etc/apcupsd/changeme
+ etc/apcupsd/commfailure
+ etc/apcupsd/commok
+ etc/apcupsd/offbattery
+ etc/apcupsd/onbattery
+ etc/apcupsd/apccontrol)
+source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig}
+ apcupsd.service
+ apcupsd-tmpfiles.conf)
+sha256sums=('57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9'
+ 'SKIP'
+ '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
+ 'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f')
+validpgpkeys=(635B9D943945DCA05BE9AB0A24E84804A57B2D90)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \
+ --sbindir=/usr/bin \
+ --enable-cgi --enable-usb --enable-net \
+ --with-upstype=usb --with-upscable=usb \
+ --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
+ --enable-pthreads --enable-gapcmon
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ sed -i 's#^LOCKFILE .*$#LOCKFILE /run/apcupsd#'
"$pkgdir/etc/apcupsd/apcupsd.conf"
+
+ install -Dm644 "$srcdir/apcupsd.service"
"$pkgdir/usr/lib/systemd/system/apcupsd.service"
+ install -Dm644 "$srcdir/apcupsd-tmpfiles.conf"
"$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
+
+ chmod 755 "$pkgdir"/usr/bin/*
+
+ install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
+ mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
+
+ rm -rf "$pkgdir/usr/share/hal"
+}
Deleted: community-i686/apcupsd-tmpfiles.conf
===================================================================
--- community-i686/apcupsd-tmpfiles.conf 2015-05-15 11:01:47 UTC (rev
133494)
+++ community-i686/apcupsd-tmpfiles.conf 2015-05-15 11:02:07 UTC (rev
133495)
@@ -1,3 +0,0 @@
-r /etc/apcupsd/powerfail
-r /etc/nologin
-d /run/apcupsd 0755 root root
Copied: apcupsd/repos/community-i686/apcupsd-tmpfiles.conf (from rev 133494,
apcupsd/trunk/apcupsd-tmpfiles.conf)
===================================================================
--- community-i686/apcupsd-tmpfiles.conf (rev 0)
+++ community-i686/apcupsd-tmpfiles.conf 2015-05-15 11:02:07 UTC (rev
133495)
@@ -0,0 +1,3 @@
+r /etc/apcupsd/powerfail
+r /etc/nologin
+d /run/apcupsd 0755 root root
Copied: apcupsd/repos/community-i686/apcupsd.install (from rev 133494,
apcupsd/trunk/apcupsd.install)
===================================================================
--- community-i686/apcupsd.install (rev 0)
+++ community-i686/apcupsd.install 2015-05-15 11:02:07 UTC (rev 133495)
@@ -0,0 +1,3 @@
+post_install() {
+ systemd-tmpfiles --create apcupsd.conf
+}
Deleted: community-i686/apcupsd.service
===================================================================
--- community-i686/apcupsd.service 2015-05-15 11:01:47 UTC (rev 133494)
+++ community-i686/apcupsd.service 2015-05-15 11:02:07 UTC (rev 133495)
@@ -1,8 +0,0 @@
-[Unit]
-Description=APC UPS Monitor
-
-[Service]
-ExecStart=/usr/bin/apcupsd -b
-
-[Install]
-WantedBy=multi-user.target
Copied: apcupsd/repos/community-i686/apcupsd.service (from rev 133494,
apcupsd/trunk/apcupsd.service)
===================================================================
--- community-i686/apcupsd.service (rev 0)
+++ community-i686/apcupsd.service 2015-05-15 11:02:07 UTC (rev 133495)
@@ -0,0 +1,8 @@
+[Unit]
+Description=APC UPS Monitor
+
+[Service]
+ExecStart=/usr/bin/apcupsd -b
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-05-15 11:01:47 UTC (rev 133494)
+++ community-x86_64/PKGBUILD 2015-05-15 11:02:07 UTC (rev 133495)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluew...@xinu.at>
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Todd Musall <tmus...@comcast.net>
-# Contributor: Massimiliano Torromeo <massimiliano.torro...@gmail.com>
-
-pkgname=apcupsd
-pkgver=3.14.13
-pkgrel=1
-pkgdesc="Power mangement and controlling most of APC's UPS models"
-arch=(i686 x86_64)
-url="http://www.apcupsd.org";
-license=('GPL')
-depends=('gcc-libs' 'systemd-sysvcompat')
-optdepends=('gd: for CGI'
- 'gconf: for frontend'
- 'gtk2: for frontend')
-makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
-backup=(etc/apcupsd/apcupsd.conf
- etc/apcupsd/hosts.conf
- etc/apcupsd/multimon.conf
- etc/apcupsd/apcupsd.css
- etc/apcupsd/changeme
- etc/apcupsd/commfailure
- etc/apcupsd/commok
- etc/apcupsd/offbattery
- etc/apcupsd/onbattery
- etc/apcupsd/apccontrol)
-source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig}
- apcupsd.service
- apcupsd-tmpfiles.conf)
-sha256sums=('57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9'
- 'SKIP'
- '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
- 'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f')
-validpgpkeys=(635B9D943945DCA05BE9AB0A24E84804A57B2D90)
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \
- --sbindir=/usr/bin \
- --enable-cgi --enable-usb --enable-net \
- --with-upstype=usb --with-upscable=usb \
- --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
- --enable-pthreads --enable-gapcmon
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- sed -i 's#^LOCKFILE .*$#LOCKFILE /run/apcupsd#'
"$pkgdir/etc/apcupsd/apcupsd.conf"
-
- install -Dm644 "$srcdir/apcupsd.service"
"$pkgdir/usr/lib/systemd/system/apcupsd.service"
- install -Dm644 "$srcdir/apcupsd-tmpfiles.conf"
"$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
-
- chmod 755 "$pkgdir"/usr/bin/*
-
- install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
- mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
-
- rm -rf "$pkgdir/usr/share/hal"
-}
Copied: apcupsd/repos/community-x86_64/PKGBUILD (from rev 133494,
apcupsd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-05-15 11:02:07 UTC (rev 133495)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Florian Pritz <bluew...@xinu.at>
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Todd Musall <tmus...@comcast.net>
+# Contributor: Massimiliano Torromeo <massimiliano.torro...@gmail.com>
+
+pkgname=apcupsd
+pkgver=3.14.13
+pkgrel=2
+pkgdesc="Power mangement and controlling most of APC's UPS models"
+arch=(i686 x86_64)
+url="http://www.apcupsd.org";
+license=('GPL')
+depends=('gcc-libs' 'systemd-sysvcompat')
+optdepends=('gd: for CGI'
+ 'gconf: for frontend'
+ 'gtk2: for frontend')
+makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
+install=apcupsd.install
+backup=(etc/apcupsd/apcupsd.conf
+ etc/apcupsd/hosts.conf
+ etc/apcupsd/multimon.conf
+ etc/apcupsd/apcupsd.css
+ etc/apcupsd/changeme
+ etc/apcupsd/commfailure
+ etc/apcupsd/commok
+ etc/apcupsd/offbattery
+ etc/apcupsd/onbattery
+ etc/apcupsd/apccontrol)
+source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig}
+ apcupsd.service
+ apcupsd-tmpfiles.conf)
+sha256sums=('57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9'
+ 'SKIP'
+ '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
+ 'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f')
+validpgpkeys=(635B9D943945DCA05BE9AB0A24E84804A57B2D90)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \
+ --sbindir=/usr/bin \
+ --enable-cgi --enable-usb --enable-net \
+ --with-upstype=usb --with-upscable=usb \
+ --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
+ --enable-pthreads --enable-gapcmon
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ sed -i 's#^LOCKFILE .*$#LOCKFILE /run/apcupsd#'
"$pkgdir/etc/apcupsd/apcupsd.conf"
+
+ install -Dm644 "$srcdir/apcupsd.service"
"$pkgdir/usr/lib/systemd/system/apcupsd.service"
+ install -Dm644 "$srcdir/apcupsd-tmpfiles.conf"
"$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
+
+ chmod 755 "$pkgdir"/usr/bin/*
+
+ install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
+ mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
+
+ rm -rf "$pkgdir/usr/share/hal"
+}
Deleted: community-x86_64/apcupsd-tmpfiles.conf
===================================================================
--- community-x86_64/apcupsd-tmpfiles.conf 2015-05-15 11:01:47 UTC (rev
133494)
+++ community-x86_64/apcupsd-tmpfiles.conf 2015-05-15 11:02:07 UTC (rev
133495)
@@ -1,3 +0,0 @@
-r /etc/apcupsd/powerfail
-r /etc/nologin
-d /run/apcupsd 0755 root root
Copied: apcupsd/repos/community-x86_64/apcupsd-tmpfiles.conf (from rev 133494,
apcupsd/trunk/apcupsd-tmpfiles.conf)
===================================================================
--- community-x86_64/apcupsd-tmpfiles.conf (rev 0)
+++ community-x86_64/apcupsd-tmpfiles.conf 2015-05-15 11:02:07 UTC (rev
133495)
@@ -0,0 +1,3 @@
+r /etc/apcupsd/powerfail
+r /etc/nologin
+d /run/apcupsd 0755 root root
Copied: apcupsd/repos/community-x86_64/apcupsd.install (from rev 133494,
apcupsd/trunk/apcupsd.install)
===================================================================
--- community-x86_64/apcupsd.install (rev 0)
+++ community-x86_64/apcupsd.install 2015-05-15 11:02:07 UTC (rev 133495)
@@ -0,0 +1,3 @@
+post_install() {
+ systemd-tmpfiles --create apcupsd.conf
+}
Deleted: community-x86_64/apcupsd.service
===================================================================
--- community-x86_64/apcupsd.service 2015-05-15 11:01:47 UTC (rev 133494)
+++ community-x86_64/apcupsd.service 2015-05-15 11:02:07 UTC (rev 133495)
@@ -1,8 +0,0 @@
-[Unit]
-Description=APC UPS Monitor
-
-[Service]
-ExecStart=/usr/bin/apcupsd -b
-
-[Install]
-WantedBy=multi-user.target
Copied: apcupsd/repos/community-x86_64/apcupsd.service (from rev 133494,
apcupsd/trunk/apcupsd.service)
===================================================================
--- community-x86_64/apcupsd.service (rev 0)
+++ community-x86_64/apcupsd.service 2015-05-15 11:02:07 UTC (rev 133495)
@@ -0,0 +1,8 @@
+[Unit]
+Description=APC UPS Monitor
+
+[Service]
+ExecStart=/usr/bin/apcupsd -b
+
+[Install]
+WantedBy=multi-user.target
