rpms/pm-utils/F-7 pm-utils-bugreport-info.sh, NONE, 1.1 pm-utils.spec, 1.67, 1.68

[Till Maas (till)]

Author: till

Update of /cvs/pkgs/rpms/pm-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31233

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-bugreport-info.sh 
Log Message:
* Sat Apr 19 2008 Till Maas <opensource till name> - 0.99.4-17
- remove hd-apm script for Fedora 8 and 7
- Adjust Requires:/remove Conflicts:



--- NEW FILE pm-utils-bugreport-info.sh ---
#!/bin/bash
shopt -s nullglob
exec 2>&1
LANG=C

echo SUSPEND LOG
cat /var/log/pm-suspend.log
echo ======
echo SYS POWER
ls -lA /sys/power
echo ======
echo SYS POWER STATE
cat /sys/power/state
echo ======
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 ETC PM
ls -lAR /etc/pm
for dir in /etc/pm/*
do
    echo DIR ${dir}
    for file in ${dir}/*
    do
        echo FILE $file
        cat ${file}
        echo ======
    done
    echo ======
done
echo UNAME
uname -a
echo ======
echo RPM
rpm --qf '%{name}-%{version}-%{release}\n' -q kernel pm-utils hal hal-info gnome-power-manager vbetool radeontool hdparm
echo ======
echo FEDORA RELEASE
cat /etc/fedora-release
echo ======


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/pm-utils.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- pm-utils.spec	19 Sep 2007 23:25:48 -0000	1.67
+++ pm-utils.spec	19 Apr 2008 11:19:39 -0000	1.68
@@ -2,35 +2,44 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 3%{?dist}
+Release: 17%{?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
+# for on_ac_power
+Requires: hal
+%ifarch %{ix86} x86_64
 Requires: vbetool
 %endif
-Conflicts: bluez-utils < 2.25-6
 Source0: pm-utils-%{version}.tar.gz
-
 Source1: pm-suspend.pam
 Source2: pm-hibernate.pam
 Source3: pm-powersave.pam
 Source4: pm-suspend-hybrid.pam
 
+
 Source11: pm-suspend.app
 Source12: pm-hibernate.app
 Source13: pm-powersave.app
 Source14: pm-suspend-hybrid.app
 
+Source23: pm-utils-bugreport-info.sh
+
 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
 Patch2: pm-utils-0.99.3-cfg.patch
 Patch3: pm-utils-0.99.4-logfile.patch
+Patch4: pm-utils-correct-filename-in-help.patch
+Patch5: pm-utils-missing-uniq.patch
+Patch6: pm-utils-nullglob.patch
+Patch7: pm-utils-0.99.4-hibernate_mode.patch
+Patch8: pm-utils-0.99.4-readme_update.patch
 
 
 %description
@@ -41,9 +50,14 @@
 %setup -q 
 
 %patch0 -p1 -b .disable
+%patch1 -p1 -b .manpage-typo
 %patch2 -p1 -b .cfg
 %patch3 -p1 -b .logfile
-
+%patch4 -p0 -b .correct-filename-in-help
+%patch5 -p0 -b .missing-uniq
+%patch6 -p0 -b .nullglob
+%patch7 -p1 -b .hibernate_mode
+%patch8 -p1 -b .readme_update
 
 %build
 %configure --libdir=%{_exec_prefix}/lib
@@ -54,25 +68,28 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
-for x in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do
-	y=$(basename ${x%%.pam})
-	install -T -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/$y
+install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
+for pamsource in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do
+	filename=$(basename ${pamsource} .pam)
+	install -T -p -m 0644 ${pamsource} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/${filename}
 done
-install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/
-for x in %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} ; do
-	y=$(basename ${x%%.app})
-	install -T -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/$y
+
+install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/
+for source in %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} ; do
+	filename=$(basename ${source} .app)
+	install -T -p -m 0644 ${source} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/${filename}
 done
-install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
+
+install -m 0755 -d $RPM_BUILD_ROOT/%{_bindir}
 pushd $RPM_BUILD_ROOT/%{_bindir}
-for x in pm-hibernate pm-powersave pm-restart pm-shutdown pm-suspend ; do
-	ln -sf consolehelper $x
+for binary in pm-hibernate pm-powersave pm-suspend pm-suspend-hybrid; do
+	ln -sf consolehelper ${binary}
 done
 popd
-install -D -m 0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/pm-suspend.log
 
+install -D -m 0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/pm-suspend.log
 
+install -D -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_bindir}/pm-utils-bugreport-info.sh
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -81,13 +98,13 @@
 %pre
 if [ -f %{_sysconfdir}/sysconfig/pm ]; then
 	mkdir -p %{_sysconfdir}/pm/config.d
-	mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig
+	mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig.conf
 fi
 
 
 %post
 if [ -f %{_sysconfdir}/pm/config.rpmsave ]; then
-	mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig
+	mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig.conf
 fi
 if [ -f %{_localstatedir}/log/pm-suspend.log ] ; then
 	chmod 0600 %{_localstatedir}/log/pm-suspend.log
@@ -97,25 +114,94 @@
 
 %files
 %defattr(-,root,root,-)
+%doc README COPYING AUTHORS ChangeLog
 %{_sysconfdir}/pm/
-%{_sysconfdir}/security/console.apps/*
-%{_sysconfdir}/pam.d/*
+%{_sysconfdir}/security/console.apps/pm-hibernate
+%{_sysconfdir}/security/console.apps/pm-powersave
+%{_sysconfdir}/security/console.apps/pm-suspend
+%{_sysconfdir}/security/console.apps/pm-suspend-hybrid
+%{_sysconfdir}/pam.d/pm-hibernate
+%{_sysconfdir}/pam.d/pm-powersave
+%{_sysconfdir}/pam.d/pm-suspend
+%{_sysconfdir}/pam.d/pm-suspend-hybrid
 %dir %{_exec_prefix}/lib/pm-utils/
 %{_exec_prefix}/lib/pm-utils/bin/
 %{_exec_prefix}/lib/pm-utils/defaults
 %{_exec_prefix}/lib/pm-utils/functions
 %{_exec_prefix}/lib/pm-utils/power.d/
 %{_exec_prefix}/lib/pm-utils/sleep.d/
-%{_bindir}/*
+%{_bindir}/on_ac_power
+%{_bindir}/pm-hibernate
+%{_bindir}/pm-is-supported
+%{_bindir}/pm-powersave
+%{_bindir}/pm-suspend
+%{_bindir}/pm-suspend-hybrid
+%{_bindir}/pm-utils-bugreport-info.sh
 %{_sbindir}/pm-hibernate
 %{_sbindir}/pm-powersave
 %{_sbindir}/pm-suspend
 %{_sbindir}/pm-suspend-hybrid
+%{_mandir}/man1/on_ac_power.1*
+%{_mandir}/man1/pm-pmu.1*
 
-%{_mandir}/man*/*
 %ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* Sat Apr 19 2008 Till Maas <opensource till name> - 0.99.4-17
