rpms/pm-utils/F-7 .cvsignore, 1.26, 1.27 pm-utils.spec, 1.65, 1.66 sources, 1.32, 1.33 pm-utils-0.99.3-selinux.patch, 1.1, NONE 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
Till Maas (till)
fedora-extras-commits at redhat.com
Tue Sep 11 14:12:30 UTC 2007
Author: till
Update of /cvs/pkgs/rpms/pm-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3466
Modified Files:
.cvsignore pm-utils.spec sources
Removed Files:
pm-utils-0.99.3-selinux.patch 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:
sync with devel
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 26 Mar 2007 14:09:36 -0000 1.26
+++ .cvsignore 11 Sep 2007 14:11:56 -0000 1.27
@@ -1,3 +1 @@
-radeontool-1.5.tar.gz
-vbetool_0.7-1.tar.gz
-pm-utils-0.99.3.tar.gz
+pm-utils-0.99.4.tar.gz
Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/pm-utils.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pm-utils.spec 3 Jul 2007 22:44:14 -0000 1.65
+++ pm-utils.spec 11 Sep 2007 14:11:56 -0000 1.66
@@ -1,11 +1,16 @@
Name: pm-utils
-Summary: Power management utilities and scripts for Fedora Core
-License: GPL
-Version: 0.99.3
-Release: 9%{?dist}
+Summary: Power management utilities and scripts for Fedora
+License: GPLv2
+Version: 0.99.4
+Release: 2%{?dist}
Group: System Environment/Base
-ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
+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
+Requires: vbetool
+%endif
Conflicts: bluez-utils < 2.25-6
Source0: pm-utils-%{version}.tar.gz
@@ -19,106 +24,33 @@
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
-Source20: radeontool-1.5.tar.gz
-%ifarch i386 x86_64
-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
-Patch4: pm-utils-0.99.3-selinux.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
+Patch2: pm-utils-0.99.3-cfg.patch
+
%description
-The pm-utils package contains utilities and scripts for Fedora Core
-useful for power management.
+The pm-utils package contains utilities and scripts useful for tasks related
+to power management.
%prep
-%setup -q -a 10 -a 20
+%setup -q
%patch0 -p1 -b .disable
#%patch1 -p1 -b .vidhooks
-%patch2 -p1 -b .vbe-redirect
-%patch3 -p1 -b .cfg
-%patch4 -p1 -b .selinux
-
-%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 ..
+%patch2 -p1 -b .cfg
-%build
-cd vbetool-%{vbever}
-%ifarch i386
-%configure
-make
-%endif
-
-%ifarch x86_64
-%configure --with-x86emu
-make
-%endif
-cd ..
-%ifarch i386 x86_64
-cd radeontool-1.5
-%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz
-cd ..
-%endif
-
-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}
+%build
+%configure --libdir=%{_exec_prefix}/lib
make
%install
%{__rm} -rf $RPM_BUILD_ROOT
-%ifarch i386 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
@@ -161,32 +93,65 @@
%files
%defattr(-,root,root)
-%{_sysconfdir}/pm/*
+%{_sysconfdir}/pm/
%{_sysconfdir}/security/console.apps/*
%{_sysconfdir}/pam.d/*
-%{_exec_prefix}/lib/pm-utils/bin/*
+%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/*
+%{_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
+
%{_mandir}/man*/*
%ghost %verify(not md5 size mtime) /var/log/pm-suspend.log
%changelog
-* Tue Jul 03 2007 Peter Jones <pjones at redhat.com> - 0.99.3-9
-- Fix a config file bug
-- Rebuild...
+* Tue Sep 11 2007 Till Maas <opensource till name> - 0.99.4-2
+- Require vbetool not on ppc and ppc64
+
+* Mon Sep 10 2007 Peter Jones <pjones at redhat.com> - 0.99.4-1
+- Merge new upstream
+- remove pm/power.d/laptop-tools
+- add --quirk-reset-brightness (needed for the Fujitsu Lifebook S7110)
+
+* Sat Sep 08 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 separate package now)
+- remove radeontool and require it (it is a separate package now)
+- Update License Tag
+- cleanup buildrequires
+- clear %%setup
+
+* 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
+
+* Wed Jul 18 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-9
+- Fixed description to be distribution independant (#247366)
* Thu Jun 07 2007 Peter Jones <pjones at redhat.com> - 0.99.3-8
- Bump release and rebuild for newer buildsystem code
-* Tue Jun 05 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-6.1
-- Bump release and rebuild due to missing binaries
+* Tue Jun 05 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-7
+- Bump release and rebuild
-* Mon May 21 2007 Peter Jones <pjones at redhat.com> - 0.99.3-6
-- Don't remove the logfile before creating it.
+* Tue May 29 2007 Phil Knirsch <pknirsch at redhat.com> - 0.99.3-6
+- Fixed missing builds for vbetool and radeontool for some archs (#241469)
+- Fixed typo in functions where wrong variable was used (#241633)
* Wed May 16 2007 Peter Jones <pjones at redhat.com> - 0.99.3-5
- ... and create the directory the logfile goes in.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-7/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 11 Sep 2007 14:11:56 -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
+a88503876f63c96b55784be91b6458d2 pm-utils-0.99.4.tar.gz
--- pm-utils-0.99.3-selinux.patch DELETED ---
--- 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 ---
More information about the scm-commits
mailing list