Compare commits

..

No commits in common. "c8-beta-stream-201801" and "c8-stream-201902" have entirely different histories.

4 changed files with 37 additions and 19 deletions

View File

@ -1 +1 @@
8ba3dc3ac84185a4969e27fa0e985a70352fd2dc SOURCES/beust-jcommander-1.71.tar.gz
13dab46979d9f268d8e2aa1406f84a448096dbde SOURCES/beust-jcommander-1.78.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/beust-jcommander-1.71.tar.gz
SOURCES/beust-jcommander-1.78.tar.gz

View File

@ -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}"

View File

@ -1,6 +1,6 @@
Name: beust-jcommander
Version: 1.71
Release: 5%{?dist}
Version: 1.78
Release: 2%{?dist}
Summary: Java framework for parsing command line parameters
License: ASL 2.0
URL: http://jcommander.org/
@ -10,10 +10,10 @@ 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)
@ -31,7 +31,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 +52,18 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml
%doc license.txt notice.md
%changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.78-2
- Mass rebuild for javapackages-tools 201902
* Mon Sep 02 2019 Marian Koncek <mkoncek@redhat.com> - 1.78-1
- Update to upstream version 1.78
* Thu Aug 15 2019 Marian Koncek <mkoncek@redhat.com> - 1.75-1
- Update to upstream version 1.75
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.71-6
- Mass rebuild for javapackages-tools 201901
* Mon Jul 30 2018 Michael Simacek <msimacek@redhat.com> - 1.71-5
- Repack the tarball without binaries