Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plexus-sec-dispatcher for
openSUSE:Factory checked in at 2022-05-13 23:03:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-sec-dispatcher (Old)
and /work/SRC/openSUSE:Factory/.plexus-sec-dispatcher.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-sec-dispatcher"
Fri May 13 23:03:22 2022 rev:4 rq:977027 version:2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/plexus-sec-dispatcher/plexus-sec-dispatcher.changes
2022-01-13 23:22:14.056078605 +0100
+++
/work/SRC/openSUSE:Factory/.plexus-sec-dispatcher.new.1538/plexus-sec-dispatcher.changes
2022-05-13 23:03:31.311142437 +0200
@@ -1,0 +2,5 @@
+Fri May 13 09:06:37 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Fix build with modello-2.0.0
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-sec-dispatcher.spec ++++++
--- /var/tmp/diff_new_pack.KbtOw4/_old 2022-05-13 23:03:32.859143862 +0200
+++ /var/tmp/diff_new_pack.KbtOw4/_new 2022-05-13 23:03:32.867143869 +0200
@@ -32,7 +32,7 @@
BuildRequires: fdupes
BuildRequires: java-devel >= 1.7
BuildRequires: javapackages-local
-BuildRequires: modello
+BuildRequires: modello >= 2.0.0
BuildRequires: plexus-cipher
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-metadata-generator
++++++ plexus-sec-dispatcher-build.xml ++++++
--- /var/tmp/diff_new_pack.KbtOw4/_old 2022-05-13 23:03:32.915143913 +0200
+++ /var/tmp/diff_new_pack.KbtOw4/_new 2022-05-13 23:03:32.919143916 +0200
@@ -65,30 +65,32 @@
<target name="gen-src" description="Generate sources from mdo files">
<mkdir dir="${build.mdoOutputDir}"/>
- <exec executable="modello" failonerror="true">
- <arg value="${build.mdoDir}/settings-security.mdo"/>
- <arg value="java"/>
- <arg value="${build.mdoOutputDir}"/>
- <arg value="1.0.0"/>
- <arg value="false"/>
- <arg value="true"/>
- </exec>
- <exec executable="modello" failonerror="true">
- <arg value="${build.mdoDir}/settings-security.mdo"/>
- <arg value="xpp3-reader"/>
- <arg value="${build.mdoOutputDir}"/>
- <arg value="1.0.0"/>
- <arg value="false"/>
- <arg value="true"/>
- </exec>
- <exec executable="modello" failonerror="true">
- <arg value="${build.mdoDir}/settings-security.mdo"/>
- <arg value="xpp3-writer"/>
- <arg value="${build.mdoOutputDir}"/>
- <arg value="1.0.0"/>
- <arg value="false"/>
- <arg value="true"/>
- </exec>
+ <macrodef name="modello-single-mode">
+ <attribute name="file"/>
+ <attribute name="mode"/>
+ <attribute name="version"/>
+ <sequential>
+ <exec executable="modello" failonerror="true">
+ <arg file="@{file}"/> <!-- model file -->
+ <arg value="@{mode}"/> <!-- output type -->
+ <arg file="${build.mdoOutputDir}"/> <!-- output directory -->
+ <arg value="@{version}"/> <!-- model version -->
+ <arg value="false"/> <!-- package with version -->
+ <arg value="8"/> <!-- javaSource -->
+ </exec>
+ </sequential>
+ </macrodef>
+ <macrodef name="modello">
+ <attribute name="file"/>
+ <attribute name="version" default="1.0.0"/>
+ <sequential>
+ <echo taskname="modello" message="Generating sources for @{file}"/>
+ <modello-single-mode file="@{file}" version="@{version}" mode="java"/>
+ <modello-single-mode file="@{file}" version="@{version}"
mode="xpp3-reader"/>
+ <modello-single-mode file="@{file}" version="@{version}"
mode="xpp3-writer"/>
+ </sequential>
+ </macrodef>
+ <modello file="${build.mdoDir}/settings-security.mdo"/>
</target>
<!-- ======================================================================
-->
