--- a/SUNWgnome-power-manager.spec Fri Feb 15 10:04:26 2008 +0000
+++ b/SUNWgnome-power-manager.spec Fri Feb 15 10:13:39 2008 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-power-manager
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright 2008 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,7 +11,7 @@
%use gpm = gnome-power-manager.spec
Name: SUNWgnome-power-manager
-Summary: GNOME Power Manager
+Summary: GNOME Power Manager utilities for desktop users
Version: %{default_pkg_version}
Source: %{name}-manpages-0.1.tar.gz
SUNW_BaseDir: %{_basedir}
@@ -35,7 +35,7 @@
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
%include default-depend.inc
-Requires: SUNWpostrun
+Requires: SUNWpostrun-root
Requires: SUNWgnome-config
%if %build_l10n
@@ -62,14 +62,13 @@
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
-# Delete scrollkeeper files, man & doc dir, install solaris-specical man pages.
-rm -rf $RPM_BUILD_ROOT/var
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+# Replace debian format man pages with solaris-specical man pages.
rm -rf $RPM_BUILD_ROOT%{_mandir}/
cd %{_builddir}/%name-%version/sun-manpages
make install DESTDIR=$RPM_BUILD_ROOT
-# Disable gnome-inhibit applet
+# Disable gnome-inhibit applet. Because it's unable to inhibit all suspend
+# actions, e.g. some suspend actions are done by powerd daemon on Solaris.
rm -rf $RPM_BUILD_ROOT%{_bindir}/gnome-inhibit-applet
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-power-manager/gpm-inhibit-test.glade
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
@@ -119,31 +118,17 @@
%files
%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/gnome-power-*.sh
%{_libdir}/gnome-*-applet
-%dir %attr (0755, root, bin) %{_libdir}/bonobo
-%dir %attr (0755, root, bin) %{_libdir}/bonobo/servers
%{_libdir}/bonobo/servers/GNOME_BrightnessApplet.server
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/gnome
-%dir %attr (0755, root, bin) %{_datadir}/gnome/autostart
%{_datadir}/gnome/autostart/gnome-power-manager.desktop
-%dir %attr (0755, root, bin) %{_datadir}/gnome/help
-%dir %attr (0755, root, bin) %{_datadir}/gnome/help/gnome-power-manager
%{_datadir}/gnome/help/gnome-power-manager/*/*
-%dir %attr (0755, root, bin) %{_datadir}/gnome-2.0
-%dir %attr (0755, root, bin) %{_datadir}/gnome-2.0/ui
%{_datadir}/gnome-2.0/ui/GNOME_BrightnessApplet.xml
-%dir %attr (0755, root, bin) %{_datadir}/gnome-power-manager
%{_datadir}/gnome-power-manager/*
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
%{_datadir}/dbus-1/services/gnome-power-manager.service
-%dir %attr (0755, root, bin) %{_datadir}/omf/
-%dir %attr (0755, root, bin) %{_datadir}/omf/gnome-power-manager
%{_datadir}/omf/gnome-power-manager/*
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/gnome-power-*.desktop
@@ -164,12 +149,10 @@
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/apps/
%{_datadir}/icons/hicolor/48x48/apps/*
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/*
%{_mandir}/*/*
%files root
-%defattr (0755, root, sys)
+%defattr (-, root, sys)
%dir %attr (0755, root, sys) %{_sysconfdir}
%{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas
@@ -181,6 +164,8 @@
%endif
%changelog
+* Fri Feb 15 2008 - [email protected]
+- Delete redundant statement.
* Thu Feb 14 2008 - [email protected]
- Add manpage.
- Use install script.