Remove conditional for EOL Fedora

This commit is contained in:
Michael Simacek 2017-02-16 14:22:30 +01:00
parent b4e5538101
commit 3b209de564

View File

@ -1,6 +1,6 @@
Name: mockito Name: mockito
Version: 1.10.19 Version: 1.10.19
Release: 11%{?dist} Release: 12%{?dist}
Summary: A Java mocking framework Summary: A Java mocking framework
License: MIT License: MIT
@ -62,16 +62,10 @@ ant jar javadoc
# Convert to OSGi bundle # Convert to OSGi bundle
pushd target pushd target
%if 0%{?fedora} >= 23
bnd wrap \ bnd wrap \
--version %{version} \ --version %{version} \
--output %{name}-core-%{version}.bar \ --output %{name}-core-%{version}.bar \
--properties ../conf/%{name}-core.bnd \ --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 %{name}-core-%{version}.jar
mv %{name}-core-%{version}.bar %{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 %license LICENSE NOTICE
%changelog %changelog
* Thu Feb 16 2017 Michael Simacek <msimacek@redhat.com> - 1.10.19-12
- Remove conditional for EOL Fedora
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.19-11 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.19-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild