Hello community, here is the log from the commit of package jakarta-poi for openSUSE:Factory checked in at 2014-07-10 14:55:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jakarta-poi (Old) and /work/SRC/openSUSE:Factory/.jakarta-poi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-poi" Changes: -------- --- /work/SRC/openSUSE:Factory/jakarta-poi/jakarta-poi.changes 2013-09-12 17:06:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jakarta-poi.new/jakarta-poi.changes 2014-07-10 14:55:31.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jul 7 12:08:15 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner +- Drop patch jakarta-poi-2.5.1_escher-test.patch which was never + applied + +------------------------------------------------------------------- +Mon Jul 7 12:04:55 UTC 2014 - [email protected] + +- Fix build with new xerces-j2-xml-apis + +------------------------------------------------------------------- Old: ---- jakarta-poi-2.5.1_escher-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-poi.spec ++++++ --- /var/tmp/diff_new_pack.5qrJjl/_old 2014-07-10 14:55:32.000000000 +0200 +++ /var/tmp/diff_new_pack.5qrJjl/_new 2014-07-10 14:55:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package jakarta-poi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,7 @@ # -%define section free %define base_name poi - Name: jakarta-poi Version: 2.5.1 Release: 0 @@ -31,10 +29,7 @@ #cvs -z3 -d :pserver:[email protected]:/home/cvspublic export -r HEAD jakarta-poi/src/scratchpad Source1: poi-scratchpad-unreleased-src-20050824.tar.bz2 Patch0: poi-build_xml.patch -Patch1: %{name}-%{version}_escher-test.patch Patch2: %{name}-%{version}-junittest.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch BuildRequires: ant >= 1.6 BuildRequires: ant-jdepend >= 1.6 BuildRequires: ant-junit >= 1.6 @@ -52,6 +47,7 @@ BuildRequires: log4j >= 1.2.8 BuildRequires: xalan-j2 >= 2.5.2 BuildRequires: xerces-j2 >= 2.6.0 +BuildRequires: xerces-j2-xml-apis Requires: jakarta-commons-beanutils >= 1.6.1 Requires: jakarta-commons-collections >= 2.1 Requires: jakarta-commons-lang >= 2.0 @@ -59,6 +55,8 @@ Requires: log4j >= 1.2.8 Requires: xalan-j2 >= 2.5.2 Requires: xerces-j2 >= 2.6.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The POI project consists of APIs for manipulating various file formats @@ -71,7 +69,6 @@ files include most Microsoft Office files such as XLS and DOC as well as MFC serialization API based file formats. - %package javadoc Summary: Java API To Access Microsoft Format Files Group: Development/Languages/Java @@ -102,9 +99,8 @@ files include most Microsoft Office files such as XLS and DOC as well as MFC serialization API based file formats. - %prep -%setup -c -q -n %{base_name} +%setup -q -c -n %{base_name} #find . -name "*.jar" -exec rm {} \; find . -name "*.jar" -exec mv {} {}.no \; bzip2 -dc %{SOURCE1} | tar xf - @@ -113,7 +109,6 @@ # FIXME rm src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics*.java %patch0 -b .sav -#%patch1 %patch2 -b .sav2 # wrong end of line necoding sed -i -e 's/.$//' \ @@ -136,34 +131,33 @@ commons-logging \ log4j \ xalan-j2 \ -xerces-j2) +xerces-j2 \ +xerces-j2-xml-apis \ +) export ANT_OPTS="-Xmx256m -Djava.awt.headless=true -Dbuild.sysclasspath=first -Ddisconnected=true" ant -Dant.build.javac.target=1.4 -Dant.build.javac.source=1.4 jar test %install -install -dm 755 $RPM_BUILD_ROOT%{_javadir} +install -dm 755 %{buildroot}%{_javadir} cp -p build/dist/%{base_name}-%{version}-final-*.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + %{buildroot}%{_javadir}/%{name}-%{version}.jar cp -p build/dist/%{base_name}-contrib-%{version}-final-*.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-contrib-%{version}.jar + %{buildroot}%{_javadir}/%{name}-contrib-%{version}.jar cp -p build/dist/%{base_name}-scratchpad-%{version}-final-*.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-scratchpad-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in %{name}*-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}%{_javadir}/%{name}-scratchpad-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in %{name}*-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) #javadoc -install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink rm -rf docs/apidocs #manual -install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -p LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -ln -s %{_javadocdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/apidocs # ghost symlink -%fdupes -s ${RPM_BUILD_ROOT} - -%clean -rm -rf $RPM_BUILD_ROOT +install -dm 755 %{buildroot}%{_docdir}/%{name}-%{version} +cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version} +cp -p LICENSE %{buildroot}%{_docdir}/%{name}-%{version} +ln -s %{_javadocdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-%{version}/apidocs # ghost symlink +%fdupes -s %{buildroot} %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
