rpms/pm-utils/devel pm-utils.spec,1.67,1.68

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	pm-utils.spec 
Log Message:
* Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.99.3-11
- Install (not just build) vbetool and radeontool on x86_64 too
- Explicitly list files under %_sbindir, so they don't drop away again
- Light spec cleanups



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- pm-utils.spec	16 Aug 2007 13:01:12 -0000	1.67
+++ pm-utils.spec	27 Aug 2007 14:39:23 -0000	1.68
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora Core
 License: GPLv2 and zlib and BSD
 Version: 0.99.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -67,7 +67,7 @@
 
 %build
 cd vbetool-%{vbever}
-%ifarch i386 i486 i586 i686 athlon
+%ifarch %{ix86}
 %configure
 make
 %endif
@@ -78,7 +78,7 @@
 %endif
 cd ..
 
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
 cd radeontool-1.5
 %{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz
 cd ..
@@ -87,27 +87,12 @@
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
 FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-./configure --host=%{_host} --build=%{_build} \
-	--target=%{_target_platform} \
-	--program-prefix=%{?_program_prefix} \
-	--prefix=%{_prefix} \
-	--exec-prefix=%{_exec_prefix} \
-	--bindir=%{_bindir} \
-	--sbindir=%{_sbindir} \
-	--sysconfdir=%{_sysconfdir} \
-	--datadir=%{_datadir} \
-	--includedir=%{_includedir} \
-	--libdir=%{_exec_prefix}/lib \
-	--libexecdir=%{_libexecdir} \
-	--localstatedir=%{_localstatedir} \
-	--sharedstatedir=%{_sharedstatedir} \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir}
+%configure --libdir=%{_exec_prefix}/lib
 make
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
 cd vbetool-%{vbever}
 make DESTDIR=$RPM_BUILD_ROOT install
 cd ..
@@ -168,11 +153,24 @@
 %{_exec_prefix}/lib/pm-utils/power.d/*
 %{_exec_prefix}/lib/pm-utils/sleep.d/*
 %{_bindir}/*
-%{_sbindir}/*
+%{_sbindir}/pm-hibernate
+%{_sbindir}/pm-powersave
+%{_sbindir}/pm-suspend
+%{_sbindir}/pm-suspend-hybrid
+%ifarch %{ix86} x86_64
+%{_sbindir}/radeontool
+%{_sbindir}/vbetool
+%endif
+
 %{_mandir}/man*/*
 %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
 
 %changelog
+* Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 0.99.3-11
+- Install (not just build) vbetool and radeontool on x86_64 too
+- Explicitly list files under %%_sbindir, so they don't drop away again
+- Light spec cleanups
+
 * Thu Aug 16 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-10
 - License verification and update