update to version 1.78

This commit is contained in:
Fabio Valentini 2019-11-09 16:14:21 +01:00
parent 2e0c851117
commit c0b0a24c6c
5 changed files with 34 additions and 25 deletions

5
.gitignore vendored
View File

@ -1,3 +1,6 @@
/results_*
/*.src.rpm
/beust-jcommander-1.17.tar.xz /beust-jcommander-1.17.tar.xz
/jcommander-1.30.tar.gz /jcommander-1.30.tar.gz
/jcommander-1.35.tar.gz /jcommander-1.35.tar.gz
@ -12,3 +15,5 @@
/1.66.tar.gz /1.66.tar.gz
/1.71.tar.gz /1.71.tar.gz
/beust-jcommander-1.71.tar.gz /beust-jcommander-1.71.tar.gz
/beust-jcommander-1.75.tar.gz
/beust-jcommander-1.78.tar.gz

View File

@ -74,12 +74,6 @@
</developer> </developer>
</developers> </developers>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>3</version>
</parent>
<build> <build>
<plugins> <plugins>
<!-- Compilation --> <!-- Compilation -->

View File

@ -1,6 +1,6 @@
Name: beust-jcommander Name: beust-jcommander
Version: 1.71 Version: 1.78
Release: 7%{?dist} Release: 1%{?dist}
Summary: Java framework for parsing command line parameters Summary: Java framework for parsing command line parameters
License: ASL 2.0 License: ASL 2.0
URL: http://jcommander.org/ URL: http://jcommander.org/
@ -10,14 +10,13 @@ BuildArch: noarch
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
# Adapted from earlier version that still shipped poms. It uses kobalt for building now # Adapted from earlier version that still shipped poms. It uses kobalt for building now
Source1: %{name}.pom 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 Source2: generate-tarball.sh
Patch0: 0001-ParseValues-NullPointerException-patch.patch Patch0: 0001-ParseValues-NullPointerException-patch.patch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng)
%description %description
@ -31,7 +30,7 @@ Summary: API documentation for %{name}
This package contains the %{summary}. This package contains the %{summary}.
%prep %prep
%setup -q -n jcommander-%{version} %setup -q
%patch0 -p1 %patch0 -p1
chmod -x license.txt chmod -x license.txt
@ -52,6 +51,10 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml
%doc license.txt notice.md %doc license.txt notice.md
%changelog %changelog
* Sat Nov 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.78-1
- Update to version 1.78.
- Remove unnecessary parent from POM file.
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-7 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - 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 <jcapik@redhat.com> - 1.17-1 * Fri May 13 2011 Jaromir Capik <jcapik@redhat.com> - 1.17-1
- Initial version of the package - Initial version of the package

View File

@ -1,20 +1,26 @@
#!/bin/bash #!/bin/bash
set -e 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)" version="$(sed -n 's/Version:\s*//p' *.spec)"
# RETRIEVE # Retrieve and set version
wget "https://github.com/cbeust/jcommander/archive/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" git clone https://github.com/cbeust/jcommander.git
rm -rf tarball-tmp pushd jcommander
mkdir tarball-tmp git reset --hard "${git_tag}"
cd tarball-tmp
tar xf "../${name}-${version}.orig.tar.gz"
# CLEAN TARBALL # Clean
rm -r */gradle* */kobalt* */lib find -name '*.jar' -delete
find -name '*.class' -delete
rm -rf gradle* kobalt* lib
rm -rf .git
popd
tar cf "../${name}-${version}.tar.gz" * # Pack into tarball
cd .. mv jcommander beust-jcommander-"${version}"
rm -r tarball-tmp "${name}-${version}.orig.tar.gz" tar -cvf beust-jcommander-"${version}".tar.gz beust-jcommander-"${version}"/
rm -rf beust-jcommander-"${version}"

View File

@ -1 +1 @@
SHA512 (beust-jcommander-1.71.tar.gz) = a3f7061f3afacd57092f62b9f8540a1f1e210ad6efc7f41ae10cee725a546b4cdcecee4a4f7056224936a59be18b11f2547002ec18be36626847b79a27a081d1 SHA512 (beust-jcommander-1.78.tar.gz) = 618367d1644bf0423c3184bd4a6be73571c1b2de243bb7dad4e72d5a3023bf30116c0e5337088e0e4d1f42f24ba94b0fddaedcd3e54613c335d068edeaddfaef