From 5f3fd9ce09005398e744af399cd3bb35783ed81c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:23 +0200 Subject: [PATCH 1/5] Mass rebuild for javapackages-tools 201901 --- opentest4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opentest4j.spec b/opentest4j.spec index ba4ae30..32bc763 100644 --- a/opentest4j.spec +++ b/opentest4j.spec @@ -1,6 +1,6 @@ Name: opentest4j Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Test Alliance for the JVM License: ASL 2.0 URL: https://github.com/ota4j-team/opentest4j @@ -83,6 +83,9 @@ sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/Assertio %license LICENSE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.1.1-2 +- Mass rebuild for javapackages-tools 201901 + * Tue Mar 05 2019 Mat Booth - 1.1.1-1 - Update to latest upstream release From 0adb5a2d838a4c8e43945ceb0b8a367a970cbe31 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 15 Jul 2019 12:12:32 +0200 Subject: [PATCH 2/5] Update to upstream version 1.2.0 --- .gitignore | 2 ++ opentest4j.spec | 9 ++++++--- sources | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3110db5..77810bb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /opentest4j-1.0.0.pom /opentest4j-1.1.1.pom /r1.1.1.tar.gz +/r1.2.0.tar.gz +/opentest4j-1.2.0.pom diff --git a/opentest4j.spec b/opentest4j.spec index 32bc763..10d7929 100644 --- a/opentest4j.spec +++ b/opentest4j.spec @@ -1,6 +1,6 @@ Name: opentest4j -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Open Test Alliance for the JVM License: ASL 2.0 URL: https://github.com/ota4j-team/opentest4j @@ -34,7 +34,7 @@ API documentation for %{name}. find -name \*.jar -delete cp -p %{SOURCE100} pom.xml -%pom_add_dep junit:junit:4.12:test +%pom_add_dep junit:junit::test %pom_xpath_inject pom:project " @@ -83,6 +83,9 @@ sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/Assertio %license LICENSE %changelog +* Mon Jul 15 2019 Marian Koncek - 1.2.0-1 +- Update to upstream version 1.2.0 + * Fri May 24 2019 Mikolaj Izdebski - 1.1.1-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index e816243..429e775 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opentest4j-1.1.1.pom) = 1aa0d4ed9afe200e0d4b084b5b446de8da98cf38ff25d4004d738dd6ef6706d47d17554599eba6faec2bf49e42211d1f16045c7b03d0b374cb2cdb6b5d5d5f2d -SHA512 (r1.1.1.tar.gz) = d1cbaeeed7fc9fa464ea19062ff2744323c8eb60b676e511c1b2a344e7c69e3e3630805bd06d084cb5b3cee58918a7f58d70ade7821e37ec093a93e1506b2ea6 +SHA512 (opentest4j-1.2.0.pom) = 28ce0d0b5cceeac5adfcdd16ee6f5fbefd43eef8057b924993fb7a9f4b7a7085b980f3e808db5fb7750a53d0072b7fe7b118f5c0011e3ef0efe6c9a90a87b868 +SHA512 (r1.2.0.tar.gz) = cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08 From e46fc2ee954912dcf1d4aeca74567e327cd499f9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 3/5] Mass rebuild for javapackages-tools 201902 --- opentest4j.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opentest4j.spec b/opentest4j.spec index 10d7929..00ee081 100644 --- a/opentest4j.spec +++ b/opentest4j.spec @@ -1,6 +1,6 @@ Name: opentest4j Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Test Alliance for the JVM License: ASL 2.0 URL: https://github.com/ota4j-team/opentest4j @@ -83,6 +83,9 @@ sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/Assertio %license LICENSE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.2.0-2 +- Mass rebuild for javapackages-tools 201902 + * Mon Jul 15 2019 Marian Koncek - 1.2.0-1 - Update to upstream version 1.2.0 From c6a67957bc41c94d6c1b5188c7f5206183a993c8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 4/5] Conditionalize buildrequires in bootstrap mode --- opentest4j.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/opentest4j.spec b/opentest4j.spec index 00ee081..270082f 100644 --- a/opentest4j.spec +++ b/opentest4j.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: opentest4j Version: 1.2.0 Release: 2%{?dist} @@ -11,7 +13,11 @@ Source0: https://github.com/ota4j-team/opentest4j/archive/r%{version}.tar Source100: https://repo1.maven.org/maven2/org/opentest4j/opentest4j/%{version}/opentest4j-%{version}.pom BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) +%endif %description Open Test Alliance for the JVM is a minimal common foundation for From bd63493eaba96db91a1a3d0b55ae1f7019de9e75 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 5/5] Turn off bootstrap mode by default --- opentest4j.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentest4j.spec b/opentest4j.spec index 270082f..994eb81 100644 --- a/opentest4j.spec +++ b/opentest4j.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: opentest4j Version: 1.2.0