diff --git a/easymock-port-to-maven-jar-plugin-3.patch b/easymock-port-to-maven-jar-plugin-3.patch new file mode 100644 index 0000000..11cedd9 --- /dev/null +++ b/easymock-port-to-maven-jar-plugin-3.patch @@ -0,0 +1,14 @@ +--- pom.xml~ 2015-01-05 15:26:16.000000000 +0100 ++++ pom.xml 2016-05-30 10:43:28.487416122 +0200 +@@ -334,10 +334,10 @@ + + maven-jar-plugin + +- true + + true + false ++ ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + true + true diff --git a/easymock.spec b/easymock.spec index 042edd1..3fc4964 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -8,6 +8,7 @@ URL: http://www.easymock.org Source0: https://github.com/easymock/easymock/archive/easymock-%{version}.tar.gz Patch5: %{name}-remove-android-support.patch +Patch6: %{name}-port-to-maven-jar-plugin-3.patch BuildArch: noarch @@ -50,6 +51,7 @@ find . -name "*.zip" -delete # remove android support rm -fr easymock/src/main/java/org/easymock/internal/Android*.java %patch5 -p1 -b .sav +%patch6 %pom_xpath_remove "pom:profile[pom:id[text()='android']]" %pom_remove_dep :dexmaker easymock @@ -87,6 +89,9 @@ rm -fr easymock/src/main/java/org/easymock/internal/Android*.java %changelog +* Mon May 30 2016 Mikolaj Izdebski - 3.3.1-5 +- Port to maven-jar-plugin 3.0.0 + * Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild