Hello community,
here is the log from the commit of package pm-utils for openSUSE:Factory
checked in at 2012-04-23 09:16:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2012-03-01
07:26:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-04-23
09:16:19.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Apr 19 08:24:13 UTC 2012 - vdziewie...@suse.com
+
+-Created a git repository at g...@gitorious.org:opensuse/pm-utils.git as a
branch of
+git://anongit.freedesktop.org/git/pm-utils, to avoid having suse
+hooks in a separate package, using this repository (all patches
+removed as they are included there)
+-Fixed bnc#751887 - Hibernation failure after security patches applied;
+-Fixed bnc#751621 - /usr/lib/pm-utils/sleep.d/06autofs unconditionally
(re)starts autofs
+-Fixed bnc#751811 - pm-suspend generates defective /var/log/pm-suspend.log
file
+-Fixed bnc#753589 - sysctl.conf settings are lost when changing
+powerstate
+-Fixed bnc#633496 - /usr/lib/pm-utils/sleep.d/75modules should cancel
suspend2disk when unloading a module fails
+-------------------------------------------------------------------
Old:
----
pm-utils-1.2.6.1-fix-broken-dbus-send.diff
pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch
pm-utils-1.3.0-suse-grub.patch
pm-utils-1.3.0-suse-logging.patch
pm-utils-1.3.0-suse-smart-uswsusp.patch
pm-utils-1.4.1-suse-config.patch
pm-utils-1.4.1.tar.bz2
pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2
New:
----
pm-utils-1.4.1-suse-4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pm-utils.spec ++++++
--- /var/tmp/diff_new_pack.WTMu5q/_old 2012-04-23 09:16:20.000000000 +0200
+++ /var/tmp/diff_new_pack.WTMu5q/_new 2012-04-23 09:16:20.000000000 +0200
@@ -19,6 +19,7 @@
%define pm_libdir %{_prefix}/lib/%{name}/
%define pm_quirkdbdir %{pm_libdir}/video-quirks
%define pm_sysconfdir %{_sysconfdir}/pm/config.d/
+%define gitversion 4
Name: pm-utils
Version: 1.4.1
@@ -27,22 +28,9 @@
License: GPL-2.0+
Group: System/Base
Url: http://pm-utils.freedesktop.org/wiki/
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}-suse-%{gitversion}.tar.bz2
# http://gitorious.org/opensuse/pm-utils-suse
-Source1: pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2
-Source2:
http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2
-#PATCH-FIX-OPENSUSE: fixes a dbus-send call
-Patch0: pm-utils-1.2.6.1-fix-broken-dbus-send.diff
-#PATCH-FIX-OPENSUSE: make the uswsusp module default on SUSE and port the
"smart" behavior
-Patch1: pm-utils-1.3.0-suse-smart-uswsusp.patch
-#PATCH-FIX-OPENSUSE: add some aditional config variables for pm-utils-suse
-Patch2: pm-utils-1.4.1-suse-config.patch
-#PATCH-FIX-OPENSUSE: more SUSE friendly grub handler
-Patch3: pm-utils-1.3.0-suse-grub.patch
-#PATCH-FIX-OPENSUSE: setup also kernel loglevel to show up the progress bar
-Patch4: pm-utils-1.3.0-suse-logging.patch
-#PATCH-FIX-OPENSUSE: export SUSE_IGNORE_FBMODES to workaround bnc#304995
-Patch5: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch
+Source1:
http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq
@@ -82,19 +70,13 @@
%prep
-%setup -q -b 1 -a 2
-%patch0 -p1 -b .broken-dbus
-%patch1 -p1 -b .smart-swsusp
-%patch2 -p1 -b .suse-config
-%patch3 -p1 -b .suse-grub
-%patch4 -p1 -b .suse-logging
-%patch5 -p1 -b .directfb-ignore-fbmodes
+%setup -n %{name} -a 1
%build
%{configure} \
--docdir=%{_defaultdocdir}/%{name} \
--libdir=%{_prefix}/lib
-%{__make}
+%{__make} -d
%install
%{makeinstall}
@@ -107,12 +89,18 @@
%{__install} -d -m 0755 %{buildroot}%{pm_quirkdbdir}
%{__install} -m 0644 *.quirkdb %{buildroot}%{pm_quirkdbdir}
#SUSE hooks
-pushd ../pm-utils-suse
-%{__install} -m 0755 hooks/sleep.d/* %{buildroot}/%{pm_libdir}/sleep.d/
-%{__install} -m 0644 hooks/config.d/* %{buildroot}/%{pm_sysconfdir}/
+%{__install} -m 0755 pm/sleep.d/02rtcwake %{buildroot}/%{pm_libdir}/sleep.d/
+%{__install} -m 0755 pm/sleep.d/06autofs %{buildroot}/%{pm_libdir}/sleep.d/
+%{__install} -m 0755 pm/sleep.d/30s2disk-check
%{buildroot}/%{pm_libdir}/sleep.d/
+%{__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}/
# powersave command is back
%{__install} -m 0755 bin/powersave %{buildroot}/%{_bindir}
-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
@@ -126,7 +114,7 @@
%files
%defattr (-,root,root)
-%doc README ChangeLog AUTHORS ../pm-utils-suse/doc/README.smart-suspend-to-RAM
+%doc README AUTHORS README.smart-suspend-to-RAM
%attr(0755,root,root) %{_bindir}/*
%{_sbindir}/*
%{_sysconfdir}/pm/
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
