SPECS/hamcrest.spec

@@ -1,10 +1,8 @@
-%bcond_with bootstrap
-
 %global upstream_version %(echo %{version} | tr '~' '-')
 
 Name:           hamcrest
 Version:        2.2
-Release:        7%{?dist}
+Release:        2%{?dist}
 Summary:        Library of matchers for building test expressions
 License:        BSD
 URL:            https://github.com/hamcrest/JavaHamcrest
@@ -16,15 +14,7 @@ Source1:        https://repo1.maven.org/maven2/org/hamcrest/hamcrest/%{upstream_
 Patch0:         0001-Fix-build-with-OpenJDK-11.patch
 
 BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 BuildRequires:  mvn(junit:junit)
-%endif
-
-Provides:       hamcrest-core = %{version}-%{release}
-Obsoletes:      hamcrest-core < 1.3-32
-Obsoletes:      hamcrest-demo < 1.3-32
 
 %description
 Provides a library of matcher objects (also known as constraints or predicates)
@@ -53,7 +43,7 @@ rm -rf hamcrest-integration
 rm -rf hamcrest-library
 
 cp -p %{SOURCE1} pom.xml
-%pom_add_dep junit:junit::test
+%pom_add_dep junit:junit
 %pom_xpath_inject pom:project '
 <build>
 	<plugins>
@@ -89,40 +79,6 @@ sed -i 's/\r//' LICENSE.txt
 %license LICENSE.txt
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.2-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-6
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-5
-- Bootstrap Maven for CentOS Stream 9
-
-* Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-4
-- Obsolete hamcrest-core and -demo
-- Resolves: rhbz#1966269
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-3
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.3-29
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jun 24 2020 Roland Grunberg <rgrunber@redhat.com> - 0:1.3-28
-- Use source/target 1.6 to build against Java 11.
-- Disable checking of remote javadoc links.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-2
 - Mass rebuild for javapackages-tools 201902
 
@@ -135,18 +91,9 @@ sed -i 's/\r//' LICENSE.txt
 * Mon Aug 19 2019 Marian Koncek <mkoncek@redhat.com> - 2.1-1
 - Update to upstream version 2.1
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-24
 - Mass rebuild for javapackages-tools 201901
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
@@ -365,7 +312,6 @@ sed -i 's/\r//' LICENSE.txt
 
 * Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.8.1-4jpp
 - Rebuild with ant-1.6.2
-
 * Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:3.8.1-3jpp
 - update for JPackage 1.5