[pm-utils/f14/master] - Remove HAL from pm-utils-bugreport-info.sh - Add quirkdb

[Jaroslav Škarvada]

commit 4ee6f56f83433a1ac7d6a2951c6b46209edd997e
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Thu Nov 18 16:06:17 2010 +0100

    - Remove HAL from pm-utils-bugreport-info.sh
    - Add quirkdb

 .gitignore                 |    1 +
 pm-utils-bugreport-info.sh |   49 +++++++++++++++++++++++++++++++++----------
 pm-utils.spec              |   14 +++++++++++-
 sources                    |    1 +
 4 files changed, 52 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 865eb90..3eee918 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 pm-utils-1.3.0.tar.gz
 /pm-utils-1.3.1.tar.gz
+/pm-quirks-20100619.tar.gz
diff --git a/pm-utils-bugreport-info.sh b/pm-utils-bugreport-info.sh
index 991fe9c..e106380 100755
--- a/pm-utils-bugreport-info.sh
+++ b/pm-utils-bugreport-info.sh
@@ -2,22 +2,47 @@
 shopt -s nullglob
 exec 2>&1
 LANG=C
+HR="======"
+PREFIX=""
+[ -d /usr/lib/pm-utils ] && PREFIX=/usr/lib/pm-utils
+[ -d /usr/lib64/pm-utils ] && PREFIX=/usr/lib64/pm-utils
+[ -z $PREFIX ] && echo "Unable to find pm-utils installation" && exit 1
+
+. $PREFIX/pm-functions
+[ -f "$PARAMETERS" ] || echo '' >"$PARAMETERS"
+
+quirk_db_handler()
+{
+  . $PREFIX/sleep.d/98video-quirk-db-handler
+  echo "location: $PM_QUIRKDB"
+  [ $PM_QUIRKDB ] && ls -al $PM_QUIRKDB
+  echo $HR
+  echo SYS PROPS
+  for q in $possible_system_properties
+  do
+    p=$(canonicalize_dmivar $q) || continue;
+    echo "$p: `eval echo \\$$p`"
+  done
+}
 
 echo SUSPEND LOG
 cat /var/log/pm-suspend.log
-echo ======
+echo $HR
 echo SYS POWER
 ls -lA /sys/power
-echo ======
+echo $HR
 echo SYS POWER STATE
 cat /sys/power/state
-echo ======
+echo $HR
 echo SYS POWER DISK
 cat /sys/power/disk
-echo ======
-echo HAL INFO
-lshal | egrep "(system.hardware.(product|vendor|version)|system.firmware.version|power_management.quirk)"
-echo ======
+echo $HR
+echo QUIRKDB
+quirk_db_handler suspend
+echo $HR
+echo QUIRKS USED
+cat $PARAMETERS
+echo $HR
 echo ETC PM
 ls -lAR /etc/pm
 for dir in /etc/pm/*
@@ -27,16 +52,16 @@ do
     do
         echo FILE $file
         cat ${file}
-        echo ======
+        echo $HR
     done
-    echo ======
+    echo $HR
 done
 echo UNAME
 uname -a
-echo ======
+echo $HR
 echo RPM
 rpm --qf '%{name}-%{version}-%{release}\n' -q kernel pm-utils hal hal-info gnome-power-manager vbetool radeontool hdparm
-echo ======
+echo $HR
 echo FEDORA RELEASE
 cat /etc/fedora-release
-echo ======
+echo $HR
diff --git a/pm-utils.spec b/pm-utils.spec
index 91c2599..d33ac61 100644
--- a/pm-utils.spec
+++ b/pm-utils.spec
@@ -1,8 +1,9 @@
+%global quirkdbver 20100619
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 # for chvt
@@ -15,6 +16,7 @@ Requires: hdparm
 BuildRequires: xmlto
 
 Source0: http://pm-utils.freedesktop.org/releases/pm-utils-%{version}.tar.gz
+Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-%{quirkdbver}.tar.gz
 
 Source21: pm-utils-99hd-apm-restore
 Source22: pm-utils-hd-apm-restore.conf
@@ -37,6 +39,7 @@ when building programs that use %{name}.
 
 %prep
 %setup -q 
+tar -xzf %{SOURCE1}
 
 %build
 %configure
@@ -53,6 +56,9 @@ install -D -m 0644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/pm-utils-hd-apm-res
 
 install -D -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_bindir}/pm-utils-bugreport-info.sh
 
+# Install quirks
+cp -r video-quirks $RPM_BUILD_ROOT%{_libdir}/pm-utils
+
 %files
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog
@@ -83,6 +89,8 @@ install -D -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_bindir}/pm-utils-bugreport-info
 %{_mandir}/man1/*.1.gz
 %{_mandir}/man8/*.8.gz
 %{_localstatedir}/run/pm-utils/
+%dir %{_libdir}/pm-utils/video-quirks
+%{_libdir}/pm-utils/video-quirks/*
 %dir %{_datadir}/doc/pm-utils
 %doc %{_datadir}/doc/pm-utils/*
 
@@ -95,6 +103,10 @@ install -D -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_bindir}/pm-utils-bugreport-info
 %{_libdir}/pkgconfig/pm-utils.pc
 
 %changelog
+* Tue Nov 09 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 1.3.1-4
+- Remove HAL from pm-utils-bugreport-info.sh
+- Add quirkdb
+
 * Tue Oct 12 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 1.3.1-3
 - Remove HAL from 99hd-apm-restore hook (#636382)
 
diff --git a/sources b/sources
index 93fc87e..ddc418a 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 c5a3249998f1a9e916cd61ddee048ab9  pm-utils-1.3.1.tar.gz
+3b6ee39056b9ece0cd5e073a4c272b05  pm-quirks-20100619.tar.gz