From 3672c195e123a8ff016dd36d79458e8d9457652e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Nov 21 2019 22:18:24 +0000 Subject: update to version 1.78 --- diff --git a/.gitignore b/.gitignore index e1caa32..8a5dacc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/results_* +/*.src.rpm + /beust-jcommander-1.17.tar.xz /jcommander-1.30.tar.gz /jcommander-1.35.tar.gz @@ -12,3 +15,5 @@ /1.66.tar.gz /1.71.tar.gz /beust-jcommander-1.71.tar.gz +/beust-jcommander-1.75.tar.gz +/beust-jcommander-1.78.tar.gz diff --git a/beust-jcommander.pom b/beust-jcommander.pom index f36c4ad..d34ebbe 100644 --- a/beust-jcommander.pom +++ b/beust-jcommander.pom @@ -74,12 +74,6 @@ - - org.sonatype.oss - oss-parent - 3 - - diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 06c1da7..3c8524d 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,6 +1,6 @@ Name: beust-jcommander -Version: 1.71 -Release: 7%{?dist} +Version: 1.78 +Release: 1%{?dist} Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ @@ -10,14 +10,13 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.gz # Adapted from earlier version that still shipped poms. It uses kobalt for building now Source1: %{name}.pom -# Cleaned up bundled jars hose licensing cannot be easily verified +# Cleaned up bundled jars whose licensing cannot be easily verified Source2: generate-tarball.sh -Patch0: 0001-ParseValues-NullPointerException-patch.patch +Patch0: 0001-ParseValues-NullPointerException-patch.patch BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: mvn(org.testng:testng) %description @@ -31,7 +30,7 @@ Summary: API documentation for %{name} This package contains the %{summary}. %prep -%setup -q -n jcommander-%{version} +%setup -q %patch0 -p1 chmod -x license.txt @@ -52,6 +51,10 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml %doc license.txt notice.md %changelog +* Sat Nov 09 2019 Fabio Valentini - 1.78-1 +- Update to version 1.78. +- Remove unnecessary parent from POM file. + * Wed Jul 24 2019 Fedora Release Engineering - 1.71-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild @@ -148,3 +151,4 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml * Fri May 13 2011 Jaromir Capik - 1.17-1 - Initial version of the package + diff --git a/generate-tarball.sh b/generate-tarball.sh index cb89cee..034b6b3 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -1,20 +1,26 @@ #!/bin/bash + set -e -name=beust-jcommander +# This commit refers to the state of the sources when they were published to +# Maven Central +git_tag='dcf154b6d40dd3865e317de7250b7019044543a9' version="$(sed -n 's/Version:\s*//p' *.spec)" -# RETRIEVE -wget "https://github.com/cbeust/jcommander/archive/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" +# Retrieve and set version +git clone https://github.com/cbeust/jcommander.git -rm -rf tarball-tmp -mkdir tarball-tmp -cd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" +pushd jcommander +git reset --hard "${git_tag}" -# CLEAN TARBALL -rm -r */gradle* */kobalt* */lib +# Clean +find -name '*.jar' -delete +find -name '*.class' -delete +rm -rf gradle* kobalt* lib +rm -rf .git +popd -tar cf "../${name}-${version}.tar.gz" * -cd .. -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" +# Pack into tarball +mv jcommander beust-jcommander-"${version}" +tar -cvf beust-jcommander-"${version}".tar.gz beust-jcommander-"${version}"/ +rm -rf beust-jcommander-"${version}" diff --git a/sources b/sources index fc08321..0be1842 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beust-jcommander-1.71.tar.gz) = a3f7061f3afacd57092f62b9f8540a1f1e210ad6efc7f41ae10cee725a546b4cdcecee4a4f7056224936a59be18b11f2547002ec18be36626847b79a27a081d1 +SHA512 (beust-jcommander-1.78.tar.gz) = 618367d1644bf0423c3184bd4a6be73571c1b2de243bb7dad4e72d5a3023bf30116c0e5337088e0e4d1f42f24ba94b0fddaedcd3e54613c335d068edeaddfaef