[arch-commits] Commit in pm-utils/trunk (2 files)

[Jan de Groot]

    Date: Thursday, January 20, 2011 @ 15:51:49
  Author: jgc
Revision: 107039

upgpkg: pm-utils 1.4.1-2
Remove power.d hooks, they are buggy and unmaintained. Remove vbetool dependency. Fix logging

Added:
  pm-utils/trunk/pm-utils-1.4.1-init-logfile-append.patch
Modified:
  pm-utils/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   11 +++++++++--
 pm-utils-1.4.1-init-logfile-append.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-20 20:40:18 UTC (rev 107038)
+++ PKGBUILD	2011-01-20 20:51:49 UTC (rev 107039)
@@ -5,21 +5,24 @@
 
 pkgname=pm-utils
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities and scripts for suspend and hibernate power management"
 arch=('i686' 'x86_64')
 url="http://pm-utils.freedesktop.org"
 license=('GPL')
-depends=('bash' 'procps' 'vbetool' 'pm-quirks')
+depends=('bash' 'procps' 'pm-quirks')
 optdepends=('upower')
 makedepends=('xmlto' 'docbook-xml' 'docbook-xsl')
 source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+        pm-utils-1.4.1-init-logfile-append.patch
         11netcfg)
 md5sums=('1742a556089c36c3a89eb1b957da5a60'
+         '358cbfe1686922e2d81f22fa034ba58a'
          '9839687c8787d99fd4ff36aa3238c27b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/pm-utils-1.4.1-init-logfile-append.patch"
   ./configure --prefix=/usr \
       --sysconfdir=/etc \
       --localstatedir=/var
@@ -28,6 +31,10 @@
 
   # install additional hooks
   install -m755 "${srcdir}/11netcfg" "${pkgdir}/usr/lib/pm-utils/sleep.d/"
+
   # nm >=0.8.2 has native udev suspend/resume support
   rm -f "${pkgdir}/usr/lib/pm-utils/sleep.d/55NetworkManager"
+  
+  # Do not mess with powersaving options when user switches to battery
+  rm -f "${pkgdir}"/usr/lib/pm-utils/power.d/*
 }

Added: pm-utils-1.4.1-init-logfile-append.patch
===================================================================
--- pm-utils-1.4.1-init-logfile-append.patch	                        (rev 0)
+++ pm-utils-1.4.1-init-logfile-append.patch	2011-01-20 20:51:49 UTC (rev 107039)
@@ -0,0 +1,12 @@
+--- pm-utils-1.4.1/pm/pm-functions.in.old	2010-07-04 16:50:13.000000000 +0200
++++ pm-utils-1.4.1/pm/pm-functions.in	2010-12-07 16:48:39.555074652 +0100
+@@ -271,7 +271,8 @@
+ 		return 1
+ 	fi
+ 	export LOGGING=true
+-	exec > "$1" 2>&1
++	rm -f "$1"
++	exec >> "$1" 2>&1
+ }
+ 
+ check_suspend() { [ -n "$SUSPEND_MODULE" ]; }