diff --git a/.gitignore b/.gitignore index f974b69..308856a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /objenesis-1.2.tar.xz /2.1.tar.gz +/2.6.tar.gz diff --git a/0001-Fix-build-with-current-jar-plugin.patch b/0001-Fix-build-with-current-jar-plugin.patch deleted file mode 100644 index 68a8359..0000000 --- a/0001-Fix-build-with-current-jar-plugin.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0c505777f861779eb499c3ad06dbef2ef8f6118a Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Thu, 2 Jun 2016 13:17:13 +0200 -Subject: [PATCH] Fix build with current jar-plugin - ---- - main/pom.xml | 8 ++++++++ - pom.xml | 1 - - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/main/pom.xml b/main/pom.xml -index a23ce9e..70c9a0d 100644 ---- a/main/pom.xml -+++ b/main/pom.xml -@@ -17,6 +17,14 @@ - - - -+ maven-jar-plugin -+ -+ -+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF -+ -+ -+ -+ - com.keyboardsamurais.maven - maven-timestamp-plugin - -diff --git a/pom.xml b/pom.xml -index 4982e47..1b257bc 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -102,7 +102,6 @@ - - maven-jar-plugin - -- true - - true - false --- -2.5.5 - diff --git a/objenesis.spec b/objenesis.spec index 4fcee61..fe99208 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -30,14 +30,12 @@ Summary: A library for instantiating Java objects Name: objenesis -Version: 2.1 -Release: 7%{?dist} +Version: 2.6 +Release: 1%{?dist} License: ASL 2.0 URL: http://objenesis.org/ Source0: https://github.com/easymock/%{name}/archive/%{version}.tar.gz -Patch1: 0001-Fix-build-with-current-jar-plugin.patch - BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -80,8 +78,6 @@ This package contains the API documentation for %{name}. %prep %setup -q -%patch1 -p1 - # Enable generation of pom.properties (rhbz#1017850) %pom_xpath_remove pom:addMavenDescriptor @@ -107,6 +103,9 @@ This package contains the API documentation for %{name}. %changelog +* Mon Sep 18 2017 Mikolaj Izdebski - 2.6-1 +- Update to upstream version 2.6 + * Thu Jul 27 2017 Fedora Release Engineering - 2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index dddfec2..cc2fdb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f6e5f347b950f23a8c4ae6618c4b65d 2.1.tar.gz +SHA512 (2.6.tar.gz) = 554b191390cd990147dafc64996915ab508d2482113430da9d8989e7d23811efbd623a5c8e9d9a878536723459ac7e5091777736742e31944b611e5f2bc8772b