From 947d4e2db384fbef1876a7e1b9a1a7e3bccde18a407e9fdd432716b90e2e933b Mon Sep 17 00:00:00 2001
From: Tony Jones <tonyj@suse.com>
Date: Fri, 6 Jan 2012 13:29:07 +0000
Subject: [PATCH] Revert previous incorrect commit by klaussfreire@gmail.com
 (commit should never have been accepted)

OBS-URL: https://build.opensuse.org/package/show/devel:tools/oprofile?expand=0&rev=24
---
 oprofile-0.9.7-watchdog.diff | 17 -----------------
 oprofile.changes             |  6 ------
 oprofile.spec                | 25 ++++++++++++-------------
 3 files changed, 12 insertions(+), 36 deletions(-)
 delete mode 100644 oprofile-0.9.7-watchdog.diff

diff --git a/oprofile-0.9.7-watchdog.diff b/oprofile-0.9.7-watchdog.diff
deleted file mode 100644
index d19804f..0000000
--- a/oprofile-0.9.7-watchdog.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -wur oprofile-0.9.7/utils/opcontrol oprofile-0.9.7-nu/utils/opcontrol
---- oprofile-0.9.7/utils/opcontrol	2011-07-20 16:36:48.000000000 -0300
-+++ oprofile-0.9.7-nu/utils/opcontrol	2011-12-24 11:36:16.141000284 -0300
-@@ -1211,10 +1211,10 @@
- 			echo $3 >$MOUNT/$1/$2
- 		else
- 			echo -n "Error: counter $1 not available"
--			if test -e /proc/sys/kernel/nmi_watchdog; then
--				echo " nmi_watchdog using this resource ? Try:"
-+			if test -e /proc/sys/kernel/watchdog; then
-+				echo " watchdog using this resource ? Try:"
- 				echo "opcontrol --deinit"
--				echo "echo 0 > /proc/sys/kernel/nmi_watchdog"
-+				echo "echo 0 > /proc/sys/kernel/watchdog"
- 			fi
- 			exit 1
- 		fi
diff --git a/oprofile.changes b/oprofile.changes
index 9d26eae..c3c2466 100644
--- a/oprofile.changes
+++ b/oprofile.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Tue Dec 27 14:38:40 UTC 2011 - klaussfreire@gmail.com
-
-- Fix nmi_watchdog handling, it was renamed as watchdog in recent 
-  kernels [#684751]
-
 -------------------------------------------------------------------
 Fri Nov 25 10:42:15 UTC 2011 - coolo@suse.com
 
diff --git a/oprofile.spec b/oprofile.spec
index d5fc248..19e7fe3 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package oprofile
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,17 +15,22 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           oprofile
-BuildRequires:  binutils-devel fdupes java2-devel-packages libtool libxslt popt-devel qt-devel update-desktop-files
+BuildRequires:  binutils-devel
+BuildRequires:  fdupes
+BuildRequires:  java2-devel-packages
+BuildRequires:  libtool
+BuildRequires:  libxslt
+BuildRequires:  popt-devel
+BuildRequires:  qt-devel
+BuildRequires:  update-desktop-files
 Url:            http://oprofile.sourceforge.net/
-License:        GPL-2.0+ ; LGPL-2.1+
-Group:          Development/Tools/Other
 PreReq:         /usr/sbin/groupadd /usr/sbin/useradd
 Version:        0.9.7
-Release:        1
+Release:        0
 Summary:        System-Wide Profiler for Linux Systems
+License:        GPL-2.0+ ; LGPL-2.1+
+Group:          Development/Tools/Other
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
@@ -35,7 +40,6 @@ Source4:        jvmpi.h
 Source5:        README-BEFORE-ADDING-PATCHES
 Patch1:         oprofile-0.9.5-buildfixes.diff
 Patch2:         oprofile-0.9.4-fixes.diff
-Patch3:         oprofile-0.9.7-watchdog.diff
 
 %description
 OProfile is a system-wide profiler for Linux systems, capable of
@@ -61,8 +65,6 @@ This is the package containing the userspace tools.
 %package devel
 Summary:        System-Wide Profiler for Linux Systems
 Group:          Development/Libraries/C and C++
-License:        GPL-2.0+ ; LGPL-2.1+
-AutoReqProv:    on
 Requires:       libopagent1 = %{version}-%{release} binutils-devel
 
 %description devel
@@ -76,8 +78,6 @@ virtual machines.
 %package -n libopagent1
 Summary:        System-Wide Profiler for Linux Systems
 Group:          Development/Libraries/C and C++
-License:        GPL-2.0+ ; LGPL-2.1+
-AutoReqProv:    on
 
 %description -n libopagent1
 OProfile is a system-wide profiler for Linux systems, capable of
@@ -91,7 +91,6 @@ from supported virtual machines.
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 mkdir -p java/include
 # copy files necessary to build Java agent libraries
 # libjvmpi_oprofile.so and libjvmti_oprofile.so