Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plantuml for openSUSE:Factory checked in at 2021-03-06 21:19:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plantuml (Old) and /work/SRC/openSUSE:Factory/.plantuml.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plantuml" Sat Mar 6 21:19:41 2021 rev:15 rq:877417 version:1.2021.1 Changes: -------- --- /work/SRC/openSUSE:Factory/plantuml/plantuml.changes 2020-10-22 14:26:54.750999682 +0200 +++ /work/SRC/openSUSE:Factory/.plantuml.new.2378/plantuml.changes 2021-03-06 21:19:43.625296452 +0100 @@ -1,0 +2,10 @@ +Fri Mar 05 10:19:19 UTC 2021 - Markus Ebner <i...@ebner-markus.de> + +- Cleanup +- Update to version 1.2021.1 + See http://plantuml.com/de/changes for all changes +- Build plantuml-javadoc package +- Add patch: + * remove-non-ascii-char.patch + +------------------------------------------------------------------- Old: ---- example01.uml example02.uml plantuml-1.2020.19.tar.gz plantuml.xml New: ---- plantuml-lgpl-1.2021.1.tar.gz remove-non-ascii-char.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plantuml.spec ++++++ --- /var/tmp/diff_new_pack.ZFGvZa/_old 2021-03-06 21:19:44.309297019 +0100 +++ /var/tmp/diff_new_pack.ZFGvZa/_new 2021-03-06 21:19:44.309297019 +0100 @@ -1,7 +1,7 @@ # # spec file for package plantuml # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,34 +17,31 @@ Name: plantuml -Version: 1.2020.19 +Version: 1.2021.1 Release: 0 Summary: Java UML Tool License: GPL-3.0-or-later Group: Productivity/Publishing/Other -URL: http://plantuml.sourceforge.net -Source0: https://github.com/plantuml/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +URL: http://plantuml.com/ +Source0: http://downloads.sourceforge.net/plantuml/%{name}-lgpl-%{version}.tar.gz Source1: %{name}.script -Source2: %{name}.xml -Source10: example01.uml -Source11: example02.uml -Source20: http://pdf.plantuml.net/PlantUML_Language_Reference_Guide_en.pdf +Source10: http://pdf.plantuml.net/PlantUML_Language_Reference_Guide_en.pdf +Patch0: remove-non-ascii-char.patch BuildRequires: ant -BuildRequires: docbook-xsl-stylesheets -BuildRequires: java-devel >= 1.5 -BuildRequires: jpackage-utils -BuildRequires: libxslt -BuildRequires: unzip -Requires: dejavu-fonts +BuildRequires: fdupes +BuildRequires: javapackages-local +BuildRequires: xmvn-install Requires: java >= 1.8.0 -Requires: jpackage-utils -Conflicts: java-1_5_0-gcj-compat +Requires: javapackages-tools BuildArch: noarch %description -PlantUML is a program allowing to draw UML diagrams, using a simple human readable text description. +PlantUML is a program allowing to draw UML diagrams, using a simple +and human readable text description. It is extremely useful for code +documenting, sketching project architecture during team conversations +and so on. -PlantUML supports the following diagram types: +PlantUML supports the following diagram types - sequence diagram - use case diagram - class diagram @@ -52,43 +49,52 @@ - component diagram - state diagram -Output images can be generated in PNG, in SVG or LaTeX format. PlantUML also supports generation of ASCII art diagrams (only for sequence diagrams). +%package javadoc +Summary: Javadoc for %{name} +Group: Productivity/Publishing/Other + +%description javadoc +This package contains the API documentation for %{name}. + %prep -%setup -q -# Replace placeholder strings: +%setup -q -c -n plantuml +%patch0 -p1 cp %{SOURCE1} %{name} -cp %{SOURCE2} . -cp %{SOURCE10} %{SOURCE11} . -cp %{SOURCE20} . +cp %{SOURCE10} . +# only contains a single line pointing to website +rm README %build -%{ant} \ - -Dant.build.javac.source=1.6 \ - -Dant.build.javac.target=1.6 - -# Building Manpages and HTML: -DB=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/ -xsltproc $DB/manpages/docbook.xsl %{name}.xml -xsltproc --output %{name}.html $DB/html/docbook.xsl %{name}.xml +ant + +# build javadoc +export CLASSPATH=$(build-classpath ant):plantuml.jar +%javadoc -source 1.8 -encoding UTF-8 -Xdoclint:none -d javadoc $(find src -name "*.java") -windowtitle "PlantUML %{version}" %install +# Set jar location +%mvn_file net.sourceforge.%{name}:%{name} %{name} +# Configure maven depmap +%mvn_artifact net.sourceforge.%{name}:%{name}:%{version} %{name}.jar +%mvn_install -J javadoc + install -m 755 -d %{buildroot}%{_bindir}/ install -m 755 -d %{buildroot}%{_javadir} -install -m 755 -d %{buildroot}%{_mandir}/man1 install -m 755 %{name} %{buildroot}%{_bindir}/%{name} -install -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/ # Install jar file cp %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -%files -%license license.txt -%doc example*.uml *.pdf *.html -%{_javadir}/%{name}.jar +%fdupes %{buildroot}%{_datadir} + +%files -f .mfiles +%{_bindir}/plantuml %{_javadir}/%{name}-%{version}.jar -%{_bindir}/%{name} -%{_mandir}/man1/%{name}.1%{?ext_man} +%license COPYING + +%files javadoc -f .mfiles-javadoc +%license COPYING %changelog ++++++ remove-non-ascii-char.patch ++++++ --- plantuml/src/gen/lib/dotgen/mincross__c.java.orig 2021-01-10 02:41:56.000000000 -0800 +++ plantuml/src/gen/lib/dotgen/mincross__c.java 2021-01-20 17:00:14.308050037 -0800 @@ -1541,7 +1541,7 @@ -@Reviewed(when = "16/11/2020??") +@Reviewed(when = "16/11/2020") @Original(version="2.38.0", path="lib/dotgen/mincross.c", name="reorder", key="inv6wazjcnh4xkzzphsdcmg4", definition="static void reorder(graph_t * g, int r, int reverse, int hasfixed)") public static void reorder(ST_Agraph_s g, int r, boolean reverse, boolean hasfixed) { ENTERING("inv6wazjcnh4xkzzphsdcmg4","reorder");
