OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=12

elfutils-0.127-build-fix.diff

@@ -1,11 +0,0 @@
---- Makefile.am-dist	2007-01-24 11:58:53.000000000 +0100
-+++ Makefile.am	2007-01-24 11:59:09.000000000 +0100
-@@ -29,7 +29,7 @@
- 
- mini_SUBDIRS = config m4 lib libelf libelf-po
- # Add doc back when we have some real content.
--all_SUBDIRS = libebl libdwfl libdw libcpu libasm backends src po tests
-+all_SUBDIRS = libebl libdwfl libdw libcpu libasm backends src
- SUBDIRS = $(mini_SUBDIRS) $(all_SUBDIRS)
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION

elfutils-0.127-no-osl.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e3951234848adf21b340d02675c07439c527d39555ccce499af932bc1bbf92d
-size 1010635

systap-elf-install.patch

@@ -1,14 +0,0 @@
---- Makefile.am-dist	2007-04-24 18:19:42.000000000 +0200
-+++ Makefile.am	2007-04-24 18:20:19.000000000 +0200
-@@ -44,9 +44,9 @@
- 
- .PHONY: install-elfutils
- install-elfutils:
--	mkdir -p $(pkglibdir)
-+	mkdir -p $(DESTDIR)$(pkglibdir)
- 	for file in lib-elfutils/*.so* lib-elfutils/${PACKAGE_NAME}/*.so*; do \
--	   $(INSTALL_PROGRAM) $$file $(pkglibdir); \
-+	   $(INSTALL_PROGRAM) $$file $(DESTDIR)$(pkglibdir); \
- 	done
- install-exec-local: install-elfutils
- endif

systemtap.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 21 12:24:15 CEST 2007 - tiwai@suse.de
+
+- use the external elfutils packages.
+
 -------------------------------------------------------------------
 Tue Apr 24 18:15:56 CEST 2007 - tiwai@suse.de
 

systemtap.spec

@@ -11,23 +11,19 @@
 # norootforbuild
 
 Name:           systemtap
-BuildRequires:  gcc-c++
+BuildRequires:  gcc-c++ libebl-devel
 %define package_version  20070421
 %define elfutils_version 0.127
 License:        GNU General Public License (GPL)
 Version:        0.5.14
-Release:        1
+Release:        7
 Summary:        Instrumentation System
 Group:          Development/Tools/Debuggers
 URL:            http://sourceware.org/systemtap/
 # Requires: kernel-source gcc make
 # Suggest: kernel-smp-debuginfo
 Source:         systemtap-%{package_version}.tar.bz2
-Source1:        elfutils-%{elfutils_version}-no-osl.tar.bz2
+Patch:          systemtap-compile-warning-fixes.diff
-Patch:          systap-elf-install.patch
-Patch1:         elfutils-portability.patch
-Patch2:         elfutils-0.127-build-fix.diff
-Patch3:         systemtap-compile-warning-fixes.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -46,22 +42,15 @@ Authors:
 
 %prep
 # %setup -n %{name}-%{package_version} -q -a1
-%setup -n src -q -a1
+%setup -n src -q
 %patch
-%patch3
-autoreconf -fi
-cd elfutils-%{elfutils_version}
-%patch1 -p1
-%patch2
-autoreconf -fi
-cd ..
 
 %build
-%configure --with-elfutils=elfutils-%{elfutils_version}
+%configure
 make
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install install-elfutils
+make DESTDIR=$RPM_BUILD_ROOT install
 mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap
 
 %clean
@@ -77,6 +66,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %attr(0755,root,root) /var/cache/systemtap
 
 %changelog
+* Mon May 21 2007 - tiwai@suse.de
+- use the external elfutils packages.
 * Tue Apr 24 2007 - tiwai@suse.de
 - updated to snapshot 20070421 and elfutils-0.127:
   * minor compile warning fixes