From 505e2caa623de44eadab9843e3459b719af00acb68927406f1237b3e4cd91f80 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 11 Jul 2008 19:26:54 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/oprofile?expand=0&rev=8

---
 oprofile-0.9.3.diff |  31 +++++++++++++
 oprofile.changes    |   5 ++
 oprofile.spec       | 111 +++++++++++++++++++++++---------------------
 3 files changed, 93 insertions(+), 54 deletions(-)

diff --git a/oprofile-0.9.3.diff b/oprofile-0.9.3.diff
index ae3dd55..6585e3a 100644
--- a/oprofile-0.9.3.diff
+++ b/oprofile-0.9.3.diff
@@ -1,3 +1,24 @@
+--- Makefile.am
++++ Makefile.am
+@@ -16,6 +16,7 @@ SUBDIRS = \
+ 	doc \
+ 	gui
+ 
++AUTOMAKE_OPTIONS = foreign
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ # The module will not build under distcheck
+--- configure.in
++++ configure.in
+@@ -127,7 +127,7 @@ AX_CHECK_DOCBOOK
+ dnl finally restore the original libs setting
+ LIBS="$ORIG_SAVE_LIBS"
+ LIBERTY_LIBS="-liberty $DL_LIB $INTL_LIB"
+-BFD_LIBS="-lbfd -liberty $DL_LIB $INTL_LIB"
++BFD_LIBS="-lbfd -liberty $Z_LIB $DL_LIB $INTL_LIB"
+ POPT_LIBS="-lpopt"
+ AC_SUBST(LIBERTY_LIBS)
+ AC_SUBST(BFD_LIBS)
 --- gui/oprof_start_util.cpp
 +++ gui/oprof_start_util.cpp
 @@ -13,6 +13,7 @@
@@ -192,6 +213,16 @@
  #include <iostream>
  
  #include "op_bfd.h"
+--- m4/binutils.m4
++++ m4/binutils.m4
+@@ -8,6 +8,7 @@ AC_CHECK_FUNCS(xcalloc)
+ AC_CHECK_FUNCS(xmemdup)
+ AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl"; DL_LIB="-ldl", DL_LIB="")
+ AC_CHECK_LIB(intl, main, LIBS="$LIBS -lintl"; INTL_LIB="-lintl", INTL_LIB="")
++AC_CHECK_LIB(z, zlibVersion, LIBS="$LIBS -lz"; Z_LIB=-lz, Z_LIB=)
+ AC_CHECK_LIB(bfd, bfd_openr,, AC_MSG_ERROR([bfd library not found]))
+ 
+ # Determine if bfd_get_synthetic_symtab macro is available
 --- pp/common_option.cpp
 +++ pp/common_option.cpp
 @@ -13,6 +13,8 @@
diff --git a/oprofile.changes b/oprofile.changes
index 2a4b292..5894475 100644
--- a/oprofile.changes
+++ b/oprofile.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 11 14:44:26 CEST 2008 - schwab@suse.de
+
+- Update binutils check.
+
 -------------------------------------------------------------------
 Mon Nov 26 13:08:50 CET 2007 - schwab@suse.de
 
diff --git a/oprofile.spec b/oprofile.spec
index ebd9ee1..e08e9b5 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -1,14 +1,14 @@
 #
 # spec file for package oprofile (Version 0.9.3)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
+
 
 Name:           oprofile
 BuildRequires:  binutils-devel libxslt popt-devel qt3-devel update-desktop-files
@@ -17,7 +17,7 @@ License:        GPL v2 or later
 Group:          Development/Tools/Other
 AutoReqProv:    on
 Version:        0.9.3
-Release:        45
+Release:        99
 Summary:        System-Wide Profiler for Linux Systems
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         %{name}-%{version}.tar.gz
@@ -61,6 +61,7 @@ Authors:
 %patch1 -p1
 
 %build
+autoreconf -fi
 ./configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 	    --prefix=/usr --mandir=%{_mandir} \
 	    --with-kernel-support \
@@ -84,120 +85,122 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README TODO ChangeLog 
 
 %changelog
-* Mon Nov 26 2007 - schwab@suse.de
+* Fri Jul 11 2008 schwab@suse.de
+- Update binutils check.
+* Mon Nov 26 2007 schwab@suse.de
 - Fix open call.
