rpms/pm-utils/devel pm-utils.spec,1.35,1.36 sources,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15425

Modified Files:
	pm-utils.spec sources 
Log Message:
- get patch depth right for video hooks
- use %configure
- get install syntax right for pam files and friends
- make consolehelper symlinks
- update tarball from cvs



Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pm-utils.spec	14 Jun 2006 02:59:28 -0000	1.35
+++ pm-utils.spec	14 Jun 2006 04:10:51 -0000	1.36
@@ -38,7 +38,7 @@
 %setup -q -a 10 -a 20
 %patch1 -p0 -b .gcc4
 %patch2 -p0 -b .libpci
-%patch3 -p0 -b .vidhooks
+%patch3 -p1 -b .vidhooks
 
 %build
 cd vbetool-0.4
@@ -59,6 +59,7 @@
 cd ..
 %endif
 
+%configure
 make
 
 %install
@@ -76,10 +77,16 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -m 755 -d %{_sysconfdir}/pam.d
-install -m 644 %{source1} %{source2} %{source3} $(sysconfdir)/pam.d/
-install -m 755 -d %{_sysconfdir}/security/console.apps/
-install -m 644 %{source4} %{source5} %{source6} $(sysconfdir)/security/console.apps
+install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
+install -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/
+install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/
+install -m 644 %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps
+install -m 755 -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
+done
+popd
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Jun 2006 02:59:28 -0000	1.25
+++ sources	14 Jun 2006 04:10:51 -0000	1.26
@@ -1,4 +1,4 @@
 8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
 950a87f99d17bc4f4ced73cec7103859  vbetool_0.5-1.tar.gz
 1dba0a22ca8ccd235ee40de0ed59442a  pm-utils-0.18.tar.gz
-e9433732e9717e9d76b9eb6c3421dc8a  pm-utils-0.19.tar.gz
+2c83f260940deb244f19e7545543e829  pm-utils-0.19.tar.gz