Hello community, here is the log from the commit of package xmlbeans for openSUSE:Factory checked in at 2013-12-13 13:11:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlbeans (Old) and /work/SRC/openSUSE:Factory/.xmlbeans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlbeans" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlbeans/xmlbeans-mini.changes 2013-09-12 19:50:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmlbeans.new/xmlbeans-mini.changes 2013-12-13 13:11:57.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Dec 6 09:15:04 UTC 2013 - [email protected] + +- fix boostrapping of xmlbeans + * xmlbeans-mini does install mandatory oldxmlbeans.jar + * xmlbeans require -mini variant + +------------------------------------------------------------------- xmlbeans.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlbeans-mini.spec ++++++ --- /var/tmp/diff_new_pack.XqDEsa/_old 2013-12-13 13:11:57.000000000 +0100 +++ /var/tmp/diff_new_pack.XqDEsa/_new 2013-12-13 13:11:57.000000000 +0100 @@ -18,7 +18,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the xmlbeans.spec! ##### %global bootstrap 1 -%define real xmlbeans +%global real xmlbeans Name: xmlbeans-mini Version: 2.4.0 @@ -61,7 +61,8 @@ BuildRequires: junit BuildRequires: saxon9 BuildRequires: xml-commons-resolver >= 1.1 -BuildRequires: xmlbeans +BuildRequires: xmlbeans-mini +#!BuildIgnore: xmlbeans %endif BuildRequires: unzip @@ -121,7 +122,7 @@ # 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 xmlbeans/oldxbean) external/lib/oldxbean.jar ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar ln -sf $(build-classpath saxon9) external/lib/saxon9.jar ln -sf $(build-classpath saxon9) external/lib/saxon9-dom.jar @@ -136,38 +137,40 @@ %install # jar -install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{real} -install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{real}/xmlpublic-%{version}.jar -ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{real}/xmlpublic.jar +install -d -m 0755 %{buildroot}%{_javadir}/%{real} +install -p -m 0644 build/lib/xmlpublic.jar %{buildroot}%{_javadir}/%{real}/xmlpublic.jar + %if ! %{bootstrap} -install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath-%{version}.jar -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 -p -m 0644 build/lib/xbean_xpath.jar %{buildroot}%{_javadir}/%{name}/xbean_xpath.jar +install -p -m 0644 build/lib/xbean.jar %{buildroot}%{_javadir}/%{name}/xbean.jar # bin -install -d -m 0755 $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/dumpxsb $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/inst2xsd $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/scomp $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/sdownload $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/sfactor $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/svalidate $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/validate $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/xpretty $RPM_BUILD_ROOT%{_bindir} -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} +install -d -m 0755 %{buildroot}%{_bindir} +install -p -m 0755 bin/dumpxsb %{buildroot}%{_bindir} +install -p -m 0755 bin/inst2xsd %{buildroot}%{_bindir} +install -p -m 0755 bin/scomp %{buildroot}%{_bindir} +install -p -m 0755 bin/sdownload %{buildroot}%{_bindir} +install -p -m 0755 bin/sfactor %{buildroot}%{_bindir} +install -p -m 0755 bin/svalidate %{buildroot}%{_bindir} +install -p -m 0755 bin/validate %{buildroot}%{_bindir} +install -p -m 0755 bin/xpretty %{buildroot}%{_bindir} +install -p -m 0755 bin/xsd2inst %{buildroot}%{_bindir} +install -p -m 0755 bin/xsdtree %{buildroot}%{_bindir} +install -p -m 0755 bin/xstc %{buildroot}%{_bindir} -%endif #if ! %{bootstrap} +%else +# install oldxbean.jar, which is needed to build xmlbeans itself +install -p -m 0644 external/lib/oldxbean.jar %{buildroot}%{_javadir}/%{real}/oldxbean.jar +%endif #if ! % { bootstrap} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt NOTICE.txt README.txt -%{_javadir}/* +%dir %{_javadir}/xmlbeans/ +%{_javadir}/xmlbeans/*.jar %if ! %{bootstrap} %files scripts ++++++ xmlbeans.spec ++++++ --- /var/tmp/diff_new_pack.XqDEsa/_old 2013-12-13 13:11:57.000000000 +0100 +++ /var/tmp/diff_new_pack.XqDEsa/_new 2013-12-13 13:11:57.000000000 +0100 @@ -17,7 +17,7 @@ %global bootstrap 0 -%define real xmlbeans +%global real xmlbeans Name: xmlbeans Version: 2.4.0 @@ -60,7 +60,8 @@ BuildRequires: junit BuildRequires: saxon9 BuildRequires: xml-commons-resolver >= 1.1 -BuildRequires: xmlbeans +BuildRequires: xmlbeans-mini +#!BuildIgnore: xmlbeans %endif BuildRequires: unzip @@ -120,7 +121,7 @@ # 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 xmlbeans/oldxbean) external/lib/oldxbean.jar ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar ln -sf $(build-classpath saxon9) external/lib/saxon9.jar ln -sf $(build-classpath saxon9) external/lib/saxon9-dom.jar @@ -135,38 +136,40 @@ %install # jar -install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{real} -install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{real}/xmlpublic-%{version}.jar -ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{real}/xmlpublic.jar +install -d -m 0755 %{buildroot}%{_javadir}/%{real} +install -p -m 0644 build/lib/xmlpublic.jar %{buildroot}%{_javadir}/%{real}/xmlpublic.jar + %if ! %{bootstrap} -install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath-%{version}.jar -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 -p -m 0644 build/lib/xbean_xpath.jar %{buildroot}%{_javadir}/%{name}/xbean_xpath.jar +install -p -m 0644 build/lib/xbean.jar %{buildroot}%{_javadir}/%{name}/xbean.jar # bin -install -d -m 0755 $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/dumpxsb $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/inst2xsd $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/scomp $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/sdownload $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/sfactor $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/svalidate $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/validate $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/xpretty $RPM_BUILD_ROOT%{_bindir} -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} +install -d -m 0755 %{buildroot}%{_bindir} +install -p -m 0755 bin/dumpxsb %{buildroot}%{_bindir} +install -p -m 0755 bin/inst2xsd %{buildroot}%{_bindir} +install -p -m 0755 bin/scomp %{buildroot}%{_bindir} +install -p -m 0755 bin/sdownload %{buildroot}%{_bindir} +install -p -m 0755 bin/sfactor %{buildroot}%{_bindir} +install -p -m 0755 bin/svalidate %{buildroot}%{_bindir} +install -p -m 0755 bin/validate %{buildroot}%{_bindir} +install -p -m 0755 bin/xpretty %{buildroot}%{_bindir} +install -p -m 0755 bin/xsd2inst %{buildroot}%{_bindir} +install -p -m 0755 bin/xsdtree %{buildroot}%{_bindir} +install -p -m 0755 bin/xstc %{buildroot}%{_bindir} -%endif #if ! %{bootstrap} +%else +# install oldxbean.jar, which is needed to build xmlbeans itself +install -p -m 0644 external/lib/oldxbean.jar %{buildroot}%{_javadir}/%{real}/oldxbean.jar +%endif #if ! % { bootstrap} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt NOTICE.txt README.txt -%{_javadir}/* +%dir %{_javadir}/xmlbeans/ +%{_javadir}/xmlbeans/*.jar %if ! %{bootstrap} %files scripts -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