-* Tue Oct 16 2007 - schwab@suse.de
+* Tue Oct 16 2007 schwab@suse.de
 - Fix event mapping on 970MP [#333487].
-* Thu Oct 11 2007 - schwab@suse.de
+* Thu Oct 11 2007 schwab@suse.de
 - Fix missing includes.
-* Tue Jul 17 2007 - schwab@suse.de
+* Tue Jul 17 2007 schwab@suse.de
 - Update to oprofile 0.9.3.
-* Wed Jul 04 2007 - schwab@suse.de
+* Wed Jul 04 2007 schwab@suse.de
 - Update to oprofile 0.9.3-rc2.
-* Mon Jun 18 2007 - schwab@suse.de
+* Mon Jun 18 2007 schwab@suse.de
 - Update to oprofile 0.9.3-rc1.
-* Thu Jan 11 2007 - schwab@suse.de
+* Thu Jan 11 2007 schwab@suse.de
 - Add binutils-devel to BuildRequires.
-* Mon Sep 18 2006 - schwab@suse.de
+* Mon Sep 18 2006 schwab@suse.de
 - Update to oprofile 0.9.2 (no summary available).
-* Fri Aug 18 2006 - schwab@suse.de
+* Fri Aug 18 2006 schwab@suse.de
 - Avoid crash in find_nearest_line [#193622].
-* Wed May 31 2006 - schwab@suse.de
+* Wed May 31 2006 schwab@suse.de
 - Fix invalid string operation.
-* Thu May 04 2006 - schwab@suse.de
+* Thu May 04 2006 schwab@suse.de
 - Fix last change.
-* Mon Feb 27 2006 - schwab@suse.de
+* Mon Feb 27 2006 schwab@suse.de
 - Add events for Power5+ [#152494].
-* Fri Jan 27 2006 - mls@suse.de
+* Fri Jan 27 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Wed Jan 25 2006 - schwab@suse.de
+* Wed Jan 25 2006 schwab@suse.de
 - Integrate fixes for ppc64 events and groups [#130910, #137665].
-* Mon Dec 12 2005 - schwab@suse.de
+* Mon Dec 12 2005 schwab@suse.de
 - Update to oprofile 0.9.1.
-* Tue Nov 08 2005 - dmueller@suse.de
+* Tue Nov 08 2005 dmueller@suse.de
 - don't build as root
-* Wed Sep 28 2005 - schwab@suse.de
+* Wed Sep 28 2005 schwab@suse.de
 - Fix invalid C++.
-* Wed Jul 06 2005 - schwab@suse.de
+* Wed Jul 06 2005 schwab@suse.de
 - Unpack compressed vmlinux [#52767].
 - Use RPM_OPT_FLAGS.
-* Tue Jun 07 2005 - schwab@suse.de
+* Tue Jun 07 2005 schwab@suse.de
 - Update to oprofile 0.9.
-* Thu Mar 24 2005 - schwab@suse.de
+* Thu Mar 24 2005 schwab@suse.de
 - Update to oprofile 0.8.2.
-* Thu Nov 04 2004 - schwab@suse.de
+* Thu Nov 04 2004 schwab@suse.de
 - Update to oprofile 0.8.1.
-* Fri Sep 03 2004 - schwab@suse.de
+* Sat Sep 04 2004 schwab@suse.de
 - Update to oprofile 0.8.
-* Mon Jun 28 2004 - skh@suse.de
+* Mon Jun 28 2004 skh@suse.de
 - more fixes for #40468
   - fixed print statement in op_help.c
   - more power 4 events
   - fixed incorrect event counter settings for power 4
-* Tue Jun 08 2004 - skh@suse.de
+* Tue Jun 08 2004 skh@suse.de
 - Update to fix for #40468: use correct event numbers for power5
   events.
-* Wed May 26 2004 - skh@suse.de
+* Wed May 26 2004 skh@suse.de
 - Added default CYCLES event to the Power 4 and Power 5 event
   files. (#40468)
-* Tue May 25 2004 - skh@suse.de
+* Tue May 25 2004 skh@suse.de
 - add user space support for ppc64 (#40468)
-* Sun May 09 2004 - ak@suse.de
+* Sun May 09 2004 ak@suse.de
 - Increase minimum count on P4 to 5000 for all events
 - Automatically add the module path of the current kernel to oprofpp
   (#36825)
 - Fix 64bit uncleanness in symbol resolution (#36825)
-* Sat Apr 10 2004 - aj@suse.de
+* Sat Apr 10 2004 aj@suse.de
 - Remove kernel-source requirement.
-* Wed Feb 04 2004 - skh@suse.de
+* Wed Feb 04 2004 skh@suse.de
 - Updated to version 0.7.1
 - Removed subpackage km_oprofile (it is part of the main kernel
   distribution as of kernel 2.6)
 - Don't build as root.
-* Mon Oct 06 2003 - ak@suse.de
+* Mon Oct 06 2003 ak@suse.de
 - Check if APIC is enabled instead of crashing (#31774)
   Needs updated kernel.
-* Sat Aug 16 2003 - adrian@suse.de
+* Sat Aug 16 2003 adrian@suse.de
 - add desktop file
-* Thu Jul 31 2003 - skh@suse.de
+* Thu Jul 31 2003 skh@suse.de
 - Updated to 0.6
-* Fri Jun 20 2003 - mmj@suse.de
+* Fri Jun 20 2003 mmj@suse.de
 - Up to 0.5.4
-* Fri Jun 13 2003 - mmj@suse.de
+* Fri Jun 13 2003 mmj@suse.de
 - Package all dirs
-* Wed Jun 04 2003 - mmj@suse.de
+* Wed Jun 04 2003 mmj@suse.de
 - Make sure we get the right location for qt.
-* Wed May 28 2003 - mmj@suse.de
+* Wed May 28 2003 mmj@suse.de
 - Update to 0.5.3
-* Tue May 13 2003 - mmj@suse.de
+* Tue May 13 2003 mmj@suse.de
 - Use %%defattr
 - Package forgotten files
-* Mon Mar 31 2003 - mmj@suse.de
+* Mon Mar 31 2003 mmj@suse.de
 - Update to 0.5.2 including:
   · Docu overhaul
   · Feature additions
 - Bzip2'ed sources
 - Folded both automake patches into one patch
-* Tue Mar 11 2003 - kukuk@suse.de
+* Tue Mar 11 2003 kukuk@suse.de
 - Don't call depmod
-* Mon Mar 10 2003 - ro@suse.de
+* Tue Mar 11 2003 ro@suse.de
 - remove k_deflt from neededforbuild (cycle)
-* Mon Mar 10 2003 - mmj@suse.de
+* Mon Mar 10 2003 mmj@suse.de
 - Fix typo
-* Sat Mar 08 2003 - mmj@suse.de
+* Sat Mar 08 2003 mmj@suse.de
 - A go at fixing km_oprofile
-* Mon Mar 03 2003 - duwe@suse.de
+* Mon Mar 03 2003 duwe@suse.de
 - split off km_oprofile
 - tiny version update includes patches
-* Mon Feb 24 2003 - mmj@suse.de
+* Mon Feb 24 2003 mmj@suse.de
 - Add patch from davej to make it not crash the box
-* Sat Feb 15 2003 - adrian@suse.de
+* Sat Feb 15 2003 adrian@suse.de
 - minor dependency clean up
-* Fri Feb 07 2003 - mmj@suse.de
+* Fri Feb 07 2003 mmj@suse.de
 - Really fix build on x86_64
-* Tue Feb 04 2003 - mmj@suse.de
+* Tue Feb 04 2003 mmj@suse.de
 - Fix build on x86_64
-* Tue Feb 04 2003 - mmj@suse.de
+* Tue Feb 04 2003 mmj@suse.de
 - Update to oprofile 0.5:
   · Pentium IV support, including support for HyperThreading, is
   supported for 2.5 kernels (currently only in the -mm patchset).
@@ -213,9 +216,9 @@ rm -rf $RPM_BUILD_ROOT
   daemon startup and starting/stopping profiling.
   · Fixed upstream to compile with gcc 3.3
   · Several bugfixes
-* Wed Jan 29 2003 - ro@suse.de
+* Wed Jan 29 2003 ro@suse.de
 - fix build with gcc-3.3 (sluggish c++)
-* Thu Nov 07 2002 - mmj@suse.de
+* Thu Nov 07 2002 mmj@suse.de
 - Update to 0.4 which now has kernel 2.5 support
-* Thu Sep 12 2002 - mmj@suse.de
+* Thu Sep 12 2002 mmj@suse.de
 - Initial package, version 0.3 (x86 only for now)