Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at Thu Feb 18 17:07:36 CET 2010. -------- --- pm-utils/pm-utils.changes 2009-12-15 10:00:20.000000000 +0100 +++ pm-utils/pm-utils.changes 2010-02-16 16:18:50.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Feb 16 16:18:12 CET 2010 - seife@opensuse.org + +- fix the location of S2DISK_CONF + +------------------------------------------------------------------- +Sat Feb 13 16:02:49 CET 2010 - vuntz@opensuse.org + +- Move the pkg-config file to /usr/share/pkgconfig to have it + findable on x86_64. We could also move it to + /usr/%_lib/pkgconfig, but we explicitly change libdir to not be + arch-specific, so /usr/share is more appropriate. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.hTgLD9/_old 2010-02-18 17:06:22.000000000 +0100 +++ /var/tmp/diff_new_pack.hTgLD9/_new 2010-02-18 17:06:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pm-utils (Version 1.2.6.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: pm-utils Version: 1.2.6.1 -Release: 1 +Release: 2 Summary: Tools to suspend and hibernate computers License: GPLv2+ Group: System/Base @@ -97,6 +97,11 @@ popd %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log touch %{buildroot}/%{_localstatedir}/log/pm-suspend.log +# changing libdir in configure has the side-effect of misinstalling the +# pkg-config file (/usr/lib/pkgconfig is not searched on x86_64). Since we have +# no arch-specific data, we put it in datadir. +%{__install} -d -m 0755 %{buildroot}%{_datadir}/pkgconfig +mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}%{_datadir}/pkgconfig %clean rm -rf %{buildroot} @@ -113,7 +118,7 @@ %{_mandir}/man1/* %{_mandir}/man8/* %ghost %verify(not md5 size mtime) /var/log/pm-suspend.log -%{_prefix}/lib/pkgconfig/%{name}.pc +%{_datadir}/pkgconfig/%{name}.pc %files ndiswrapper %defattr (-,root,root) ++++++ pm-utils-1.2.6.1-smart-uswsusp.patch ++++++ --- /var/tmp/diff_new_pack.hTgLD9/_old 2010-02-18 17:06:22.000000000 +0100 +++ /var/tmp/diff_new_pack.hTgLD9/_new 2010-02-18 17:06:22.000000000 +0100 @@ -1,7 +1,7 @@ Index: pm-utils-1.2.6.1/pm/defaults =================================================================== ---- pm-utils-1.2.6.1.orig/pm/defaults 2009-11-26 08:36:38.139432418 +0100 -+++ pm-utils-1.2.6.1/pm/defaults 2009-11-26 08:36:44.727431671 +0100 +--- pm-utils-1.2.6.1.orig/pm/defaults ++++ pm-utils-1.2.6.1/pm/defaults @@ -27,8 +27,45 @@ # tuxonice If your system has support for tuxonice, use this. # @@ -42,8 +42,8 @@ +# Empty string is meant for not touching any power management features at all +SOUND_PM="10" + -+# a location of s2disk (s2both) command -+S2DISK_CONF="/etc/suspend.conf" ++# the location of the autogenerated s2disk (s2both) config file ++S2DISK_CONF="/var/lib/s2disk.conf" + +####################################################################### # These variables will be handled specially when we load files in @@ -51,8 +51,8 @@ # Multiple declarations of these environment variables will result in Index: pm-utils-1.2.6.1/pm/module.d/uswsusp =================================================================== ---- pm-utils-1.2.6.1.orig/pm/module.d/uswsusp 2009-11-26 08:36:38.139432418 +0100 -+++ pm-utils-1.2.6.1/pm/module.d/uswsusp 2009-11-26 08:38:47.431855927 +0100 +--- pm-utils-1.2.6.1.orig/pm/module.d/uswsusp ++++ pm-utils-1.2.6.1/pm/module.d/uswsusp @@ -5,6 +5,7 @@ uswsusp_hooks() { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org