Accepting request 431478 from home:Zaitor:branches:GNOME:Next

Add patch from upstream, and fix up in service file and remove unneeded requires.

The xterm Requires was added back when the service file was added. It was perhaps needed back then, but is surely not needed now.

OBS-URL: https://build.opensuse.org/request/show/431478
OBS-URL: https://build.opensuse.org/package/show/Base:System/powertop?expand=0&rev=48

powertop.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug 25 12:55:37 UTC 2016 - zaitor@opensuse.org
+
+- Add powertop-2.8-potential-segfaults.patch: Fix potential
+  segfaults.
+- Drop Environment="TERM=xterm" from the systemd service file, it
+  is not needed.
+- Following the above: Remove xterm/xterm-bin Requires.
+
 -------------------------------------------------------------------
 Thu May 26 08:41:28 UTC 2016 - mlin@suse.com
 

powertop.service

@@ -3,7 +3,6 @@ Description=Extend the battery life of laptop
 
 [Service]
 Type=oneshot
-Environment="TERM=xterm"
 ExecStart=/usr/sbin/powertop --auto-tune
 
 [Install]

powertop.spec

@@ -27,6 +27,8 @@ Url:            https://01.org/powertop/
 Source0:        https://01.org/sites/default/files/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1:        powertop.service
 Patch0:         powertop-no-date.patch
+# PATCH-FIX-UPSTREAM powertop-2.8-potential-segfaults.patch zaitor@opensuse.org -- Fix potential segfaults.
+Patch1:         powertop-2.8-potential-segfaults.patch
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  ncurses-devel
@@ -39,12 +41,6 @@ BuildRequires:  pkgconfig(zlib)
 Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
-#xterm has been splitted in openSUSE to have fewer dependencies
-%if 0%{?is_opensuse} && 0%{?suse_version} != 1315
-Requires:       xterm-bin
-%else
-Requires:       xterm
-%endif
 
 %description
 PowerTOP is a program that collects the various pieces of information
@@ -56,6 +52,7 @@ doing in terms of power savings.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Delete objects files left in tarball
 find . -name '*.o' -delete