From 5191b879b8b39e73dc959e2dcee79fe1fd5a6814 Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Aug 27 2021 11:29:10 +0000 Subject: Update to version 1.6 --- diff --git a/.gitignore b/.gitignore index 7304567..15fa5d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /options-1.2.zip +/options-1.6.tar.gz diff --git a/options.spec b/options.spec index 3d44c38..ebecb6d 100644 --- a/options.spec +++ b/options.spec @@ -1,23 +1,21 @@ Name: options -Version: 1.2 -Release: 19%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: Library for managing sets of JVM properties to configure an app or library License: ASL 2.0 URL: https://github.com/headius/%{name} -Source0: https://github.com/headius/%{name}/archive/%{name}-%{version}.zip -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source0: %{url}/archive/%{name}-%{version}.tar.gz +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch + BuildRequires: maven-local +BuildRequires: mvn(junit:junit) %description Provides a simple mechanism for defining JVM property-based configuration for an application or library. -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -Javadoc for %{name}. +%javadoc_package %prep %setup -q -n %{name}-%{name}-%{version} @@ -26,6 +24,9 @@ cp %{SOURCE1} . # remove unnecessary dependency on parent POM %pom_remove_parent +# remove module-info.java since we're building in java 8 +rm src/main/java/module-info.java + %build %mvn_build @@ -33,13 +34,12 @@ cp %{SOURCE1} . %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} -%doc LICENSE-2.0.txt - -%files javadoc -f .mfiles-javadoc -%doc LICENSE-2.0.txt +%license LICENSE-2.0.txt %changelog +* Fri Aug 27 2021 Didik Supriadi - 1.6-1 +- Update to version 1.6 + * Thu Jul 22 2021 Fedora Release Engineering - 1.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 812550e..3b61715 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef29c83aa53792046897c6b1383ca7e9 options-1.2.zip +SHA512 (options-1.6.tar.gz) = efe0c7452697949efe82aa9be6b7658155d965e044320964ae8b7d023a87dd88d53a0f2d71ef24a295815c47130abf00951d1486383d14e31c29cd3213edb0e2