+- remove hd-apm script for Fedora 8 and 7
+- Adjust Requires:/remove Conflicts:
+
+* Thu Apr 03 2008 Adam Jackson <ajax at redhat.com> 0.99.4-16
+- x86_64 is not a macro, don't %%ifarch on it.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.99.4-15
+- Autorebuild for GCC 4.3
+
+* Fri Jan 11 2008 Till Maas <opensource till name> - 0.99.4-14
+- add pm-utils-bugreport-info.sh script to collect information for bugreports
+- require Hal (RH #428452)
+
+* Wed Jan 09 2008 Till Maas <opensource till name> - 0.99.4-13
+- update README to describe the current beheaviour of pm-utils
+
+* Tue Jan 08 2008 Till Maas <opensource till name> - 0.99.4-12
+- remove ExclusiveArch, because it contains all supported archs
+  (in case an arch schould be excluded, please use ExcludeArch)
+- improve readability of usermode setup
+- remove pm-restart pm-shutdown from usermode setup, because
+  there are no such binaries
+- list more files in %%files explicit to make it obvious when
+  there are changes in the distributed package
+- add .conf suffix to oldconfig files
+
+* Tue Jan 08 2008 Till Maas <opensource till name> - 0.99.4-11
+- make it possible to specify the hibernate mode (RH #375701)
+
+* Wed Jan 02 2008 Till Maas <opensource till name> - 0.99.4-10
+- enhance hd-apm-restore and add a config file
+- fix source-definition for hd-apm-restore
+- add hook suffix for hook script
+
+* Wed Jan 02 2008 Till Maas <opensource till name> - 0.99.4-9
+- restore hd apm level (RH #382061)
+- Add hdparm requires for new hook
+
+* Mon Dec 31 2007 Till Maas <opensource till name> - 0.99.4-8
+- Add documentation to %%doc
+
+* Sun Dec 30 2007 Till Maas <opensource till name> - 0.99.4-7
+- fix some bugs (RH #302401)
+
+* Tue Nov 27 2007 Dennis Gilmore <dennis at ausil.us> - 0.99.4-6
+- add sparc archs to ExclusiveArch list
+
+* 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)
+
 * Thu Sep 20 2007 Till Maas <opensource till name> - 0.99.4-3
 - remove unused patch (vidhooks)
 - add patch to keep logfile (RH #237840 (f7), #238068 (devel)),