SPECS/hamcrest.spec

@@ -4,25 +4,28 @@
 
 Name:           hamcrest
 Version:        2.2
-Release:        16%{?dist}
+Release:        9%{?dist}
 Summary:        Library of matchers for building test expressions
-License:        BSD-3-Clause
+License:        BSD
 URL:            https://github.com/hamcrest/JavaHamcrest
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://github.com/hamcrest/JavaHamcrest/archive/v%{upstream_version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        https://repo1.maven.org/maven2/org/hamcrest/hamcrest/%{upstream_version}/hamcrest-%{upstream_version}.pom
 
 Patch0:         0001-Fix-build-with-OpenJDK-11.patch
 
+BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
 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)
 allowing 'match' rules to be defined declaratively, to be used in other
@@ -37,11 +40,18 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n JavaHamcrest-%{upstream_version}
-%patch0 -p1
+%patch -P 0 -p1
 
-sed -i 's/\r//' LICENSE.txt
+rm -rf docs
+rm -rf *gradle*
+rm -rf */*.gradle
+
+mv hamcrest/src .
+rm -rf hamcrest
+rm -rf hamcrest-core
+rm -rf hamcrest-integration
+rm -rf hamcrest-library
 
-pushd hamcrest
 cp -p %{SOURCE1} pom.xml
 %pom_add_dep junit:junit::test
 %pom_xpath_inject pom:project '
@@ -50,24 +60,12 @@ cp -p %{SOURCE1} pom.xml
 		<plugin>
 		<groupId>org.apache.maven.plugins</groupId>
 		<artifactId>maven-compiler-plugin</artifactId>
-      <version>any</version>
+		<version>3.8.1</version>
 		<configuration>
 			<source>1.8</source>
 			<target>1.8</target>
 		</configuration>
 		</plugin>
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-jar-plugin</artifactId>
-      <version>any</version>
-      <configuration>
-        <archive>
-          <manifestEntries>
-            <Automatic-Module-Name>org.hamcrest</Automatic-Module-Name>
-          </manifestEntries>
-        </archive>
-      </configuration>
-    </plugin>
 	</plugins>
 </build>'
 
@@ -75,59 +73,37 @@ cp -p %{SOURCE1} pom.xml
 %mvn_alias org.hamcrest:hamcrest org.hamcrest:hamcrest-core
 %mvn_alias org.hamcrest:hamcrest org.hamcrest:hamcrest-library
 
+sed -i 's/\r//' LICENSE.txt
+
 %build
-pushd hamcrest
 %mvn_build
-popd
 
 %install
-pushd hamcrest
 %mvn_install
-popd
 
-%files -f hamcrest/.mfiles
+%files -f .mfiles
 %doc README.md
 %license LICENSE.txt
 
-%files javadoc -f hamcrest/.mfiles-javadoc
+%files javadoc -f .mfiles-javadoc
 %license LICENSE.txt
 
 %changelog
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.2-16
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.2-15
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-12
-- Convert License tag to SPDX format
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Feb 23 2023 Marian Koncek <mkoncek@redhat.com> - 2.2-10
-- Add Automatic-Module-Name manifest entry
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 2.2-9
+- Fix patch usage
 
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+* Tue Nov 19 2024 Marián Konček <mkoncek@redhat.com> - 2.2-8
+- Rebuild with regenerated Requires on Java
 
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.2-7
-- Rebuilt for java-17-openjdk as system jdk
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.2-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-6
+- Rebuild to workaround DistroBaker issue
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* 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