From 36807a5644eae7bb39d1acf5d343da5152fc82c6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 23 2015 07:40:57 +0000 Subject: import devtoolset-3-args4j-2.0.30-3.el7 --- diff --git a/.devtoolset-3-args4j.metadata b/.devtoolset-3-args4j.metadata index ec2954e..856edd5 100644 --- a/.devtoolset-3-args4j.metadata +++ b/.devtoolset-3-args4j.metadata @@ -1 +1 @@ -477339c61e16ddc284e6bbca2341803614d0e4b5 SOURCES/args4j-site-2.0.28.tar.gz +3a7e3974c9324f4bebfd360fcd8baffdc5ade60a SOURCES/args4j-site-2.0.30.tar.gz diff --git a/.gitignore b/.gitignore index 5ed407b..afc9cc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/args4j-site-2.0.28.tar.gz +SOURCES/args4j-site-2.0.30.tar.gz diff --git a/SPECS/args4j.spec b/SPECS/args4j.spec index 05b4ce8..73a4842 100644 --- a/SPECS/args4j.spec +++ b/SPECS/args4j.spec @@ -1,10 +1,11 @@ %{?scl:%scl_package args4j} %{!?scl:%global pkg_name %{name}} -%{!?maven_scl:%global maven_scl_prefix %{nil}} + +%{?java_common_find_provides_and_requires} Name: %{?scl_prefix}args4j -Version: 2.0.28 -Release: 1%{?dist} +Version: 2.0.30 +Release: 3%{?dist} Summary: Java command line arguments parser License: MIT URL: http://args4j.kohsuke.org/ @@ -12,13 +13,12 @@ Source0: https://github.com/kohsuke/%{pkg_name}/archive/%{pkg_name}-site- BuildArch: noarch -BuildRequires: %{?maven_scl_prefix}maven-local -BuildRequires: %{?maven_scl_prefix}mvn(com.sun:tools) -BuildRequires: mvn(junit:junit) -BuildRequires: %{?maven_scl_prefix}mvn(org.apache.ant:ant) -BuildRequires: %{?maven_scl_prefix}mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: %{?maven_scl_prefix}mvn(org.apache.maven.plugins:maven-shade-plugin) -BuildRequires: %{?maven_scl_prefix}mvn(org.apache.maven.plugins:maven-site-plugin) +BuildRequires: %{?scl_prefix_java_common}maven-local +BuildRequires: %{?scl_prefix_java_common}mvn(com.sun:tools) +BuildRequires: %{?scl_prefix_java_common}mvn(junit:junit) +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.maven.plugins:maven-site-plugin) %description args4j is a small Java class library that makes it easy @@ -30,15 +30,28 @@ to parse command line options/arguments in your CUI application. - It is designed to parse javac like options (as opposed to GNU-style where ls -lR is considered to have two options l and R) +%package tools +Summary: Development-time tool for generating additional artifacits + +%description tools +This package contains args4j development-time tool for generating +additional artifacits. + +%package parent +Summary: args4j parent POM + +%description parent +This package contains parent POM for args4j project. + %package javadoc -Summary: API documentation for %{name} +Summary: API documentation for %{pkg_name} %description javadoc -This package contains the API documentation for %{name}. +This package contains the API documentation for %{pkg_name}. %prep %setup -q -n %{pkg_name}-%{pkg_name}-site-%{version} -%{?scl:scl enable %{scl} - <<"EOF"} + # removing classpath addition sed -i 's/true/false/g' %{pkg_name}-tools/pom.xml @@ -49,6 +62,7 @@ sed -i 's/ant/org.apache.ant/g' %{pkg_name}-tools/pom.xml find -name '*.class' -exec rm -f '{}' \; find -name '*.jar' -exec rm -f '{}' \; +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} # XMvn cannot generate requires on dependecies with scope "system" %pom_xpath_remove "pom:profile[pom:id[text()='jdk-tools-jar']]" %{pkg_name}-tools %pom_add_dep com.sun:tools %{pkg_name}-tools @@ -56,31 +70,54 @@ find -name '*.jar' -exec rm -f '{}' \; # we don't need these now %pom_disable_module args4j-maven-plugin %pom_disable_module args4j-maven-plugin-example + +# Avoid koshuke-pom and mockito +%pom_remove_dep org.mockito:mockito-all %{pkg_name}-tools %pom_remove_parent +# put args4j-tools and parent POM to separate subpackages +%mvn_package :args4j-tools::{}: %{pkg_name}-tools +%mvn_package :args4j-site::{}: %{pkg_name}-parent + # install also compat symlinks %mvn_file ":{*}" %{pkg_name}/@1 @1 %{?scl:EOF} %build -%{?scl:scl enable %{scl} - <<"EOF"} -%mvn_build -f +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_build -- -Dmaven.test.skip=true %{?scl:EOF} %install -%{?scl:scl enable %{scl} - <<"EOF"} +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %mvn_install %{?scl:EOF} - %files -f .mfiles %dir %{_javadir}/%{pkg_name} %doc %{pkg_name}/LICENSE.txt +%files tools -f .mfiles-%{pkg_name}-tools + +%files parent -f .mfiles-%{pkg_name}-parent +%doc %{pkg_name}/LICENSE.txt + %files javadoc -f .mfiles-javadoc %doc %{pkg_name}/LICENSE.txt %changelog +* Thu Jan 15 2015 Roland Grunberg - 2.0.30-3 +- SCL-ize. + +* Mon Sep 22 2014 Michal Srb - 2.0.30-2 +- Move args4j-tools and parent POM into subpackages (Resolves: #1144991) + +* Mon Sep 01 2014 Michal Srb - 2.0.30-1 +- Update to upstream version 2.0.30 + +* Sat Jun 07 2014 Fedora Release Engineering - 2.0.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon May 12 2014 Michal Srb - 2.0.28-1 - Update to upstream version 2.0.28