rpms/pm-utils/devel pm-utils-0.99.4-manpage-typo.patch, NONE, 1.1 pm-utils-0.99.4-tty0_permissions.patch, NONE, 1.1 pm-utils.spec, 1.81, 1.82

Till Maas (till) fedora-extras-commits at redhat.com
Wed Oct 10 05:50:51 UTC 2007


Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25636

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-0.99.4-manpage-typo.patch 
	pm-utils-0.99.4-tty0_permissions.patch 
Log Message:
* Wed Oct 10 2007 Till Maas <opensource till name> - 0.99.4-5
- Require vbetool only for x86 archs (RH #325741)
- add missing BR for docbook-utils


pm-utils-0.99.4-manpage-typo.patch:

--- NEW FILE pm-utils-0.99.4-manpage-typo.patch ---
RedHat Bugzilla report: https://bugzilla.redhat.com/show_bug.cgi?id=286201

diff -up pm-utils-0.99.4/man/pm-pmu.sgml.manpage-typo pm-utils-0.99.4/man/pm-pmu.sgml
--- pm-utils-0.99.4/man/pm-pmu.sgml.manpage-typo	2007-09-20 01:37:22.000000000 +0200
+++ pm-utils-0.99.4/man/pm-pmu.sgml	2007-09-20 01:37:06.000000000 +0200
@@ -37,7 +37,7 @@
     <title>DESCRIPTION</title>
     <para>This manual page documents briefly the
       <command>&package;</command> command.</para>
-    <para><command>&package;</command> is a command line program to test whether the computer is running on line power</para>
+    <para><command>&package;</command> is a command line program to suspend a computer on machines using a Macintosh-style PMU</para>
   </refsect1>
   <refsect1>
     <title>EXIT CODES</title>

pm-utils-0.99.4-tty0_permissions.patch:

--- NEW FILE pm-utils-0.99.4-tty0_permissions.patch ---
Bug Report:
https://bugzilla.redhat.com/show_bug.cgi?id=236394

diff -up pm-utils-0.99.4/pm/hooks/60sysfont.tty0_permissions pm-utils-0.99.4/pm/hooks/60sysfont
--- pm-utils-0.99.4/pm/hooks/60sysfont.tty0_permissions	2007-09-20 02:38:40.000000000 +0200
+++ pm-utils-0.99.4/pm/hooks/60sysfont	2007-09-20 02:36:52.000000000 +0200
@@ -3,8 +3,10 @@
 . /usr/lib/pm-utils/functions
 
 case "$1" in
-	resume|thaw) 
-		setsysfont </dev/tty0 ;;
+	resume|thaw)
+		if [ -x /sbin/setsysfont -a -c /dev/tty1 ]; then
+			/sbin/setsysfont < /dev/tty1 > /dev/tty1 2>/dev/null
+		fi
 esac
 
 exit $?


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- pm-utils.spec	19 Sep 2007 23:48:19 -0000	1.81
+++ pm-utils.spec	10 Oct 2007 05:50:17 -0000	1.82
@@ -2,13 +2,13 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm}
 Requires: usermode kbd pciutils >= 2.2.1
 Requires: radeontool
-%ifnarch ppc ppc64
+%ifarch %{ix86} %{x86_64}
 Requires: vbetool
 %endif
 Conflicts: bluez-utils < 2.25-6
@@ -27,6 +27,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: hal-devel pkgconfig
 BuildRequires: dbus-devel >= 0.90
+BuildRequires: docbook-utils
 
 Patch0: pm-utils-0.99.3-disable.patch
 Patch1: pm-utils-0.99.4-manpage-typo.patch
@@ -118,6 +119,10 @@
 %ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* Wed Oct 10 2007 Till Maas <opensource till name> - 0.99.4-5
+- Require vbetool only for x86 archs (RH #325741)
+- add missing BR for docbook-utils
+
 * Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-4
 - fix manpage cut and paste mistake (RH #286201)
 




More information about the fedora-extras-commits mailing list