[apiviz] Makes using of apiviz on jdk7 possible

[Marek Goldmann]

commit 00b664eb366294b9c7e549fafa4ab0aeef05a7e4
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Fri Nov 18 08:52:54 2011 -0500

    Makes using of apiviz on jdk7 possible

 apiviz-1.3.1.GA-jdk7.patch |   24 ++++++++++++++++++++++++
 apiviz.spec                |    9 +++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/apiviz-1.3.1.GA-jdk7.patch b/apiviz-1.3.1.GA-jdk7.patch
new file mode 100644
index 0000000..a0c8c8f
--- /dev/null
+++ b/apiviz-1.3.1.GA-jdk7.patch
@@ -0,0 +1,24 @@
+diff -Naur apiviz-1.3.1.GA/pom.xml apiviz-1.3.1.GA-work/pom.xml
+--- apiviz-1.3.1.GA/pom.xml	2010-03-04 04:05:24.000000000 -0500
++++ apiviz-1.3.1.GA-work/pom.xml	2011-11-18 08:27:59.946053754 -0500
+@@ -57,7 +57,7 @@
+             <activation>
+                 <property>
+                     <name>java.vendor</name>
+-                    <value>Sun Microsystems Inc.</value>
++                    <value>Oracle Corporation</value>
+                 </property>
+             </activation>
+             <dependencies>
+diff -Naur apiviz-1.3.1.GA/src/main/java/org/jboss/apiviz/APIviz.java apiviz-1.3.1.GA-work/src/main/java/org/jboss/apiviz/APIviz.java
+--- apiviz-1.3.1.GA/src/main/java/org/jboss/apiviz/APIviz.java	2010-03-04 03:57:57.000000000 -0500
++++ apiviz-1.3.1.GA-work/src/main/java/org/jboss/apiviz/APIviz.java	2011-11-18 08:26:56.307054641 -0500
+@@ -47,7 +47,7 @@
+ public class APIviz {
+ 
+     private static final Pattern INSERTION_POINT_PATTERN = Pattern.compile(
+-            "((<\\/PRE>)(?=\\s*<P>)|(?=<TABLE BORDER=\"1\"))");
++            "((<\\/PRE>)(?=\\s*<P>)|(?=<TABLE BORDER=\"1\")|(?=<div class=\"contentContainer\">))");
+ 
+     public static boolean start(RootDoc root) {
+         root = new APIvizRootDoc(root);
diff --git a/apiviz.spec b/apiviz.spec
index edde9b8..111e6b9 100644
--- a/apiviz.spec
+++ b/apiviz.spec
@@ -3,18 +3,19 @@
 
 Name:             apiviz
 Version:          1.3.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          APIviz is a JavaDoc doclet to generate class and package diagrams
 Group:            Development/Libraries
 License:          LGPLv2+
 URL:              http://code.google.com/p/apiviz/
 Source0:          http://%{name}.googlecode.com/files/%{name}-%{namedversion}-dist.tar.gz
 Patch0:           %{name}-%{namedversion}-pom.patch
+Patch1:           %{name}-%{namedversion}-jdk7.patch
 
 BuildArch:        noarch
 
 BuildRequires:    jpackage-utils
-BuildRequires:    java-devel
+BuildRequires:    java-1.7.0-devel
 BuildRequires:    maven
 
 BuildRequires:    maven-antrun-plugin
@@ -52,6 +53,7 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{namedversion}
 %patch0 -p1
+%patch1 -p1
 
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
@@ -85,6 +87,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom
 %doc LICENSE.txt
 
 %changelog
+* Fri Nov 18 2011 Marek Goldmann <mgoldman at redhat.com> 1.3.1-3
+- Working on on jdk7
+
 * Wed Jul 27 2011 Marek Goldmann <mgoldman at redhat.com> 1.3.1-2
 - Using upstream tarball