Hello community, here is the log from the commit of package isorelax for openSUSE:Factory checked in at 2017-06-10 18:33:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/isorelax (Old) and /work/SRC/openSUSE:Factory/.isorelax.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "isorelax" Sat Jun 10 18:33:38 2017 rev:16 rq:502562 version:0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/isorelax/isorelax.changes 2013-09-11 13:39:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.isorelax.new/isorelax.changes 2017-06-10 18:33:38.298454376 +0200 @@ -1,0 +2,5 @@ +Fri Jun 9 10:57:53 UTC 2017 - [email protected] + +- Drop javadoc to build with gcj and low in the buildphase + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ isorelax.spec ++++++ --- /var/tmp/diff_new_pack.HvoCw4/_old 2017-06-10 18:33:38.930365029 +0200 +++ /var/tmp/diff_new_pack.HvoCw4/_new 2017-06-10 18:33:38.934364463 +0200 @@ -1,7 +1,7 @@ # # spec file for package isorelax # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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,30 +16,22 @@ # -%define with_tests %{?_with_tests:1}%{!?_with_tests:0} -%define without_tests %{!?_with_tests:1}%{?_with_tests:0} -%define section free %define cvsversion 20041111 - Name: isorelax +Version: 0.1 +Release: 0 Summary: Public interfaces useful for applications to support RELAX Core License: Apache-2.0 and MIT Group: Development/Libraries/Java Url: http://iso-relax.sourceforge.net/ -Version: 0.1 -Release: 0 -BuildArch: noarch Source0: %{name}.%{cvsversion}.zip Source1: %{name}-build.xml Source2: isorelax-maven-project.xml Source3: isorelax-maven-project.xsd Patch0: isorelax-java5-compatibility.patch BuildRequires: ant -BuildRequires: javapackages-tools -%if %{with_tests} -BuildRequires: xercesjarv -%endif BuildRequires: java-devel +BuildRequires: javapackages-tools BuildRequires: unzip BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -47,29 +39,17 @@ Requires: xml-commons-apis Obsoletes: isorelax-bootstrap Provides: isorelax-bootstrap +Obsoletes: %{name}-javadoc BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The ISO RELAX project is started to host the public interfaces useful for applications to support RELAX Core. But nowadays some of the stuff we have is schema language neutral. - - -%package javadoc -Summary: Public interfaces useful for applications to support RELAX Core -License: MIT -Group: Productivity/Publishing/XML - -%description javadoc -The ISO RELAX project is started to host the public interfaces useful -for applications to support RELAX Core. But nowadays some of the stuff -we have is schema language neutral. - - - %prep -%setup -T -c -n %{name}-%{version} +%setup -q -T -c unzip -q %{SOURCE0} mkdir src (cd src; unzip -q ../src.zip) @@ -88,39 +68,18 @@ xerces-j2 \ xml-commons-apis \ ) -%if %{with_tests} -CLASSPATH=$CLASSPATH:$(build-classpath xercesjarv) -ln -s $(find-jar xercesjarv) xercesjarv.jar -%endif ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ -Dbuild.sysclasspath=only release -%if %{with_tests} -CLASSPATH=isorelax.jar:$CLASSPATH -ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ - -Dbuild.sysclasspath=first ant-task-test -%endif %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) %files %defattr(-,root,root) %doc COPYING.txt %{_javadir}/* -%files javadoc -%defattr(-,root,root) -%{_javadocdir}/%{name}-%{version} -%doc %{_javadocdir}/%{name} - %changelog ++++++ isorelax-build.xml ++++++ --- /var/tmp/diff_new_pack.HvoCw4/_old 2017-06-10 18:33:38.966359940 +0200 +++ /var/tmp/diff_new_pack.HvoCw4/_new 2017-06-10 18:33:38.970359374 +0200 @@ -12,7 +12,7 @@ <include name="**/*.java" /> </javac> - <mkdir dir="apidocs"/> + <!-- <mkdir dir="apidocs"/> <javadoc packagenames="org.*" sourcepath="src" destdir="apidocs" @@ -29,7 +29,7 @@ nohelp="true" nonavbar="false" serialwarn="false"> - </javadoc> + </javadoc>--> <!-- create a time stamp file --> <echo file="temp/version.properties">version=${DSTAMP}</echo>
