Update to 3.6-1

easymock.spec

@@ -1,28 +1,25 @@
-Name:           easymock
+Name:                easymock
-Version:        3.5
+Version:             3.6
-Release:        6
+Release:             1
-Summary:        Easy mock objects
+Summary:             Easy mock objects
-License:        ASL 2.0
+License:             ASL 2.0
-URL:            http://www.easymock.org
+URL:                 http://www.easymock.org
-Source0:        %{name}-%{version}.tar.gz
+Source0:             https://github.com/easymock/easymock/archive/easymock-%{version}.tar.gz
-
+Patch1:              0001-Disable-android-support.patch
-Patch0001:      0001-Disable-android-support.patch
+Patch2:              0002-Unshade-cglib-and-asm.patch
-Patch0002:      0002-Unshade-cglib-and-asm.patch
+Patch3:              0003-Fix-OSGi-manifest.patch
-Patch0003:      0003-Fix-OSGi-manifest.patch
+BuildArch:           noarch
-
+BuildRequires:       maven-local mvn(cglib:cglib) mvn(junit:junit)
-BuildArch:      noarch
+BuildRequires:       mvn(org.apache.felix:maven-bundle-plugin)
-
+BuildRequires:       mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
-BuildRequires:  maven-local mvn(cglib:cglib) mvn(junit:junit) mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:       mvn(org.apache.maven.surefire:surefire-junit47)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin) mvn(org.ow2.asm:asm)
+BuildRequires:       mvn(org.apache.maven.surefire:surefire-testng)
-BuildRequires:  mvn(org.apache.maven.surefire:surefire-junit47) mvn(org.testng:testng)
+BuildRequires:       mvn(org.codehaus.mojo:build-helper-maven-plugin) mvn(org.objenesis:objenesis)
-BuildRequires:  mvn(org.apache.maven.surefire:surefire-testng) mvn(org.objenesis:objenesis)
+BuildRequires:       mvn(org.ow2.asm:asm) mvn(org.testng:testng)
-BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin) mvn(org.apache:apache-jar-resource-bundle)
+BuildRequires:       mvn(org.apache:apache-jar-resource-bundle)
-
+Obsoletes:           %{name}3 < 3.4
-Obsoletes:      %{name}3 < 3.4
+Provides:            %{name}3 = %{version}-%{release}
-Provides:       %{name}3 = %{version}-%{release}
+Obsoletes:           %{name}2 < 2.5.2-10
-Obsoletes:      %{name}2 < 2.5.2-10
-
-
 %description
 EasyMock provides Mock Objects for interfaces in JUnit tests by generating
 them on the fly using Java's proxy mechanism. Due to EasyMock's unique style
@@ -38,27 +35,25 @@ Obsoletes:      %{name}-javadoc < %{version}-%{release}
 The help for easymock to use.
 
 %prep
-%autosetup -n %{name}-%{name}-%{version} -p1
+%autosetup  -n %{name}-%{name}-%{version} -p1
-
+find -name '*.jar' -delete
+find -name '*.class' -delete
+rm -rf website/*
 %pom_remove_plugin :maven-license-plugin
-
+%pom_remove_plugin :maven-timestamp-plugin
+%pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :animal-sniffer-maven-plugin
+%pom_remove_plugin :animal-sniffer-maven-plugin core
 rm core/src/main/java/org/easymock/internal/Android*.java
 rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 %pom_disable_module test-android
 %pom_remove_dep :dexmaker core
-
 %pom_disable_module test-nodeps
 %pom_remove_plugin :maven-shade-plugin core
-
 %pom_disable_module test-integration
 %pom_disable_module test-osgi
-
 %pom_remove_plugin org.codehaus.mojo:versions-maven-plugin
-
-%pom_remove_plugin :maven-timestamp-plugin
-
 %mvn_file ":easymock{*}" easymock@1 easymock3@1
-
 %pom_xpath_remove pom:extensions
 
 %build
@@ -67,7 +62,6 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license core/LICENSE.txt
 
@@ -75,6 +69,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 %license core/LICENSE.txt
 
 %changelog
+* Thu Aug 13 2020 yanan li <liyanan032@huawei.com> - 3.6-1
+- Update to 3.6-1
+
 * Tue Jan 21 2020 wutao <wutao61@huawei.com> - 3.5-6
 - Type:bugfix
 - ID:NA