From 1935f2268c3f7ec0e0302f6bfa7267fc0b1c39b9aa810789c4246f6e812bf7e2 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 21 Dec 2011 11:21:19 +0000
Subject: [PATCH] prepare_spec

OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=41
---
 systemtap-docs.spec | 11 ++++++-----
 systemtap.spec      | 23 +++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/systemtap-docs.spec b/systemtap-docs.spec
index dabffb0..4ace077 100644
--- a/systemtap-docs.spec
+++ b/systemtap-docs.spec
@@ -15,19 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           systemtap-docs
-BuildRequires:  gcc-c++ libebl-devel pkg-config autoconf
+BuildRequires:  autoconf
+BuildRequires:  gcc-c++
+BuildRequires:  libebl-devel
+BuildRequires:  pkg-config
 # for documents
 BuildRequires:  xmlto
 BuildRequires:  fop
 BuildRequires:  latex2html
-License:        GPLv2+
 Version:        1.6
-Release:        5
+Release:        0
 Summary:        Documents and examples for systemtap
+License:        GPL-2.0+
 Group:          Development/Tools/Debuggers
 Url:            http://sourceware.org/systemtap/
 Source:         systemtap-%{version}.tar.bz2
diff --git a/systemtap.spec b/systemtap.spec
index 066fa49..4f928f1 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -15,17 +15,22 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           systemtap
-BuildRequires:  gcc-c++ glib2-devel libcap-devel libebl-devel pkg-config sqlite-devel
-BuildRequires:  mozilla-nspr-devel mozilla-nss-devel mozilla-nss-tools
+BuildRequires:  gcc-c++
+BuildRequires:  glib2-devel
+BuildRequires:  libcap-devel
+BuildRequires:  libebl-devel
+BuildRequires:  mozilla-nspr-devel
+BuildRequires:  mozilla-nss-devel
+BuildRequires:  mozilla-nss-tools
+BuildRequires:  pkg-config
+BuildRequires:  sqlite-devel
 BuildRequires:  systemd
-License:        GPLv2+
 Version:        1.6
-Release:        8
+Release:        0
 Summary:        Instrumentation System
+License:        GPL-2.0+
 Group:          Development/Tools/Debuggers
 Url:            http://sourceware.org/systemtap/
 Source:         systemtap-%{version}.tar.bz2
@@ -41,8 +46,6 @@ Developers can write instrumentation to collect data on the operation
 of the system.
 
 %package runtime
-License:        GPLv2+
-Group:          Development/Tools/Debuggers
 Summary:        Runtime environment for systemtap
 
 %description runtime
@@ -50,8 +53,6 @@ SystemTap is an instrumentation system for systems running Linux.
 This package contains the runtime environment for systemtap programs.
 
 %package server
-License:        GPLv2+
-Group:          Development/Tools/Debuggers
 Summary:        Systemtap server
 Requires:       %{name} = %{version}-%{release}
 Requires(post): /bin/systemd-tmpfiles
@@ -63,8 +64,6 @@ SystemTap is an instrumentation system for systems running Linux.
 This package contains the server component of systemtap.
 
 %package sdt-devel
-License:        GPLv2+
-Group:          Development/Tools/Debuggers
 Summary:        Static probe support tools
 Requires:       %{name} = %{version}-%{release}
 Requires:       python-base