Hello community, here is the log from the commit of package xmlbeans for openSUSE:Factory checked in at 2012-10-26 17:36:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlbeans (Old) and /work/SRC/openSUSE:Factory/.xmlbeans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlbeans", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlbeans/xmlbeans-mini.changes 2011-09-23 12:51:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmlbeans.new/xmlbeans-mini.changes 2012-10-26 17:36:53.000000000 +0200 @@ -1,0 +2,10 @@ +Fri May 18 07:27:35 UTC 2012 - [email protected] + +- update to 2.4.0 - need by new apache-poi + * Finer grained support for CDATA + * Upgraded support for Saxon 9 + * Added more fine-grained control over XML to Java name mapping + * Add support for JVM-supported encodings + * Bug fixes + +------------------------------------------------------------------- xmlbeans.changes: same change Old: ---- jpackage-mini-prepare.sh xmlbeans-2.1.0-SchemaTypesTests.patch xmlbeans-2.1.0-XBeansXPath.patch xmlbeans-2.1.0-XBeansXQuery.patch xmlbeans-2.1.0-alltests.patch xmlbeans-2.1.0-build_xml.patch xmlbeans-2.1.0-maven-plugin-project_xml.patch xmlbeans-2.1.0-remove-svn.patch xmlbeans-2.1.0-scripts.patch xmlbeans-2.1.0-src-free.tar.bz2 New: ---- pre_checkin.sh xmlbeans-2.4.0-nodownload.patch xmlbeans-2.4.0-src.tgz xmlbeans-saxon-virtualnode.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlbeans-mini.spec ++++++ --- /var/tmp/diff_new_pack.UEblti/_old 2012-10-26 17:36:57.000000000 +0200 +++ /var/tmp/diff_new_pack.UEblti/_new 2012-10-26 17:36:57.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xmlbeans-mini (Version 2.1.0) +# spec file for package xmlbeans-mini # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,66 +15,52 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define bootstrap 1 -%define with_maven 0 -%define section free -%define source_top %{name}-%{cvs_version} +##### WARNING: please do not edit this auto generated spec file. Use the xmlbeans.spec! ##### +%global bootstrap 1 %define real xmlbeans Name: xmlbeans-mini -# This line is not a comment, please do not remove it! -#%(sh %{_sourcedir}/jpackage-mini-prepare.sh %{_sourcedir} %{name}) -Version: 2.1.0 -Release: 7 +Version: 2.4.0 +Release: 0 Summary: XML-Java binding tool -Url: http://xmlbeans.apache.org -# Removal of .xsd files with problematic license -# find xmlbeans-2.1.0/test/cases/xbean/compile/scomp -iname '*.xsd' | xargs rm -rf -Source0: %{real}-%{version}-src-free.tar.bz2 -Source1000: jpackage-mini-prepare.sh -# svn export http://svn.apache.org/repos/asf/xmlbeans/tags/2.1.0 -Patch0: xmlbeans-2.1.0-maven-plugin-project_xml.patch -Patch1: xmlbeans-2.1.0-SchemaTypesTests.patch -Patch2: xmlbeans-2.1.0-build_xml.patch -Patch3: xmlbeans-2.1.0-XBeansXPath.patch -Patch4: xmlbeans-2.1.0-XBeansXQuery.patch -Patch5: xmlbeans-2.1.0-alltests.patch -Patch6: xmlbeans-2.1.0-scripts.patch -Patch7: xmlbeans-2.1.0-remove-svn.patch License: Apache-2.0 Group: Development/Libraries/Java -BuildRequires: jpackage-utils >= 1.5 +Url: http://xmlbeans.apache.org +#Source0: http://www.apache.org/dist/xmlbeans/source/%{real}-%{version}-src.tgz +Source0: %{real}-%{version}-src.tgz +Source1000: pre_checkin.sh +Patch0: xmlbeans-2.4.0-nodownload.patch +#PATCH-FIX-UPSTREAM: saxon 9.3+ moved VirtualNode interface +Patch1: xmlbeans-saxon-virtualnode.patch +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ant >= 1.6 -%if ! %{bootstrap} -BuildRequires: ant-junit -BuildRequires: ant-contrib -BuildRequires: junit -BuildRequires: ant-nodeps -BuildRequires: xml-commons-resolver >= 1.1 BuildRequires: bea-stax-api -BuildRequires: saxon8 saxon8-xpath -BuildRequires: dom2-core-tests -BuildRequires: java-devel -%if %{with_maven} -BuildRequires: maven >= 1.1 -%endif -BuildRequires: ant-trax -%else +BuildRequires: jpackage-utils >= 1.5 + +%if %{bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap BuildRequires: xml-commons-resolver-bootstrap #!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver +%else +BuildRequires: ant-contrib +BuildRequires: ant-junit +BuildRequires: ant-nodeps +BuildRequires: ant-trax +BuildRequires: java-devel +BuildRequires: junit +BuildRequires: saxon >= 9 +BuildRequires: xml-commons-resolver >= 1.1 +BuildRequires: xmlbeans %endif + BuildRequires: unzip #!BuildIgnore: antlr antlr-java #!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12 -Requires: jpackage-utils >= 1.6 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: %{real} = %{version}-%{release} %description XMLBeans is a tool that allows you to access the full power of XML in a @@ -94,7 +80,6 @@ %package javadoc -License: Apache-2.0 Summary: XML-Java binding tool Group: Development/Libraries/Java @@ -113,12 +98,7 @@ (XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect into the XML schema itself through an XML Schema Object model. - - -%{summary}. - %package manual -License: Apache-2.0 Summary: XML-Java binding tool Group: Development/Libraries/Java @@ -137,28 +117,7 @@ (XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect into the XML schema itself through an XML Schema Object model. - - -%{summary}. -%if %{with_maven} - -%package maven-plugin - - -Summary: Maven plugin for %{name} -Group: Development/Libraries/Java -Requires: %{name} >= 2.0 -Requires: maven >= 1.1 -Requires: bea-stax-api -Requires: xml-commons-resolver - -%description maven-plugin - -%{summary}. -%endif - %package scripts -License: Apache-2.0 Summary: XML-Java binding tool Group: Development/Libraries/Java Requires: %{name} = %{version} @@ -178,78 +137,35 @@ (XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect into the XML schema itself through an XML Schema Object model. - - -%{summary}. - %prep %setup -q -n %{real}-%{version} -chmod -R go=u-w * -chmod a-x LICENSE.txt -for j in $(find . -name "*.jar"); do - jj=$(basename $j) - m=$(expr $jj : '\(piccolo_apache_dist\).*') || : - n=$(expr $jj : '\(jam-\).*') || : - if [ "$m" != "piccolo_apache_dist" -a "$n" != "jam-" ]; then - mv $j $j.no - fi -done -mkdir -p build/lib -pushd build/lib -ln -sf $(build-classpath xml-commons-resolver) resolver.jar -ln -sf $(build-classpath bea-stax-api) jsr173_1.0_api.jar -popd -pushd external/lib -mv oldxbean.jar.no oldxbean.jar -popd -pushd test/lib -ln -sf $(build-classpath dom2-core-tests) w3c_domts.jar -popd -pushd test/tools/lib -ln -sf $(build-classpath ant) . -%if ! %{bootstrap} -ln -sf $(build-classpath junit) . -ln -sf $(build-classpath ant/ant-junit) . -%endif -pushd ant-ext -%if ! %{bootstrap} -ln -sf $(build-classpath ant-contrib) ant-contrib-0.6.jar -%endif -mkdir tmp -cd tmp -jar xf ../antexts.jar.no -rm -rf antexts* META-INF -cd src -JAVAC_ARGS="" -if [[ $(readlink -f /etc/alternatives/java_sdk | grep gcj) ]]; then -JAVAC_ARGS=" -C " -fi -javac ${JAVAC_ARGS} -classpath $(build-classpath ant) $(find . -name "*.java") -jar cf ../../antexts.jar $(find . -name "*.class") antexts.properties -popd -popd -%patch0 -b .orig -%patch1 -b .orig -%patch2 -b .orig -%patch3 -b .orig -%patch4 -b .orig -%patch5 -b .orig -%patch6 -b .orig -%patch7 -b .sav7 +%patch0 -p1 -b .nodownload +%patch1 -p1 %build -export XMLBEANS_EXTERNALS=/usr/share/java -export XMLBEANS_HOME=`pwd` +# Piccolo and jam are rebuilt from source and bundled with xbean +# ant clean.jars leaves some dangling jars around, do not use it +find . \( -name '*.jar' -o -name '*.zip' \) \ + -not -name 'piccolo*.jar' -not -name 'jam*.jar' \ +%if %{bootstrap} + -not -name 'oldxbean.jar' \ +%endif + -print -delete + +# Replace bundled libraries +mkdir -p build/lib +ln -sf $(build-classpath xml-commons-resolver) build/lib/resolver.jar +ln -sf $(build-classpath xmlbeans/xbean) external/lib/oldxbean.jar +ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar +ln -sf $(build-classpath saxon) external/lib/saxon9.jar +ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar + +# Fix CRLF +sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css %if %{bootstrap} ant xmlpublic.jar %else ant default docs -%if %{with_maven} -pushd maven-plugin - maven -Dmaven.repo.remote=file:/usr/share/maven/repository jar:jar -popd -%endif -ant checkintest %endif %install @@ -262,8 +178,7 @@ install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean-%{version}.jar ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -cp -pr xkit $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} + # bin install -d -m 0755 $RPM_BUILD_ROOT%{_bindir} install -p -m 0755 bin/dumpxsb $RPM_BUILD_ROOT%{_bindir} @@ -277,22 +192,15 @@ install -p -m 0755 bin/xsd2inst $RPM_BUILD_ROOT%{_bindir} install -p -m 0755 bin/xsdtree $RPM_BUILD_ROOT%{_bindir} install -p -m 0755 bin/xstc $RPM_BUILD_ROOT%{_bindir} + # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} rm -rf build/docs/reference + # manual install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -%if %{with_maven} -# maven-plugin -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven/repository/JPP/plugins -cp -p maven-plugin/target/xmlbeans-maven-plugin-2.0.0-beta1.jar \ - $RPM_BUILD_ROOT%{_datadir}/maven/repository/JPP/plugins/maven-%{name}-plugin-%{version}.jar -ln -s maven-%{name}-plugin-%{version}.jar $RPM_BUILD_ROOT%{_datadir}/maven/repository/JPP/plugins/maven-%{name}-plugin.jar -%endif %endif #if ! %{bootstrap} %clean @@ -300,30 +208,21 @@ %files %defattr(-,root,root,-) -%doc LICENSE.txt +%doc LICENSE.txt NOTICE.txt README.txt %{_javadir}/* -%if ! %{bootstrap} -%{_datadir}/%{name}-%{version} +%if ! %{bootstrap} %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} %files manual %defattr(0644,root,root,0755) %{_docdir}/%{name}-%{version} -%if %{with_maven} - -%files maven-plugin -%defattr(0644,root,root,0755) -%{_datadir}/maven/repository/JPP/plugins/maven-%{name}-plugin-%{version}.jar -%{_datadir}/maven/repository/JPP/plugins/maven-%{name}-plugin.jar -%endif %files scripts %defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/* -%endif #if ! %{bootstrap} +%endif #!bootstrap %changelog ++++++ xmlbeans.spec ++++++ --- /var/tmp/diff_new_pack.UEblti/_old 2012-10-26 17:36:57.000000000 +0200 +++ /var/tmp/diff_new_pack.UEblti/_new 2012-10-26 17:36:57.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xmlbeans (Version 2.1.0) +# spec file for package xmlbeans # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,65 +15,51 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define bootstrap 0 -%define with_maven 0 -%define section free -%define source_top %{name}-%{cvs_version} +%global bootstrap 0 %define real xmlbeans Name: xmlbeans -# This line is not a comment, please do not remove it! -#%(sh %{_sourcedir}/jpackage-mini-prepare.sh %{_sourcedir} %{name}) -Version: 2.1.0 -Release: 7 +Version: 2.4.0 +Release: 0 Summary: XML-Java binding tool -Url: http://xmlbeans.apache.org -# Removal of .xsd files with problematic license -# find xmlbeans-2.1.0/test/cases/xbean/compile/scomp -iname '*.xsd' | xargs rm -rf -Source0: %{real}-%{version}-src-free.tar.bz2 -Source1000: jpackage-mini-prepare.sh -# svn export http://svn.apache.org/repos/asf/xmlbeans/tags/2.1.0 -Patch0: xmlbeans-2.1.0-maven-plugin-project_xml.patch -Patch1: xmlbeans-2.1.0-SchemaTypesTests.patch -Patch2: xmlbeans-2.1.0-build_xml.patch -Patch3: xmlbeans-2.1.0-XBeansXPath.patch -Patch4: xmlbeans-2.1.0-XBeansXQuery.patch -Patch5: xmlbeans-2.1.0-alltests.patch -Patch6: xmlbeans-2.1.0-scripts.patch -Patch7: xmlbeans-2.1.0-remove-svn.patch License: Apache-2.0 Group: Development/Libraries/Java -BuildRequires: jpackage-utils >= 1.5 +Url: http://xmlbeans.apache.org +#Source0: http://www.apache.org/dist/xmlbeans/source/%{real}-%{version}-src.tgz +Source0: %{real}-%{version}-src.tgz +Source1000: pre_checkin.sh +Patch0: xmlbeans-2.4.0-nodownload.patch +#PATCH-FIX-UPSTREAM: saxon 9.3+ moved VirtualNode interface +Patch1: xmlbeans-saxon-virtualnode.patch +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ant >= 1.6 -%if ! %{bootstrap} -BuildRequires: ant-junit -BuildRequires: ant-contrib -BuildRequires: junit -BuildRequires: ant-nodeps -BuildRequires: xml-commons-resolver >= 1.1 BuildRequires: bea-stax-api -BuildRequires: saxon8 saxon8-xpath -BuildRequires: dom2-core-tests -BuildRequires: java-devel -%if %{with_maven} -BuildRequires: maven >= 1.1 -%endif -BuildRequires: ant-trax -%else +BuildRequires: jpackage-utils >= 1.5 + +%if %{bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap BuildRequires: xml-commons-resolver-bootstrap #!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver +%else +BuildRequires: ant-contrib +BuildRequires: ant-junit +BuildRequires: ant-nodeps +BuildRequires: ant-trax +BuildRequires: java-devel +BuildRequires: junit +BuildRequires: saxon >= 9 +BuildRequires: xml-commons-resolver >= 1.1 +BuildRequires: xmlbeans %endif + BuildRequires: unzip #!BuildIgnore: antlr antlr-java #!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12 -Requires: jpackage-utils >= 1.6 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description XMLBeans is a tool that allows you to access the full power of XML in a @@ -93,7 +79,6 @@ %package javadoc -License: Apache-2.0 Summary: XML-Java binding tool Group: Development/Libraries/Java @@ -112,12 +97,7 @@ (XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect into the XML schema itself through an XML Schema Object model. - - -%{summary}. - %package manual -License: Apache-2.0 Summary: XML-Java binding tool Group: Development/Libraries/Java @@ -136,28 +116,7 @@ (XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect into the XML schema itself through an XML Schema Object model. - - -%{summary}. -%if %{with_maven} - -%package maven-plugin - - -Summary: Maven plugin for %{name} -Group: Development/Libraries/Java -Requires: %{name} >= 2.0 -Requires: maven >= 1.1 -Requires: bea-stax-api -Requires: xml-commons-resolver - -%description maven-plugin - -%{summary}. -%endif - %package scripts -License: Apache-2.0 Summary: XML-Java binding tool Group: Development/Libraries/Java Requires: %{name} = %{version} @@ -177,78 +136,35 @@ (XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect into the XML schema itself through an XML Schema Object model. - - -%{summary}. - %prep %setup -q -n %{real}-%{version} -chmod -R go=u-w * -chmod a-x LICENSE.txt -for j in $(find . -name "*.jar"); do - jj=$(basename $j) - m=$(expr $jj : '\(piccolo_apache_dist\).*') || : - n=$(expr $jj : '\(jam-\).*') || : - if [ "$m" != "piccolo_apache_dist" -a "$n" != "jam-" ]; then - mv $j $j.no - fi -done -mkdir -p build/lib -pushd build/lib -ln -sf $(build-classpath xml-commons-resolver) resolver.jar -ln -sf $(build-classpath bea-stax-api) jsr173_1.0_api.jar -popd -pushd external/lib -mv oldxbean.jar.no oldxbean.jar -popd -pushd test/lib -ln -sf $(build-classpath dom2-core-tests) w3c_domts.jar -popd -pushd test/tools/lib -ln -sf $(build-classpath ant) . -%if ! %{bootstrap} -ln -sf $(build-classpath junit) . -ln -sf $(build-classpath ant/ant-junit) . -%endif -pushd ant-ext -%if ! %{bootstrap} -ln -sf $(build-classpath ant-contrib) ant-contrib-0.6.jar -%endif -mkdir tmp -cd tmp -jar xf ../antexts.jar.no -rm -rf antexts* META-INF -cd src -JAVAC_ARGS="" -if [[ $(readlink -f /etc/alternatives/java_sdk | grep gcj) ]]; then -JAVAC_ARGS=" -C " -fi -javac ${JAVAC_ARGS} -classpath $(build-classpath ant) $(find . -name "*.java") -jar cf ../../antexts.jar $(find . -name "*.class") antexts.properties -popd -popd -%patch0 -b .orig -%patch1 -b .orig -%patch2 -b .orig -%patch3 -b .orig -%patch4 -b .orig -%patch5 -b .orig -%patch6 -b .orig -%patch7 -b .sav7 +%patch0 -p1 -b .nodownload +%patch1 -p1 %build -export XMLBEANS_EXTERNALS=/usr/share/java -export XMLBEANS_HOME=`pwd` +# Piccolo and jam are rebuilt from source and bundled with xbean +# ant clean.jars leaves some dangling jars around, do not use it +find . \( -name '*.jar' -o -name '*.zip' \) \ + -not -name 'piccolo*.jar' -not -name 'jam*.jar' \ +%if %{bootstrap} + -not -name 'oldxbean.jar' \ +%endif + -print -delete + +# Replace bundled libraries +mkdir -p build/lib +ln -sf $(build-classpath xml-commons-resolver) build/lib/resolver.jar +ln -sf $(build-classpath xmlbeans/xbean) external/lib/oldxbean.jar +ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar +ln -sf $(build-classpath saxon) external/lib/saxon9.jar +ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar + +# Fix CRLF +sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css %if %{bootstrap} ant xmlpublic.jar %else ant default docs -%if %{with_maven} -pushd maven-plugin - maven -Dmaven.repo.remote=file:/usr/share/maven/repository jar:jar -popd -%endif -ant checkintest %endif %install @@ -261,8 +177,7 @@ install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean-%{version}.jar ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -cp -pr xkit $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} + # bin install -d -m 0755 $RPM_BUILD_ROOT%{_bindir} install -p -m 0755 bin/dumpxsb $RPM_BUILD_ROOT%{_bindir} @@ -276,22 +191,15 @@ install -p -m 0755 bin/xsd2inst $RPM_BUILD_ROOT%{_bindir} install -p -m 0755 bin/xsdtree $RPM_BUILD_ROOT%{_bindir} install -p -m 0755 bin/xstc $RPM_BUILD_ROOT%{_bindir} + # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} rm -rf build/docs/reference + # manual install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -%if %{with_maven} -# maven-plugin -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven/repository/JPP/plugins -cp -p maven-plugin/target/xmlbeans-maven-plugin-2.0.0-beta1.jar \ - $RPM_BUILD_ROOT%{_datadir}/maven/repository/JPP/plugins/maven-%{name}-plugin-%{version}.jar -ln -s maven-%{name}-plugin-%{version}.jar $RPM_BUILD_ROOT%{_datadir}/maven/repository/JPP/plugins/maven-%{name}-plugin.jar -%endif %endif #if ! %{bootstrap} %clean @@ -299,30 +207,21 @@ %files %defattr(-,root,root,-) -%doc LICENSE.txt +%doc LICENSE.txt NOTICE.txt README.txt %{_javadir}/* -%if ! %{bootstrap} -%{_datadir}/%{name}-%{version} +%if ! %{bootstrap} %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} %files manual %defattr(0644,root,root,0755) %{_docdir}/%{name}-%{version} -%if %{with_maven} - -%files maven-plugin -%defattr(0644,root,root,0755) -%{_datadir}/maven/repository/JPP/plugins/maven-%{name}-plugin-%{version}.jar -%{_datadir}/maven/repository/JPP/plugins/maven-%{name}-plugin.jar -%endif %files scripts %defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/* -%endif #if ! %{bootstrap} +%endif #!bootstrap %changelog ++++++ pre_checkin.sh ++++++ #!/bin/sh EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the xmlbeans.spec! #####\n" sed "s/^%global bootstrap.*$/${EDIT_WARNING}%global bootstrap 1/; s/^\(Name:.*\)$/\1-mini/; " < xmlbeans.spec > xmlbeans-mini.spec ++++++ xmlbeans-2.4.0-nodownload.patch ++++++ Do not foolishly attempt to download jars from the internets. diff -up xmlbeans-2.4.0/build.xml.nodownload xmlbeans-2.4.0/build.xml --- xmlbeans-2.4.0/build.xml.nodownload 2008-06-10 15:42:37.000000000 +0200 +++ xmlbeans-2.4.0/build.xml 2009-11-03 15:53:11.000000000 +0100 @@ -112,7 +112,7 @@ http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-7-3j.zip http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip --> - <get dest="external/lib/saxonb9-0-0-4j.zip" + <!-- get dest="external/lib/saxonb9-0-0-4j.zip" src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-4j.zip"; verbose="true" usetimestamp="true" ignoreerrors="true"/> <unzip src="external/lib/saxonb9-0-0-4j.zip" dest="external/lib/"> @@ -120,7 +120,7 @@ <include name="saxon9.jar"/> <include name="saxon9-dom.jar"/> </patternset> - </unzip> + </unzip--> <copy file="external/lib/saxon9.jar" tofile="build/lib/saxon9.jar"/> <!-- saxon9-dom.jar is used to register DOMObjectModel --> @@ -147,14 +147,14 @@ </condition> </target> - <target name="jsr173_1.0.jars" + <target name="jsr173_1.0.jars"><!-- depends="jsr173-bundle.jar, jsr173_1.0.jars.extracted" unless="jsr173_1.0.jars.exist"> <unjar src="external/lib/jsr173_1.0_api_bundle.jar" dest="external/lib" > <patternset> <include name="jsr173_1.0_api.jar"/> </patternset> - </unjar> + </unjar!--> <!-- copy jsr173 API jar and license files to build/lib --> <copy file="external/lib/jsr173_1.0_api.jar" tofile="build/lib/jsr173_1.0_api.jar"/> ++++++ xmlbeans-saxon-virtualnode.patch ++++++ Index: xmlbeans-2.4.0/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java =================================================================== --- xmlbeans-2.4.0.orig/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java 2008-06-10 15:42:28.000000000 +0200 +++ xmlbeans-2.4.0/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java 2012-05-17 10:54:39.193156561 +0200 @@ -27,7 +27,7 @@ import net.sf.saxon.Configuration; import net.sf.saxon.dom.NodeWrapper; import net.sf.saxon.om.NodeInfo; -import net.sf.saxon.om.VirtualNode; +import net.sf.saxon.tree.wrapper.VirtualNode; import net.sf.saxon.om.Item; import net.sf.saxon.value.Value; import net.sf.saxon.sxpath.XPathEvaluator; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
