Hello community, here is the log from the commit of package jaxodraw for openSUSE:Factory checked in at 2017-09-20 17:09:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jaxodraw (Old) and /work/SRC/openSUSE:Factory/.jaxodraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jaxodraw" Wed Sep 20 17:09:46 2017 rev:3 rq:527143 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jaxodraw/jaxodraw.changes 2016-08-03 11:43:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jaxodraw.new/jaxodraw.changes 2017-09-20 17:09:47.706014113 +0200 @@ -1,0 +2,6 @@ +Mon Sep 18 21:46:09 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target 1.6 +- Clean spec file and fix duplicate waste error + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jaxodraw.spec ++++++ --- /var/tmp/diff_new_pack.OYCn7a/_old 2017-09-20 17:09:48.445909958 +0200 +++ /var/tmp/diff_new_pack.OYCn7a/_new 2017-09-20 17:09:48.445909958 +0200 @@ -1,7 +1,7 @@ # # spec file for package jaxodraw # -# Copyright (c) 2016 SUSE LINUX 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,15 +16,15 @@ # -Name: jaxodraw %define major 2.1 %define minor 0 +Name: jaxodraw Version: %{major}.%{minor} Release: 0 Summary: A Java-based GUI for drawing Feynman diagrams -License: GPL-2.0+ and Apache-2.0 -Group: Productivity/Scientific/Physics # The xslt files in the manual are Apache-2.0 licensed, GPL-2.0+ for everything else +License: GPL-2.0+ AND Apache-2.0 +Group: Productivity/Scientific/Physics Url: http://jaxodraw.sourceforge.net Source0: http://download.sourceforge.net/%{name}/%{name}-%{major}-%{minor}-src.tar.gz Source1: http://sourceforge.net/projects/jaxodraw/files/installer_files/installer-2.0-1.tar.gz @@ -38,15 +38,15 @@ Patch0: jaxodraw-set-default-viewers.patch BuildRequires: ant BuildRequires: desktop-file-utils +BuildRequires: fdupes BuildRequires: java-devel >= 1.7.0 BuildRequires: javapackages-tools BuildRequires: tex(latex) Requires: java >= 1.7.0 Requires: javapackages-tools -Recommends: %{name}-latex Recommends: %{name}-javadoc = %{version} +Recommends: %{name}-latex BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description JaxoDraw is a Java program for drawing Feynman diagrams. It has a @@ -65,6 +65,7 @@ %package javadoc Summary: Javadocs for %{name} +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; License: GPL-2.0+ Group: Documentation Requires: %{name} = %{version} @@ -73,20 +74,19 @@ %description javadoc This package contains the API documentation for %{name}. - %package latex Summary: LaTeX style file axodraw4j.sty for documents generated with jaxodraw +# In order to compile documents one needs a LaTeX compiler License: LPPL-1.3c Group: Productivity/Scientific/Physics -# In order to compile documents one needs a LaTeX compiler Requires: %{name} = %{version} Requires: texlive-pst-tools Requires: tex(latex) -Requires(pre): texlive Requires(post): coreutils +Requires(posttrans): texlive Requires(postun): coreutils Requires(postun): texlive -Requires(posttrans): texlive +Requires(pre): texlive %description latex This package contains the LaTeX style file that is needed for EPS export @@ -104,8 +104,8 @@ test -d src/site && rm -r src/site %build -cp %{S:4} ./ -cp %{S:5} ./ +cp %{SOURCE4} ./ +cp %{SOURCE5} ./ sed -i "s/jaxodraw.release=SNAPSHOT/jaxodraw.release=0/" build.properties # FIX EOF ENCODINGS @@ -144,12 +144,13 @@ # Javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -rp build/javadoc/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} # LaTeX style install -D -p -m 644 axodraw4j.sty %{buildroot}%{_datadir}/texmf/tex/latex/axodraw4j/axodraw4j.sty # Register as an application to be visible in the software center -install -D -m 0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %post %desktop_database_post @@ -159,27 +160,26 @@ # POST SCRIPTS IMPORTED FROM texlive-specs-a SPECFILE %post latex -mkdir -p /var/run/texlive -> /var/run/texlive/run-mktexlsr -> /var/run/texlive/run-update +mkdir -p %{_localstatedir}/run/texlive +> %{_localstatedir}/run/texlive/run-mktexlsr +> %{_localstatedir}/run/texlive/run-update %postun latex if test $1 = 0; then %{_bindir}/mktexlsr 2> /dev/null || : exit 0 fi -mkdir -p /var/run/texlive -> /var/run/texlive/run-mktexlsr -> /var/run/texlive/run-update +mkdir -p %{_localstatedir}/run/texlive +> %{_localstatedir}/run/texlive/run-mktexlsr +> %{_localstatedir}/run/texlive/run-update %posttrans latex -test -f /var/run/texlive/run-update || exit 0 +test -f %{_localstatedir}/run/texlive/run-update || exit 0 test -z "$ZYPP_IS_RUNNING" || exit 0 VERBOSE=false %{_datadir}/texmf/texconfig/update || : -rm -f /var/run/texlive/run-update +rm -f %{_localstatedir}/run/texlive/run-update %files -%defattr(-,root,root) %doc src/doc/* axodraw4j-summary.txt %{_bindir}/%{name} %{_javadir}/%{name}.jar @@ -190,14 +190,12 @@ %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_mandir}/man1/%{name}.1.* +%{_mandir}/man1/%{name}.1%{ext_man} %files javadoc -%defattr(-,root,root) %{_javadocdir}/%{name}/ %files latex -%defattr(-,root,root) %{_datadir}/texmf/tex/latex/axodraw4j/ %changelog ++++++ build.xml ++++++ --- /var/tmp/diff_new_pack.OYCn7a/_old 2017-09-20 17:09:48.485904328 +0200 +++ /var/tmp/diff_new_pack.OYCn7a/_new 2017-09-20 17:09:48.489903765 +0200 @@ -165,8 +165,8 @@ nowarn="off" debug="true" deprecation="on" - source="1.5" - target="1.5" + source="1.6" + target="1.6" includeAntRuntime="no" sourcepath="${java.dir}" classpath="${java.class.path}" @@ -187,8 +187,8 @@ nowarn="off" debug="true" deprecation="on" - source="1.5" - target="1.5" + source="1.6" + target="1.6" includeAntRuntime="no" srcdir="${java.dir}" destdir="${build.dir}"> @@ -256,6 +256,7 @@ author="true" version="true" use="false" + source="1.6" windowtitle="JaxoDraw API"> <doctitle><![CDATA[<h1>JaxoDraw</h1>]]></doctitle> <bottom><![CDATA[${javadoc.bottom}]]></bottom>
