From 3b209de564fa6c30db0fea927a56eaa95059ae63 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 16 Feb 2017 14:22:30 +0100 Subject: [PATCH] Remove conditional for EOL Fedora --- mockito.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/mockito.spec b/mockito.spec index 5f0c599..0c922b3 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,6 +1,6 @@ Name: mockito Version: 1.10.19 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A Java mocking framework License: MIT @@ -62,16 +62,10 @@ ant jar javadoc # Convert to OSGi bundle pushd target -%if 0%{?fedora} >= 23 bnd wrap \ --version %{version} \ --output %{name}-core-%{version}.bar \ --properties ../conf/%{name}-core.bnd \ -%else -java -jar $(build-classpath aqute-bnd) wrap \ - -output %{name}-core-%{version}.bar \ - -properties ../conf/%{name}-core.bnd \ -%endif %{name}-core-%{version}.jar mv %{name}-core-%{version}.bar %{name}-core-%{version}.jar @@ -95,6 +89,9 @@ sed -i -e "s|@version@|%{version}|g" maven/%{name}-core.pom %license LICENSE NOTICE %changelog +* Thu Feb 16 2017 Michael Simacek - 1.10.19-12 +- Remove conditional for EOL Fedora + * Fri Feb 10 2017 Fedora Release Engineering - 1.10.19-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild