[apache-poi] Update to 3.8-beta2 Add BR fontconfig needed for tests to find fonts Fix javadoc link

[Orion Poplawski]

commit 53b6c24ebd7af5c3098fbecd859196278dcac79d
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Apr 20 16:41:31 2011 -0600

    Update to 3.8-beta2
    Add BR fontconfig needed for tests to find fonts
    Fix javadoc link

 apache-poi.spec |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/apache-poi.spec b/apache-poi.spec
index dcdbea7..c999546 100644
--- a/apache-poi.spec
+++ b/apache-poi.spec
@@ -1,14 +1,16 @@
-%global reldate 20101029
+%global reldate 20110408
+%global rcver -beta2
 
 Name:           apache-poi
-Version:        3.7
-Release:        5%{?dist}
+Version:        3.8
+Release:        0.1.beta2%{?dist}
 Summary:        The Java API for Microsoft Documents
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://poi.apache.org/
-Source0:        http://www.apache.org/dist/poi/release/src/poi-src-%{version}-%{reldate}.tar.gz
+#Source0:        http://www.apache.org/dist/poi/release/src/poi-src-%{version}-%{reldate}.tar.gz
+Source0:        http://www.apache.org/dist/poi/dev/src/poi-src-%{version}%{?rcver}-%{reldate}.tar.gz
 Source1:        http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip
 Source2:        http://repo2.maven.org/maven2/org/apache/poi/poi/3.7/poi-3.7.pom.xml
 #Force compile of xsds if disconnected
@@ -24,7 +26,7 @@ BuildRequires:  dom4j
 BuildRequires:  apache-commons-logging
 BuildRequires:  junit
 #Fonts for testing
-BuildRequires:  liberation-sans-fonts liberation-serif-fonts
+BuildRequires:  fontconfig liberation-sans-fonts liberation-serif-fonts
 BuildRequires:  log4j
 BuildRequires:  xmlbeans
 
@@ -86,12 +88,12 @@ The manual for %{name}.
 
 
 %prep
-%setup -q -n poi-%{version}
+%setup -q -n poi-%{version}%{?rcver}
 %patch1 -p1 -b .compile-xsds
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 mkdir lib ooxml-lib
-build-jar-repository -s -p lib commons-logging junit log4j
+build-jar-repository -s -p lib ant commons-logging junit log4j
 build-jar-repository -s -p ooxml-lib dom4j xmlbeans/xbean
 #Unpack the XMLSchema
 pushd ooxml-lib
@@ -101,6 +103,7 @@ popd
 
 %build
 cat > build.properties <<'EOF'
+main.ant.jar=lib/ant.jar
 main.commons-logging.jar=lib/commons-logging.jar
 main.log4j.jar=lib/log4j.jar
 main.junit.jar=lib/junit.jar
@@ -118,14 +121,14 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/poi
 for jar in poi poi-examples poi-ooxml poi-ooxml-schemas poi-scratchpad
 do
-  cp -p build/dist/${jar}-%{version}-%{reldate}.jar   \
+  cp -p build/dist/${jar}-%{version}%{?rcver}-%{reldate}.jar   \
         $RPM_BUILD_ROOT%{_javadir}/poi/apache-${jar}.jar
   ln -s apache-${jar}.jar $RPM_BUILD_ROOT%{_javadir}/poi/${jar}.jar
 done
 #pom
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms
 cp -p %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-poi.pom
-%add_to_maven_depmap org.apache.poi poi %{version} JPP/poi poi
+%add_to_maven_depmap org.apache.poi poi %{version}%{?rcver}-%{reldate} JPP/poi poi
 
 #javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
@@ -134,7 +137,7 @@ cp -pr docs/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf docs/apidocs 
 
 #manual - Link to javadoc location
-ln -s ../../javadoc/%{name}-%{version} docs/apidocs
+ln -s ../../javadoc/%{name} docs/apidocs
 
 
 %check
@@ -170,6 +173,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 20 2011 Orion Poplawski <orion at cora.nwra.com> - 3.8-0.1.beta2
+- Update to 3.8-beta2
+- Add BR fontconfig needed for tests to find fonts
+- Fix javadoc link
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild