Rebase on newer git tree.

- Bump the fake version to 7.99.1 to account for ABI differences.
- Enforce the minimum libdwarf version.
- Drop the upstreamed R_PPC_NUM patch.

.gitignore

@@ -1,2 +1,4 @@
 /dyninst-7.99.tar.gz
 /dyninst-docs-7.99.tar.gz
+/dyninst-7.99.1.tar.gz
+/dyninst-docs-7.99.1.tar.gz

dyninst-git.patch

@@ -1,12 +1,24 @@
-diff -up dyninst-7.99/dyninst/make.config.git dyninst-7.99/dyninst/make.config
+--- dyninst-7.99/dyninst/make.config.git	2012-09-18 10:56:40.000000000 -0700
---- dyninst-7.99/dyninst/make.config.git	2012-06-19 14:04:19.849002895 -0400
++++ dyninst-7.99/dyninst/make.config	2012-09-18 15:14:40.387837651 -0700
-+++ dyninst-7.99/dyninst/make.config	2012-06-19 14:04:38.971000002 -0400
 @@ -5,7 +5,7 @@
  #
  
  SUITE_NAME	= Paradyn
 -RELEASE_NUM	= 8.0
-+RELEASE_NUM	= 7.99
++RELEASE_NUM	= 7.99.1
  
  ifndef TO_CORE
  TO_CORE		= ../..
+--- dyninst-7.99/dyninst/dyninstAPI/h/BPatch.h.git	2012-09-18 15:13:36.748990056 -0700
++++ dyninst-7.99/dyninst/dyninstAPI/h/BPatch.h	2012-09-18 15:14:06.147920976 -0700
+@@ -61,8 +61,8 @@ class func_instance;
+ #define DYNINST_7_0
+ 
+ #define DYNINST_MAJOR 7
+-#define DYNINST_MINOR 0
+-#define DYNINST_SUBMINOR 0
++#define DYNINST_MINOR 99
++#define DYNINST_SUBMINOR 1
+ 
+ #ifdef IBM_BPATCH_COMPAT
+ typedef void *BPatch_Address;

dyninst-ppc.patch

@@ -1,13 +0,0 @@
-diff -up dyninst-7.99/dyninst/symtabAPI/src/relocationEntry-elf-ppc32.C.ppc dyninst-7.99/dyninst/symtabAPI/src/relocationEntry-elf-ppc32.C
---- dyninst-7.99/dyninst/symtabAPI/src/relocationEntry-elf-ppc32.C.ppc	2012-08-15 07:50:54.270065052 -0400
-+++ dyninst-7.99/dyninst/symtabAPI/src/relocationEntry-elf-ppc32.C	2012-08-15 07:50:10.500111439 -0400
-@@ -101,7 +101,9 @@ const char* relocationEntry::relType2Str
-         CASE_RETURN_STR(R_PPC_GOT_DTPREL16_LO);
-         CASE_RETURN_STR(R_PPC_GOT_DTPREL16_HI);
-         CASE_RETURN_STR(R_PPC_GOT_DTPREL16_HA);
-+#if defined(R_PPC_NUM)
-         CASE_RETURN_STR(R_PPC_NUM);
-+#endif
-         CASE_RETURN_STR(R_PPC_EMB_NADDR32);
-         CASE_RETURN_STR(R_PPC_EMB_NADDR16);
-         CASE_RETURN_STR(R_PPC_EMB_NADDR16_LO);

dyninst.spec

@@ -1,12 +1,10 @@
-%define version 7.99
-
 Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
 Group: Development/Libraries
-Release: 0.24%{?dist}
+Release: 0.25%{?dist}
 URL: http://www.dyninst.org
-Version: %version
+Version: 7.99.1
 Exclusiveos: linux
 #Right now dyninst does not know about the following architectures
 ExcludeArch: s390 s390x %{arm}
@@ -14,17 +12,16 @@ ExcludeArch: s390 s390x %{arm}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 #  git clone http://git.dyninst.org/dyninst.git; cd dyninst
-#  git archive --format=tar.gz --prefix=dyninst/ 3bfdca4729e3f7967b2e1e895e80164ac7350105 >  dyninst-7.99.tar.gz
+#  git archive --format=tar.gz --prefix=dyninst/ c496f80d1c8ef29b6b2aab7e4114ba2dc38fa89d > dyninst-7.99.1.tar.gz
 #  git clone http://git.dyninst.org/docs.git; cd docs
-#  git archive --format=tar.gz fe92e5b28804791ecadc893e469bc2215dbc3066 > dyninst-docs-7.99.tar.gz
+#  git archive --format=tar.gz 045689169ad35113756131efbbfeda2edb461874 > dyninst-docs-7.99.1.tar.gz
 Source0: %{name}-%{version}.tar.gz
 Source1: %{name}-docs-%{version}.tar.gz
 # Change version number so official dyninst 8.0 will replace it
 Patch3: dyninst-git.patch
 Patch5: dyninst-unused_vars.patch
-Patch6: dyninst-ppc.patch
 BuildRequires: libxml2-devel >= 2.7.8
-BuildRequires: libdwarf-devel 
+BuildRequires: libdwarf-devel >= 20111030
 BuildRequires: elfutils-libelf-devel
 BuildRequires: boost-devel
 
@@ -71,7 +68,6 @@ the dyninst user-space libraries and interfaces.
 pushd dyninst
 %patch5 -p1 -b .unused
 popd
-%patch6 -p1 -b .ppc
 
 %build
 
@@ -138,6 +134,12 @@ chmod 644 %{buildroot}%{_libdir}/dyninst/*.a
 %{_libdir}/dyninst/*.a
 
 %changelog
+* Thu Sep 20 2012 Josh Stone <jistone@redhat.com> 7.99.1-0.25
+- Rebase on newer git tree.
+- Bump the fake version to 7.99.1 to account for ABI differences.
+- Enforce the minimum libdwarf version.
+- Drop the upstreamed R_PPC_NUM patch.
+
 * Wed Aug 15 2012 Karsten Hopp <karsten@redhat.com> 7.99-0.24
 - check if R_PPC_NUM is defined before using it, similar to R_PPC64_NUM
 

sources

@@ -1,2 +1,2 @@
-1486768ce55aaa59d4cfe64af674d38c  dyninst-7.99.tar.gz
+40f6dd46c402eaf2b12313ec0b23a19c  dyninst-7.99.1.tar.gz
-be21f6a11b37a386e8b4ad16a86e3715  dyninst-docs-7.99.tar.gz
+1a4b1d571232dcc07f0f3d22320089cf  dyninst-docs-7.99.1.tar.gz