From a72b8acd2f362fd51d14a866c9f5b47268c849cd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/11] Expand conditionals --- modello.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/modello.spec b/modello.spec index 37bd529..2970330 100644 --- a/modello.spec +++ b/modello.spec @@ -1,5 +1,3 @@ -%bcond_without jackson -%bcond_without snakeyaml Name: modello Version: 1.9.1 @@ -29,14 +27,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) -%if %{with jackson} -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) -%endif -%if %{with snakeyaml} -BuildRequires: mvn(org.yaml:snakeyaml) -%endif # Explicit javapackages-tools requires since modello script uses # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -65,17 +55,13 @@ cp -p %{SOURCE1} LICENSE # Avoid using Maven 2.x APIs sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml -%if %{without jackson} %pom_disable_module modello-plugin-jackson modello-plugins %pom_disable_module modello-plugin-jsonschema modello-plugins %pom_remove_dep :modello-plugin-jackson modello-maven-plugin %pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin -%endif -%if %{without snakeyaml} %pom_disable_module modello-plugin-snakeyaml modello-plugins %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin -%endif %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) From 3443559fb8225be00899a98143e46a126b218751 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 02/11] Remove explicit Epoch --- modello.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/modello.spec b/modello.spec index 2970330..4c222d0 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,6 @@ Name: modello Version: 1.9.1 Release: 7%{?dist} -Epoch: 0 Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are # ASL 2.0 or BSD-licensed. From b5be22d9711244f6e8ca7ba57f4e4a630e9b1fa0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 13 Apr 2019 17:17:37 +0200 Subject: [PATCH 03/11] Update to upstream version 1.10.0 --- .gitignore | 1 + modello.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 361710a..fbc21f8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ modello-1.5-source-release.zip /modello-1.8.2-source-release.zip /modello-1.8.3-source-release.zip /modello-1.9.1-source-release.zip +/modello-1.10.0-source-release.zip diff --git a/modello.spec b/modello.spec index 4c222d0..0931c35 100644 --- a/modello.spec +++ b/modello.spec @@ -1,7 +1,6 @@ - Name: modello -Version: 1.9.1 -Release: 7%{?dist} +Version: 1.10.0 +Release: 1%{?dist} Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are # ASL 2.0 or BSD-licensed. @@ -79,6 +78,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* Sat Apr 13 2019 Mikolaj Izdebski - 1.10.0-1 +- Update to upstream version 1.10.0 + * Tue Jul 31 2018 Severin Gehwolf - 0:1.9.1-7 - Add explicit requires on javapackages-tools for modello script. diff --git a/sources b/sources index 20b5bb2..56fe3b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-1.9.1-source-release.zip) = 4b4f31c1e86280d72d503b8c1bcaf780bdb4d8e95545c9bce0a9a77b17d58febed27c72b545ebb57adfde78ee538eaf7055eca19ac45c94cdcdccb853236ea7f +SHA512 (modello-1.10.0-source-release.zip) = eda3264c5e33c1e19117d79bdf5560d639c2510ef8c857b5089eeac9b2dc4706197419802c191cc2691f9bda4380324602d57b973ad6fd19413a198c1add5373 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From a28b3d95b60d2567642c110290575017f74d4ff3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:20 +0200 Subject: [PATCH 04/11] Mass rebuild for javapackages-tools 201901 --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 0931c35..ae29153 100644 --- a/modello.spec +++ b/modello.spec @@ -1,6 +1,6 @@ Name: modello Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are # ASL 2.0 or BSD-licensed. @@ -78,6 +78,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.10.0-2 +- Mass rebuild for javapackages-tools 201901 + * Sat Apr 13 2019 Mikolaj Izdebski - 1.10.0-1 - Update to upstream version 1.10.0 From 070d9c9409f50876699a97933bb76cc0f7d4e9b1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 27 Jun 2019 10:09:32 +0200 Subject: [PATCH 05/11] Update to upstream version 1.11 --- .gitignore | 1 + modello.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fbc21f8..64cc695 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ modello-1.5-source-release.zip /modello-1.8.3-source-release.zip /modello-1.9.1-source-release.zip /modello-1.10.0-source-release.zip +/modello-1.11-source-release.zip diff --git a/modello.spec b/modello.spec index ae29153..7b9bad8 100644 --- a/modello.spec +++ b/modello.spec @@ -1,6 +1,6 @@ Name: modello -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are # ASL 2.0 or BSD-licensed. @@ -38,7 +38,6 @@ architecture, various types of code and descriptors can be generated from the single model, including Java POJOs, XML marshallers/unmarshallers, XSD and documentation. - %package javadoc Summary: Javadoc for %{name} @@ -72,12 +71,15 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %files -f .mfiles %doc LICENSE -%{_bindir}/* +/usr/bin/modello %files javadoc -f .mfiles-javadoc %doc LICENSE %changelog +* Wed Jun 26 2019 Marian Koncek - 1.11-1 +- Update to upstream version 1.11 + * Fri May 24 2019 Mikolaj Izdebski - 1.10.0-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 56fe3b3..1662ad4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-1.10.0-source-release.zip) = eda3264c5e33c1e19117d79bdf5560d639c2510ef8c857b5089eeac9b2dc4706197419802c191cc2691f9bda4380324602d57b973ad6fd19413a198c1add5373 +SHA512 (modello-1.11-source-release.zip) = e7731a80cc1112405a4e8746713eb9d0d81bf7a00bb13fb615bc63196513579b956f9dff56d963e16c3e6c7c9cd651954922fb62541765e86b0ace0fa9b8450f SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 0b1fa6566bf278634b922f05def21196e51bfd38 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 28 Jun 2019 09:36:23 +0200 Subject: [PATCH 06/11] Revert "Update to upstream version 1.11" This reverts commit 070d9c9409f50876699a97933bb76cc0f7d4e9b1. --- .gitignore | 1 - modello.spec | 10 ++++------ sources | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 64cc695..fbc21f8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,3 @@ modello-1.5-source-release.zip /modello-1.8.3-source-release.zip /modello-1.9.1-source-release.zip /modello-1.10.0-source-release.zip -/modello-1.11-source-release.zip diff --git a/modello.spec b/modello.spec index 7b9bad8..ae29153 100644 --- a/modello.spec +++ b/modello.spec @@ -1,6 +1,6 @@ Name: modello -Version: 1.11 -Release: 1%{?dist} +Version: 1.10.0 +Release: 2%{?dist} Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are # ASL 2.0 or BSD-licensed. @@ -38,6 +38,7 @@ architecture, various types of code and descriptors can be generated from the single model, including Java POJOs, XML marshallers/unmarshallers, XSD and documentation. + %package javadoc Summary: Javadoc for %{name} @@ -71,15 +72,12 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %files -f .mfiles %doc LICENSE -/usr/bin/modello +%{_bindir}/* %files javadoc -f .mfiles-javadoc %doc LICENSE %changelog -* Wed Jun 26 2019 Marian Koncek - 1.11-1 -- Update to upstream version 1.11 - * Fri May 24 2019 Mikolaj Izdebski - 1.10.0-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 1662ad4..56fe3b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-1.11-source-release.zip) = e7731a80cc1112405a4e8746713eb9d0d81bf7a00bb13fb615bc63196513579b956f9dff56d963e16c3e6c7c9cd651954922fb62541765e86b0ace0fa9b8450f +SHA512 (modello-1.10.0-source-release.zip) = eda3264c5e33c1e19117d79bdf5560d639c2510ef8c857b5089eeac9b2dc4706197419802c191cc2691f9bda4380324602d57b973ad6fd19413a198c1add5373 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From e63f295e1ccaa0d3380cad34f2973e41e0111a49 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 27 Jun 2019 10:09:32 +0200 Subject: [PATCH 07/11] Update to upstream version 1.11 --- .gitignore | 1 + modello.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fbc21f8..64cc695 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ modello-1.5-source-release.zip /modello-1.8.3-source-release.zip /modello-1.9.1-source-release.zip /modello-1.10.0-source-release.zip +/modello-1.11-source-release.zip diff --git a/modello.spec b/modello.spec index ae29153..7b9bad8 100644 --- a/modello.spec +++ b/modello.spec @@ -1,6 +1,6 @@ Name: modello -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are # ASL 2.0 or BSD-licensed. @@ -38,7 +38,6 @@ architecture, various types of code and descriptors can be generated from the single model, including Java POJOs, XML marshallers/unmarshallers, XSD and documentation. - %package javadoc Summary: Javadoc for %{name} @@ -72,12 +71,15 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %files -f .mfiles %doc LICENSE -%{_bindir}/* +/usr/bin/modello %files javadoc -f .mfiles-javadoc %doc LICENSE %changelog +* Wed Jun 26 2019 Marian Koncek - 1.11-1 +- Update to upstream version 1.11 + * Fri May 24 2019 Mikolaj Izdebski - 1.10.0-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 56fe3b3..1662ad4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-1.10.0-source-release.zip) = eda3264c5e33c1e19117d79bdf5560d639c2510ef8c857b5089eeac9b2dc4706197419802c191cc2691f9bda4380324602d57b973ad6fd19413a198c1add5373 +SHA512 (modello-1.11-source-release.zip) = e7731a80cc1112405a4e8746713eb9d0d81bf7a00bb13fb615bc63196513579b956f9dff56d963e16c3e6c7c9cd651954922fb62541765e86b0ace0fa9b8450f SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 23a9f111b58a3d3bf744929f23b751ccecc48f85 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Aug 2019 08:15:16 +0200 Subject: [PATCH 08/11] Don't hardcode bindir location --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 7b9bad8..2b16cbd 100644 --- a/modello.spec +++ b/modello.spec @@ -71,7 +71,7 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %files -f .mfiles %doc LICENSE -/usr/bin/modello +%{_bindir}/modello %files javadoc -f .mfiles-javadoc %doc LICENSE From 02fb9c0b31c86a87da4a6d847060544d5a49f05b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 09/11] Mass rebuild for javapackages-tools 201902 --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 2b16cbd..b6cbf9a 100644 --- a/modello.spec +++ b/modello.spec @@ -1,6 +1,6 @@ Name: modello Version: 1.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are # ASL 2.0 or BSD-licensed. @@ -77,6 +77,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.11-2 +- Mass rebuild for javapackages-tools 201902 + * Wed Jun 26 2019 Marian Koncek - 1.11-1 - Update to upstream version 1.11 From 1407e72333141fbe4d23a62393c31e123a2e9c47 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 10/11] Conditionalize buildrequires in bootstrap mode --- modello.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modello.spec b/modello.spec index b6cbf9a..6875d90 100644 --- a/modello.spec +++ b/modello.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: modello Version: 1.11 Release: 2%{?dist} @@ -12,6 +14,9 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) @@ -25,6 +30,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) +%endif # Explicit javapackages-tools requires since modello script uses # /usr/share/java-utils/java-functions Requires: javapackages-tools From e8ccf7a4f45ba489dcd89dd876ced10b11b8441d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 11/11] Turn off bootstrap mode by default --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 6875d90..8e0b373 100644 --- a/modello.spec +++ b/modello.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: modello Version: 1.11