Hello community, here is the log from the commit of package ws-jaxme for openSUSE:Factory checked in at 2014-07-16 16:49:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ws-jaxme (Old) and /work/SRC/openSUSE:Factory/.ws-jaxme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ws-jaxme" Changes: -------- --- /work/SRC/openSUSE:Factory/ws-jaxme/ws-jaxme.changes 2013-09-12 17:04:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ws-jaxme.new/ws-jaxme.changes 2014-07-16 16:50:05.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:34:11 UTC 2014 - [email protected] + +- Do not depend on ant-trax. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ws-jaxme.spec ++++++ --- /var/tmp/diff_new_pack.LLsYUQ/_old 2014-07-16 16:50:07.000000000 +0200 +++ /var/tmp/diff_new_pack.LLsYUQ/_new 2014-07-16 16:50:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ws-jaxme # -# 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 jaxme - Name: ws-jaxme Version: 0.5.1 Release: 0 @@ -32,7 +30,6 @@ Patch2: ws-jaxme-java6.patch BuildRequires: ant >= 1.6 BuildRequires: ant-apache-resolver -BuildRequires: ant-trax BuildRequires: antlr BuildRequires: docbook-xsl-stylesheets BuildRequires: hsqldb @@ -62,8 +59,6 @@ * Vice versa, marshal the Java bean back into the original XML document. - - %package javadoc Summary: Open source implementation of JAXB Group: Development/Libraries/Java @@ -82,8 +77,6 @@ * Vice versa, marshal the Java bean back into the original XML document. - - %package manual Summary: Open source implementation of JAXB Group: Development/Libraries/Java @@ -102,8 +95,6 @@ * Vice versa, marshal the Java bean back into the original XML document. - - %prep %setup -q -n %{name} find . -name "*.jar" | xargs rm @@ -114,42 +105,39 @@ %build export OPT_JAR_LIST="ant/ant-trax jaxp_transform_impl ant/ant-apache-resolver" export CLASSPATH=$(build-classpath \ -antlr \ -hsqldb \ -log4j \ -xalan-j2 \ -xalan-j2-serializer \ -xmldb-api \ -xerces-j2 \ -xml-commons-apis \ -xml-commons-resolver \ -junit) + antlr \ + hsqldb \ + log4j \ + xalan-j2 \ + xalan-j2-serializer \ + xmldb-api \ + xerces-j2 \ + xml-commons-apis \ + xml-commons-resolver \ + junit) ant all Docs.all \ --Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ --Dbuild.sysclasspath=first \ --Ddocbook.home=/usr/share/xml/docbook \ --Ddocbookxsl.home=/usr/share/xml/docbook/stylesheet/nwalsh/current + -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ + -Dbuild.sysclasspath=first \ + -Ddocbook.home=%{_datadir}/xml/docbook \ + -Ddocbookxsl.home=%{_datadir}/xml/docbook/stylesheet/nwalsh/current %install -install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{base_name} +install -dm 755 %{buildroot}%{_javadir}/%{base_name} for jar in dist/*.jar; do jbs=`basename ${jar}` jnm=`echo ${jbs} | sed -e 's|\.jar||'` install -Dpm 644 ${jar} \ - $RPM_BUILD_ROOT%{_javadir}/%{base_name}/ws-${jnm}.jar + %{buildroot}%{_javadir}/%{base_name}/ws-${jnm}.jar done -(cd $RPM_BUILD_ROOT%{_javadir}/%{base_name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir}/%{base_name} && for jar in ws-*.jar; do ln -sf ${jar} `echo $jar| sed "s|ws-||g"`; done) +(cd %{buildroot}%{_javadir}/%{base_name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +(cd %{buildroot}%{_javadir}/%{base_name} && for jar in ws-*.jar; do ln -sf ${jar} `echo $jar| sed "s|ws-||g"`; done) #javadoc -install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/docs/src/documentation/content/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 build/docs/src/documentation/content/apidocs %{buildroot}%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink #manual -install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -pr build/docs/src/documentation/content/manual $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} - -%clean -rm -rf $RPM_BUILD_ROOT +install -dm 755 %{buildroot}%{_docdir}/%{name}-%{version} +cp -pr build/docs/src/documentation/content/manual %{buildroot}%{_docdir}/%{name}-%{version} %files %defattr(0644,root,root,0755) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
