Hello community, here is the log from the commit of package swtchart for openSUSE:Factory checked in at 2020-04-27 23:39:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swtchart (Old) and /work/SRC/openSUSE:Factory/.swtchart.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swtchart" Mon Apr 27 23:39:18 2020 rev:5 rq:798216 version:0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/swtchart/swtchart.changes 2020-03-26 23:32:30.286758371 +0100 +++ /work/SRC/openSUSE:Factory/.swtchart.new.2738/swtchart.changes 2020-04-27 23:39:25.211645287 +0200 @@ -1,0 +2,8 @@ +Sat Apr 11 21:03:23 UTC 2020 - Fridrich Strba <[email protected]> + +- Bring back the old ant way of building in order to avoid this + package depending unnecessarily on eclipse/tycho +- Keep still generation of bundle manifest and osgi(...) + requires and provides + +------------------------------------------------------------------- New: ---- build.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swtchart.spec ++++++ --- /var/tmp/diff_new_pack.ydvhYx/_old 2020-04-27 23:39:26.859648503 +0200 +++ /var/tmp/diff_new_pack.ydvhYx/_new 2020-04-27 23:39:26.859648503 +0200 @@ -24,12 +24,14 @@ Group: Development/Languages/Java URL: http://www.swtchart.org/ Source: %{name}-%{version}.tar.xz +Source1: build.xml +BuildRequires: ant BuildRequires: eclipse-swt BuildRequires: fdupes -BuildRequires: maven-local -BuildRequires: tycho -#!BuildIgnore: libjawt.so(SUNWprivate_1.1) -#!BuildIgnore: libjawt.so(SUNWprivate_1.1)(64bit) +BuildRequires: java-devel +BuildRequires: javapackages-local +BuildRequires: sed +BuildRequires: unzip BuildArch: noarch %description @@ -44,32 +46,25 @@ %prep %setup -q -# Create the poms -xmvn -o org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org.swtchart -%{mvn_package} "::pom::" __noinstall -%{mvn_package} :org.swtchart.example* __noinstall - -%{mvn_file} :{*} @1 %{name}/@1 %build -%{mvn_build} -f -- \ -%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -Dmaven.compiler.release=6 -%else - -Dsource=6 -%endif +sed "s#SWTJAR#$(build-classpath swt)#g" <%{SOURCE1} >build.xml +sed -i -e '/Classpath/d' org.swtchart/META-INF/MANIFEST.MF +%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 %install -%mvn_install -%fdupes -s %{buildroot}%{_javadocdir} +mkdir -p %{buildroot}%{_javadir} +install org.swtchart.jar %{buildroot}%{_javadir} + +%add_maven_depmap org.swtchart:org.swtchart:%{version} org.swtchart.jar -install -dm 0755 -p %{buildroot}%{_javadir} -install -pm 0644 org.swtchart/target/org.swtchart*.jar %{buildroot}%{_javadir}/org.swtchart.jar -%fdupes -s %{buildroot}%{_datadir} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -r api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles -%{_javadir} -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %changelog ++++++ build.xml ++++++ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <project basedir="." default="build" name="org.swtchart"> <target name="init"> <mkdir dir="org.swtchart/bin"/> <copy file="org.swtchart/META-INF/MANIFEST.MF" tofile="org.swtchart/META-INF/MANIFEST.MF.OUT"/> <replace file="org.swtchart/META-INF/MANIFEST.MF.OUT" token="qualifier" value="dist" /> <replace file="org.swtchart/META-INF/MANIFEST.MF.OUT" token=";singleton:=true" value="" /> </target> <target name="clean"> <delete dir="org.swtchart/bin"/> <delete file="org.swtchart/META-INF/MANIFEST.MF.OUT"/> <delete file="org.swtchart.jar"/> </target> <target depends="init,doc" name="build"> <javac debug="true" destdir="org.swtchart/bin"> <src path="org.swtchart/src"/> <classpath> <pathelement location="SWTJAR"/> <pathelement path="org.swtchart/bin"/> </classpath> </javac> <jar destfile="org.swtchart.jar" manifest="org.swtchart/META-INF/MANIFEST.MF.OUT"> <manifest> <attribute name="Class-Path" value="/usr/share/java/swt.jar"/> </manifest> <fileset dir="org.swtchart/bin"/> </jar> </target> <target name="doc"> <javadoc destdir="api"> <fileset dir="org.swtchart/src"/> <classpath> <pathelement location="SWTJAR"/> <pathelement path="org.swtchart/bin"/> </classpath> </javadoc> </target> </project>
