[apache-poi] Update to 3.10
Orion Poplawski
orion at fedoraproject.org
Mon Feb 24 21:06:36 UTC 2014
commit 85645018b075d2af6f0fbe9556e91826edae7a99
Author: Orion Poplawski <orion at nwra.com>
Date: Mon Feb 24 14:07:28 2014 -0700
Update to 3.10
.gitignore | 7 ++++
apache-poi-3.7-compile-xsds.patch | 18 -----------
apache-poi-CVE-2012-0213.patch | 62 -------------------------------------
apache-poi-compile-xsds.patch | 24 ++++++++++++++
apache-poi-jdk17.patch | 19 -----------
apache-poi.spec | 38 ++++++++++++-----------
sources | 14 ++++----
7 files changed, 58 insertions(+), 124 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ccefaa..c0701ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,10 @@
/poi-ooxml-3.9.pom
/poi-ooxml-schemas-3.9.pom
/poi-scratchpad-3.9.pom
+/poi-src-3.10-FINAL-20140208.tar.gz
+/poi-3.10-FINAL.pom
+/poi-examples-3.10-FINAL.pom
+/poi-excelant-3.10-FINAL.pom
+/poi-ooxml-3.10-FINAL.pom
+/poi-ooxml-schemas-3.10-FINAL.pom
+/poi-scratchpad-3.10-FINAL.pom
diff --git a/apache-poi-compile-xsds.patch b/apache-poi-compile-xsds.patch
new file mode 100644
index 0000000..5a82d10
--- /dev/null
+++ b/apache-poi-compile-xsds.patch
@@ -0,0 +1,24 @@
+diff -up poi-3.10-FINAL/build.xml.compile-xsds poi-3.10-FINAL/build.xml
+--- poi-3.10-FINAL/build.xml.compile-xsds 2014-02-24 11:35:56.338955560 -0700
++++ poi-3.10-FINAL/build.xml 2014-02-24 11:38:39.337139830 -0700
+@@ -454,16 +454,14 @@ under the License.
+ </target>
+ <target name="check-compiled-ooxml-xsds" depends="fetch-ooxml-xsds">
+ <condition property="ooxml-compiled-xsds.present">
+- <or>
++ <and>
+ <available file="${ooxml.xsds.jar}"/>
+- <isset property="disconnected"/>
+- </or>
++ </and>
+ </condition>
+ <condition property="ooxml-compiled-encryption-xsds.present">
+- <or>
++ <and>
+ <available file="${ooxml.encryption.jar}"/>
+- <isset property="disconnected"/>
+- </or>
++ </and>
+ </condition>
+ </target>
+ <target name="compile-ooxml-xsds" unless="ooxml-compiled-xsds.present"
diff --git a/apache-poi.spec b/apache-poi.spec
index e1a0265..1a34f67 100644
--- a/apache-poi.spec
+++ b/apache-poi.spec
@@ -1,27 +1,25 @@
-%global reldate 20121203
+%global reldate 20140208
%global rcver %{nil}
Name: apache-poi
-Version: 3.9
-Release: 2%{?dist}
+Version: 3.10
+Release: 1%{?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}-FINAL-%{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/%{version}/poi-%{version}.pom
-Source3: http://repo2.maven.org/maven2/org/apache/poi/poi-examples/%{version}/poi-examples-%{version}.pom
-Source4: http://repo2.maven.org/maven2/org/apache/poi/poi-excelant/%{version}/poi-excelant-%{version}.pom
-Source5: http://repo2.maven.org/maven2/org/apache/poi/poi-ooxml/%{version}/poi-ooxml-%{version}.pom
-Source6: http://repo2.maven.org/maven2/org/apache/poi/poi-ooxml-schemas/%{version}/poi-ooxml-schemas-%{version}.pom
-Source7: http://repo2.maven.org/maven2/org/apache/poi/poi-scratchpad/%{version}/poi-scratchpad-%{version}.pom
+Source2: http://repo2.maven.org/maven2/org/apache/poi/poi/%{version}-FINAL/poi-%{version}-FINAL.pom
+Source3: http://repo2.maven.org/maven2/org/apache/poi/poi-examples/%{version}-FINAL/poi-examples-%{version}-FINAL.pom
+Source4: http://repo2.maven.org/maven2/org/apache/poi/poi-excelant/%{version}-FINAL/poi-excelant-%{version}-FINAL.pom
+Source5: http://repo2.maven.org/maven2/org/apache/poi/poi-ooxml/%{version}-FINAL/poi-ooxml-%{version}-FINAL.pom
+Source6: http://repo2.maven.org/maven2/org/apache/poi/poi-ooxml-schemas/%{version}-FINAL/poi-ooxml-schemas-%{version}-FINAL.pom
+Source7: http://repo2.maven.org/maven2/org/apache/poi/poi-scratchpad/%{version}-FINAL/poi-scratchpad-%{version}-FINAL.pom
#Force compile of xsds if disconnected
-Patch1: %{name}-3.7-compile-xsds.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=799078
-Patch2: apache-poi-CVE-2012-0213.patch
+Patch1: %{name}-compile-xsds.patch
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -32,6 +30,7 @@ BuildRequires: apache-commons-logging
BuildRequires: junit
#Fonts for testing
BuildRequires: fontconfig liberation-sans-fonts liberation-serif-fonts
+BuildRequires: jacoco
BuildRequires: log4j
BuildRequires: xmlbeans
@@ -93,13 +92,13 @@ The manual for %{name}.
%prep
-%setup -q -n poi-%{version}%{?rcver}
+%setup -q -n poi-%{version}%{?rcver}-FINAL
%patch1 -p1 -b .compile-xsds
-%patch2 -p0 -b .CVE-2012-0213
+#patch2 -p0 -b .CVE-2012-0213
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
mkdir lib ooxml-lib
-build-jar-repository -s -p lib ant commons-codec commons-logging junit log4j
+build-jar-repository -s -p lib ant commons-codec commons-logging jacoco junit log4j
build-jar-repository -s -p ooxml-lib dom4j xmlbeans/xbean
#Unpack the XMLSchema
pushd ooxml-lib
@@ -129,11 +128,11 @@ mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
cd build/dist
for jar in *.jar
do
- jarname=${jar/-%{version}%{?rcver}-%{reldate}.jar/}
+ jarname=${jar/-%{version}*.jar/}
cp -p ${jar} $RPM_BUILD_ROOT%{_javadir}/poi/apache-${jarname}.jar
ln -s apache-${jarname}.jar $RPM_BUILD_ROOT%{_javadir}/poi/${jarname}.jar
#pom
- cp -p $RPM_SOURCE_DIR/${jarname}-%{version}%{?rcver}.pom \
+ cp -p $RPM_SOURCE_DIR/${jarname}-%{version}*.pom \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.poi-${jarname}.pom
%add_maven_depmap JPP.poi-${jarname}.pom poi/${jarname}.jar
done
@@ -167,6 +166,9 @@ ant -propertyfile build.properties test
%changelog
+* Mon Feb 24 2014 Orion Poplawski <orion at cora.nwra.com> - 3.10-1
+- Update to 3.10
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 3bb20f2..838e281 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,8 @@
abe6bb6e7799e854934b3c634e8bcf7b Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip
-fe12cf4620340f61dd42e43f6087a336 poi-src-3.9-20121203.tar.gz
-23d677b41d2e1027b2827fec89954eeb poi-3.9.pom
-59f92d91d8f3a84d70eb7fcdd73d6bc2 poi-examples-3.9.pom
-e904804a49afdba670985d28dfdb0494 poi-excelant-3.9.pom
-3491013eb09bab772ba6d2f20e470f3e poi-ooxml-3.9.pom
-560a934953d24401e0843dbbcf631fe8 poi-ooxml-schemas-3.9.pom
-6c088d296e02c2b04af544310cb0186f poi-scratchpad-3.9.pom
+438157bfee9fe74869abd898820c7dae poi-src-3.10-FINAL-20140208.tar.gz
+751aae30538cc07494d8d49fc6fa6a18 poi-3.10-FINAL.pom
+ba4e3d81ae3b330b4f969ef6bf66c8f6 poi-examples-3.10-FINAL.pom
+54eadeec46067e1600c045189e2a7ec9 poi-excelant-3.10-FINAL.pom
+a50132bb1a0c233e1eeb23d95a33f001 poi-ooxml-3.10-FINAL.pom
+c016a91a192cb7a1824c6cb121559db3 poi-ooxml-schemas-3.10-FINAL.pom
+c21d806555d22dc1f677ecbb9d77ac8f poi-scratchpad-3.10-FINAL.pom
More information about the scm-commits
mailing list