rpms/pm-utils/devel pm-utils.spec, 1.75, 1.76 sources, 1.32, 1.33 radeontool-1.5.diff, 1.1, NONE radeontool-fix-option-handling.diff, 1.2, NONE radeontool-get-rid-of-lspci.diff, 1.1, NONE vbetool-0.3-fix-gcc4bug.patch, 1.3, NONE vbetool-libz.patch, 1.2, NONE

Sat Sep 8 10:22:58 UTC 2007

Author: till

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

Modified Files:
	pm-utils.spec sources 
Removed Files:
	radeontool-1.5.diff radeontool-fix-option-handling.diff 
	radeontool-get-rid-of-lspci.diff vbetool-0.3-fix-gcc4bug.patch 
	vbetool-libz.patch 
Log Message:
* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
- Adjust %files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
- remove (C|CXX|F)FLAGS definitions, they are already in %configure
- remove Core in Summary tag
- add URL for pm-utils
- add %{?arm} to ExclusiveArch (#245463)
- remove vbetool and require it (it is a separte package now)
- remove radeontool and require it (it is a separte package now)
- Update License Tag
- cleanup buildrequires



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76

--- pm-utils.spec	31 Aug 2007 08:39:48 -0000	1.75
+++ pm-utils.spec	8 Sep 2007 10:22:26 -0000	1.76
@@ -1,12 +1,14 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
-License: GPLv2 and zlib and BSD
+License: GPLv2
 Version: 0.99.3
 Release: 12%{?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
+Requires: vbetool
 Conflicts: bluez-utils < 2.25-6
 Source0: pm-utils-%{version}.tar.gz
 
@@ -20,31 +22,15 @@
 Source13: pm-powersave.app
 Source14: pm-suspend-hybrid.app
 
-%define vbever 0.7
-Source10: http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{vbever}-1.tar.gz
-# URL: http://fdd.com/software/radeon/
-Source20: http://fdd.com/software/radeon/radeontool-1.5.tar.gz
-%ifarch %{ix86}
-Obsoletes: vbetool
-Provides: vbetool
-Obsoletes: radeontool
-Provides: radeontool
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: hal-devel pkgconfig pciutils-devel
-BuildRequires: dbus-devel >= 0.90, zlib-devel
+BuildRequires: hal-devel pkgconfig
+BuildRequires: dbus-devel >= 0.90
 
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch
 Patch2: pm-utils-0.99.3-vbe-redirect.patch
 Patch3: pm-utils-0.99.3-cfg.patch
 
-Patch10: vbetool-0.3-fix-gcc4bug.patch
-Patch11: vbetool-libz.patch
-
-Patch20: radeontool-1.5.diff
-Patch21: radeontool-fix-option-handling.diff
-Patch22: radeontool-get-rid-of-lspci.diff
 
 %description
 The pm-utils package contains utilities and scripts useful for tasks related
@@ -58,49 +44,13 @@
 %patch2 -p1 -b .vbe-redirect
 %patch3 -p1 -b .cfg
 
-%patch10 -p0 -b .gcc4
-%patch11 -p0 -b .zlib
-
-cd radeontool-1.5
-%patch20 -p0 -b .volatile
-%patch21 -p0 -b .options
-%patch22 -p0 -b .no-lspci
-cd ..
 
 %build
-cd vbetool-%{vbever}
-%ifarch %{ix86}
-%configure
-make
-%endif
-
-%ifarch x86_64
-%configure --with-x86emu
-make
-%endif
-cd ..
-
-%ifarch %{ix86} x86_64
-cd radeontool-1.5
-%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz
-cd ..
-%endif
-
 %configure --libdir=%{_exec_prefix}/lib
 make
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%ifarch %{ix86} x86_64
-cd vbetool-%{vbever}
-make DESTDIR=$RPM_BUILD_ROOT install
-cd ..
-
-cd radeontool-1.5
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-install -m 755 radeontool $RPM_BUILD_ROOT/%{_sbindir}
-cd ..
-%endif
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -157,22 +107,21 @@
 %{_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
-* Fri Aug 31 2007 Till Maas <opensource till name> - 0.99.3-12
+* Sat Sep 09 2007 Till Maas <opensource till name> - 0.99.3-12
 - Adjust %%files to own /etc/pm/ and /usr/lib/pm-utils/ (#233906)
 - remove (C|CXX|F)FLAGS definitions, they are already in %%configure
 - remove Core in Summary tag
 - add URL for pm-utils
-- add full URL source for radeontool
 - add %%{?arm} to ExclusiveArch (#245463)
+- remove vbetool and require it (it is a separte package now)
+- remove radeontool and require it (it is a separte package now)
+- Update License Tag
+- cleanup buildrequires
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	26 Mar 2007 14:20:54 -0000	1.32
+++ sources	8 Sep 2007 10:22:26 -0000	1.33
@@ -1,3 +1 @@
-8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
-1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz
 0c377df47968b19ffb484f85e1e2a799  pm-utils-0.99.3.tar.gz


--- radeontool-1.5.diff DELETED ---


--- radeontool-fix-option-handling.diff DELETED ---


--- radeontool-get-rid-of-lspci.diff DELETED ---


--- vbetool-0.3-fix-gcc4bug.patch DELETED ---


--- vbetool-libz.patch DELETED ---


