rpms/pm-utils/devel pm-utils.spec, 1.99, 1.100 pm-hibernate.app, 1.1, NONE pm-hibernate.pam, 1.1, NONE pm-powersave.app, 1.1, NONE pm-powersave.pam, 1.1, NONE pm-suspend-hybrid.app, 1.1, NONE pm-suspend-hybrid.pam, 1.1, NONE pm-suspend.app, 1.1, NONE pm-suspend.pam, 1.1, NONE

[Richard Hughes (rhughes)]

Author: rhughes

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

Modified Files:
	pm-utils.spec 
Removed Files:
	pm-hibernate.app pm-hibernate.pam pm-powersave.app 
	pm-powersave.pam pm-suspend-hybrid.app pm-suspend-hybrid.pam 
	pm-suspend.app pm-suspend.pam 
Log Message:
* Wed Apr 30 2008 Richard Hughes <rhughes at redhat.com> - 1.1.0-8
- Rip out all the consolehelper and PAM stuff - users are not meant to be
  running these tools directly and it's a massive change from upstream.



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- pm-utils.spec	18 Apr 2008 21:21:00 -0000	1.99
+++ pm-utils.spec	30 Apr 2008 19:39:39 -0000	1.100
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.1.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 Requires: usermode kbd pciutils >= 2.2.1
@@ -15,16 +15,6 @@
 Requires: vbetool
 %endif
 Source0: http://pm-utils.freedesktop.org/releases/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
 
 Source21: pm-utils-99hd-apm-restore
 Source22: pm-utils-hd-apm-restore.conf
@@ -66,25 +56,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-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 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 0755 -d $RPM_BUILD_ROOT/%{_bindir}
-pushd $RPM_BUILD_ROOT/%{_bindir}
-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
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/pm-utils/{locks,storage}
 
@@ -120,14 +91,6 @@
 %doc README COPYING AUTHORS ChangeLog
 %config(noreplace) %{_sysconfdir}/pm-utils-hd-apm-restore.conf
 %{_sysconfdir}/pm/
-%{_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 %{_libdir}/pm-utils/
 %{_libdir}/pm-utils/bin/
 %{_libdir}/pm-utils/defaults
@@ -137,11 +100,7 @@
 %{_libdir}/pm-utils/sleep.d/
 %{_libdir}/pm-utils/module.d
 %{_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
@@ -158,6 +117,10 @@
 %{_libdir}/pkgconfig/pm-utils.pc
 
 %changelog
+* Wed Apr 30 2008 Richard Hughes <rhughes at redhat.com> - 1.1.0-8
+- Rip out all the consolehelper and PAM stuff - users are not meant to be
+  running these tools directly and it's a massive change from upstream.
+
 * Fri Apr 18 2008 Peter Jones <pjones at redhat.com> - 1.1.0-7
 - Default to "shutdown" for hibernate unless it's unavailable.
 


--- pm-hibernate.app DELETED ---


--- pm-hibernate.pam DELETED ---


--- pm-powersave.app DELETED ---


--- pm-powersave.pam DELETED ---


--- pm-suspend-hybrid.app DELETED ---


--- pm-suspend-hybrid.pam DELETED ---


--- pm-suspend.app DELETED ---


--- pm-suspend.pam DELETED ---