Hello community,
here is the log from the commit of package pm-utils for openSUSE:Factory
checked in at 2013-03-15 10:47:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pm-utils (Old)
and /work/SRC/openSUSE:Factory/.pm-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pm-utils", Maintainer is "vdziewie...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes 2013-02-04
21:01:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2013-03-15
10:47:12.000000000 +0100
@@ -1,0 +2,14 @@
+Tue Mar 12 14:55:55 UTC 2013 - vdziewie...@suse.com
+
+- Removed patches pm-utils-dont-fail-modunload-silently.diff and
+ intel-audio-powersave_logoutput.diff - applied them in git repo.
+
+- Deleted 80acpi-fan, since it used /proc/acpi/fan/ and it was removed from
+ kernel long ago. bnc#806635
+
+- bnc#806632: rm pm/sleep.d/55NetworkManager, networkmanager
+ now uses Upower and listens to dbus resume/suspend signals.
+
+- remove rc.cpufreq - bnc#806641
+
+-------------------------------------------------------------------
Old:
----
pm-utils-1.4.1-suse-12.tar.bz2
rc.cpufreq
New:
----
pm-utils-1.4.1-suse-15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pm-utils.spec ++++++
--- /var/tmp/diff_new_pack.W1z7bv/_old 2013-03-15 10:47:13.000000000 +0100
+++ /var/tmp/diff_new_pack.W1z7bv/_new 2013-03-15 10:47:13.000000000 +0100
@@ -19,7 +19,9 @@
%define pm_libdir %{_prefix}/lib/%{name}/
%define pm_quirkdbdir %{pm_libdir}/video-quirks
%define pm_sysconfdir %{_sysconfdir}/pm/config.d/
-%define gitversion 12
+# Please submit patches to git://gitorious.org/opensuse/pm-utils.git,
+# unless they are opensuse-version-specific.
+%define gitversion 15
Name: pm-utils
Version: 1.4.1
@@ -29,13 +31,8 @@
Group: System/Base
Url: http://pm-utils.freedesktop.org/wiki/
Source0: %{name}-%{version}-suse-%{gitversion}.tar.bz2
-# http://gitorious.org/opensuse/pm-utils-suse
+# http://gitorious.org/opensuse/pm-utils
Source1:
http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2
-Source2: rc.cpufreq
-# Patch inspired by https://bugzilla.novell.com/show_bug.cgi?id=633491
-Patch1: pm-utils-dont-fail-modunload-silently.diff
-# Patch for https://bugzilla.novell.com/show_bug.cgi?id=797966 error in
pm-powersave.log
-Patch2: intel-audio-powersave_logoutput.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq
@@ -69,8 +66,6 @@
%prep
%setup -n %{name} -a 1
-%patch1 -p1
-%patch2 -p1
%build
%{configure} \
@@ -95,7 +90,6 @@
%{__install} -m 0755 pm/sleep.d/45pcmcia %{buildroot}/%{pm_libdir}/sleep.d/
%{__install} -m 0755 pm/sleep.d/50rcnetwork %{buildroot}/%{pm_libdir}/sleep.d/
%{__install} -m 0755 pm/sleep.d/75ndiswrapper
%{buildroot}/%{pm_libdir}/sleep.d/
-%{__install} -m 0755 pm/sleep.d/80acpi-fan %{buildroot}/%{pm_libdir}/sleep.d/
%{__install} -m 0755 pm/sleep.d/80videobios %{buildroot}/%{pm_libdir}/sleep.d/
%{__install} -m 0755 pm/sleep.d/99info %{buildroot}/%{pm_libdir}/sleep.d/
%{__install} -m 0644 pm/config.d/* %{buildroot}/%{pm_sysconfdir}/
@@ -108,25 +102,8 @@
# 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
-# install cpufreq init script
-install -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/init.d/cpufreq
-install -d -m 0755 %{buildroot}%{_sbindir}
-ln -sf %{_sysconfdir}/init.d/cpufreq %{buildroot}%{_sbindir}/rccpufreq
-
-%preun
-%stop_on_removal cpufreq
-
-%post
-%fillup_and_insserv -f -y cpufreq
-
-%triggerun -- %{name} < 1.4.1-3
-# Forcefully enable the service on upgrades from versions where the service
-# didn't exist or wasn't necessarily enabled by default. Without this, on
-# upgrades, the service will not be enabled.
-%insserv_force_if_yast cpufreq
%postun
-%restart_on_update cpufreq
%insserv_cleanup
%files
@@ -134,7 +111,6 @@
%doc README AUTHORS README.smart-suspend-to-RAM
%attr(0755,root,root) %{_bindir}/*
%{_sbindir}/*
-%config %{_sysconfdir}/init.d/cpufreq
%{_sysconfdir}/pm/
%config(noreplace) %{_sysconfdir}/pm/config.d/rtcwake.config
%{pm_libdir}
++++++ pm-utils-1.4.1-suse-12.tar.bz2 -> pm-utils-1.4.1-suse-15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pm-utils/pm/power.d/intel-audio-powersave
new/pm-utils/pm/power.d/intel-audio-powersave
--- old/pm-utils/pm/power.d/intel-audio-powersave 2013-01-28
13:09:41.000000000 +0100
+++ new/pm-utils/pm/power.d/intel-audio-powersave 2013-02-25
15:58:59.000000000 +0100
@@ -22,7 +22,7 @@
[ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA
for dev in /sys/module/snd_*; do
[ -w "$dev/parameters/power_save" ] || continue
- printf "Setting power savings for $s to %d..." "{$dev##*/}" "$1"
+ printf "Setting power savings for $s to %d..." "${dev##*/}" "$1"
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
done
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pm-utils/pm/sleep.d/55NetworkManager
new/pm-utils/pm/sleep.d/55NetworkManager
--- old/pm-utils/pm/sleep.d/55NetworkManager 2013-01-28 13:09:41.000000000
+0100
+++ new/pm-utils/pm/sleep.d/55NetworkManager 1970-01-01 01:00:00.000000000
+0100
@@ -1,44 +0,0 @@
-#!/bin/sh
-# If we are running NetworkManager, tell it we are going to sleep.
-# TODO: Make NetworkManager smarter about how to handle sleep/resume
-# If we are asleep for less time than it takes for TCP to reset a
-# connection, and we are assigned the same IP on resume, we should
-# not break established connections. Apple can do this, and it is
-# rather nifty.
-
-. "${PM_FUNCTIONS}"
-
-suspend_nm()
-{
- # Tell NetworkManager to shut down networking
- printf "Having NetworkManager put all interaces to sleep..."
- dbus_send --system \
- --print-reply --reply-timeout=200 \
- --dest=org.freedesktop.NetworkManager \
- /org/freedesktop/NetworkManager \
- org.freedesktop.NetworkManager.Sleep boolean:true && \
- echo Done. || echo Failed.
-}
-
-resume_nm()
-{
- # Wake up NetworkManager and make it do a new connection
- printf "Having NetworkManager wake interfaces back up..."
- dbus_send --system \
- --dest=org.freedesktop.NetworkManager \
- --print-reply --reply-timeout=200 \
- /org/freedesktop/NetworkManager \
- org.freedesktop.NetworkManager.Sleep boolean:false && \
- echo Done. || echo Failed.
-}
-
-case "$1" in
- hibernate|suspend)
- suspend_nm
- ;;
- thaw|resume)
- resume_nm
- ;;
- *) exit $NA
- ;;
-esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pm-utils/pm/sleep.d/75modules
new/pm-utils/pm/sleep.d/75modules
--- old/pm-utils/pm/sleep.d/75modules 2013-01-28 13:09:41.000000000 +0100
+++ new/pm-utils/pm/sleep.d/75modules 2013-02-25 16:35:41.000000000 +0100
@@ -8,7 +8,7 @@
[ -z "$SUSPEND_MODULES" ] && return $NA
for x in $SUSPEND_MODULES ; do
printf "Unloading kernel module %s..." "$x"
- modunload $x && echo Done. || { touch $INHIBIT; echo Failed.; }
+ modunload $x && echo Done. || { inhibit "Unloading kernel
module $x failed."; echo Failed.; }
done
return 0
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pm-utils/pm/sleep.d/80acpi-fan
new/pm-utils/pm/sleep.d/80acpi-fan
--- old/pm-utils/pm/sleep.d/80acpi-fan 2013-01-28 13:09:41.000000000 +0100
+++ new/pm-utils/pm/sleep.d/80acpi-fan 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-#!/bin/bash
-#
-# Stefan Seyfried, SUSE Linux Products GmbH, 2006
-# mostly taken from the powersave project
-
-. "${PM_FUNCTIONS}"
-
-#############################################################
-# triggers the ACPI fan(s) after resume. Since ACPI drivers
-# have no suspend support, this is sometimes necessary.
-# see http://article.gmane.org/gmane.linux.acpi.devel/16643
-kick-fan()
-{
- local FAN DUMMY STATE
- for FAN in /proc/acpi/fan/*/state; do
- [ ! -e $FAN ] && continue
- read DUMMY STATE < $FAN
- if [ "$STATE" = "on" ]; then
- echo "kicking $FAN on"
- echo -n 3 > $FAN
- echo -n 0 > $FAN
- else
- echo "kicking $FAN off"
- echo -n 0 > $FAN
- echo -n 3 > $FAN
- fi
- done
-}
-
-case $1 in
- thaw|resume)
- kick-fan
- ;;
- *) exit $NA
- ;;
-esac
-
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pm-utils/pm/sleep.d/Makefile
new/pm-utils/pm/sleep.d/Makefile
--- old/pm-utils/pm/sleep.d/Makefile 2013-01-31 18:13:57.000000000 +0100
+++ new/pm-utils/pm/sleep.d/Makefile 2013-03-12 16:07:51.000000000 +0100
@@ -190,7 +190,6 @@
00powersave \
99Zgrub \
49bluetooth \
- 55NetworkManager \
75modules \
90clock \
94cpufreq \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pm-utils/pm/sleep.d/Makefile.am
new/pm-utils/pm/sleep.d/Makefile.am
--- old/pm-utils/pm/sleep.d/Makefile.am 2013-01-28 13:09:41.000000000 +0100
+++ new/pm-utils/pm/sleep.d/Makefile.am 2013-03-12 16:07:51.000000000 +0100
@@ -5,7 +5,6 @@
00powersave \
99Zgrub \
49bluetooth \
- 55NetworkManager \
75modules \
90clock \
94cpufreq \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pm-utils/pm/sleep.d/Makefile.in
new/pm-utils/pm/sleep.d/Makefile.in
--- old/pm-utils/pm/sleep.d/Makefile.in 2013-01-31 18:13:56.000000000 +0100
+++ new/pm-utils/pm/sleep.d/Makefile.in 2013-03-12 16:07:51.000000000 +0100
@@ -190,7 +190,6 @@
00powersave \
99Zgrub \
49bluetooth \
- 55NetworkManager \
75modules \
90clock \
94cpufreq \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
