From c2190c548bfef06666830aa0dab5cbfaf0f93375 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jun 26 2013 22:57:17 +0000 Subject: Update to latest upstream, fixes #808703 - Also drop unneeded patches --- diff --git a/.gitignore b/.gitignore index 5c3f7e7..62c39ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /args4j-2.0.16.tar.xz +/args4j-site-2.0.23.tar.gz diff --git a/args4j-ant-removal.patch b/args4j-ant-removal.patch deleted file mode 100644 index 04bf172..0000000 --- a/args4j-ant-removal.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur args4j-2.0.16.orig/args4j-tools/pom.xml args4j-2.0.16/args4j-tools/pom.xml ---- args4j-2.0.16.orig/args4j-tools/pom.xml 2011-05-25 12:46:31.050860242 +0200 -+++ args4j-2.0.16/args4j-tools/pom.xml 2011-05-25 12:46:43.482443326 +0200 -@@ -38,11 +38,11 @@ - - - -- -+ - - args4j - args4j diff --git a/args4j-osgi.patch b/args4j-osgi.patch deleted file mode 100644 index cc39382..0000000 --- a/args4j-osgi.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur args4j-2.0.16.orig/args4j/pom.xml args4j-2.0.16/args4j/pom.xml ---- args4j-2.0.16.orig/args4j/pom.xml 2009-09-04 02:27:09.000000000 +0200 -+++ args4j-2.0.16/args4j/pom.xml 2011-06-13 18:51:15.000000000 +0200 -@@ -8,7 +8,8 @@ - - args4j - args4j -- -+ bundle -+ - - src - test -@@ -29,6 +30,13 @@ - - - -+ -+ -+ org.apache.felix -+ maven-bundle-plugin -+ true -+ -+ - - - -diff -Naur args4j-2.0.16.orig/args4j-tools/pom.xml args4j-2.0.16/args4j-tools/pom.xml ---- args4j-2.0.16.orig/args4j-tools/pom.xml 2011-06-13 18:53:04.000000000 +0200 -+++ args4j-2.0.16/args4j-tools/pom.xml 2011-06-13 18:52:27.000000000 +0200 -@@ -10,6 +10,7 @@ - args4j-tools - args4j-tools - development-time tool for generating additional artifacits -+ bundle - - - src -@@ -35,6 +36,11 @@ - - - -+ -+ org.apache.felix -+ maven-bundle-plugin -+ true -+ - - - diff --git a/args4j-srcencoding.patch b/args4j-srcencoding.patch deleted file mode 100644 index e32244f..0000000 --- a/args4j-srcencoding.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff --git a/args4j/src/org/kohsuke/args4j/ClassParser.java b/args4j/src/org/kohsuke/args4j/ClassParser.java -index 1f25aa3..047415e 100644 ---- a/args4j/src/org/kohsuke/args4j/ClassParser.java -+++ b/args4j/src/org/kohsuke/args4j/ClassParser.java -@@ -11,7 +11,7 @@ - * - * This can be used to feed option bindings that span across multiple instances. - * -- * @author Jan Mat�rne -+ * @author Jan Materne - */ - public class ClassParser { - public void parse(Object bean, CmdLineParser parser) { -diff --git a/args4j/src/org/kohsuke/args4j/Config.java b/args4j/src/org/kohsuke/args4j/Config.java -index bf594b6..0aa5888 100644 ---- a/args4j/src/org/kohsuke/args4j/Config.java -+++ b/args4j/src/org/kohsuke/args4j/Config.java -@@ -17,7 +17,7 @@ - * Metadataconfiguration. - * This class holds all metadata for a class, mainly a list of @Options and @Arguments. - * -- * @author Jan Mat�rne -+ * @author Jan Materne - */ - public class Config { - -@@ -31,7 +31,7 @@ - /** - * The ConfigElement is an <option> or <argument> tag - * in the xml configuration file. -- * @author Jan Mat�rne -+ * @author Jan Materne - */ - public class ConfigElement { - public String field; -@@ -54,7 +54,7 @@ public boolean isInvalid() { - - /** - * SAX-Handler for reading the configuration file. -- * @author Jan Mat�rne -+ * @author Jan Materne - */ - public class ConfigHandler extends DefaultHandler { - public ConfigHandler(Config config) { -diff --git a/args4j/src/org/kohsuke/args4j/Messages_de_DE.properties b/args4j/src/org/kohsuke/args4j/Messages_de_DE.properties -index ab51cee..8483207 100644 ---- a/args4j/src/org/kohsuke/args4j/Messages_de_DE.properties -+++ b/args4j/src/org/kohsuke/args4j/Messages_de_DE.properties -@@ -1,17 +1,25 @@ -+# Unicode for Umlauts -+# Ae, ae \u00c4, \u00e4 -+# Oe, oe \u00d6, \u00f6 -+# Ue, ue \u00dc, \u00fc -+# ss \u00df -+ -+ -+ - MISSING_OPERAND = \ -- Option "{0}" ben�tigt einen Operanden -+ Option "{0}" ben\u00f6tigt einen Operanden - - UNDEFINED_OPTION = \ -- "{0}" ist keine g�ltige Option -+ "{0}" ist keine g\u00fcltige Option - - NO_ARGUMENT_ALLOWED = \ - Kein Argument erlaubt: {0} - - REQUIRED_OPTION_MISSING = \ -- Option "{0}" wird ben�tigt -+ Option "{0}" wird ben\u00f6tigt - - REQUIRED_ARGUMENT_MISSING = \ -- Argument "{0}" wird ben�tigt -+ Argument "{0}" wird ben\u00f6tigt - - TOO_MANY_ARGUMENTS = \ - Zu viele Argumente: {0} -diff --git a/args4j/src/org/kohsuke/args4j/XmlParser.java b/args4j/src/org/kohsuke/args4j/XmlParser.java -index d4fd9b6..eb51bb9 100644 ---- a/args4j/src/org/kohsuke/args4j/XmlParser.java -+++ b/args4j/src/org/kohsuke/args4j/XmlParser.java -@@ -37,7 +37,7 @@ - * <args> - * - * -- * @author Jan Mat�rne -+ * @author Jan Materne - */ - public class XmlParser { - public void parse(URL xml, CmdLineParser parser, Object bean) { -diff -up args4j-2.0.16/args4j/src/org/kohsuke/args4j/XmlParser.java~ args4j-2.0.16/args4j/src/org/kohsuke/args4j/XmlParser.java ---- args4j-2.0.16/args4j/src/org/kohsuke/args4j/XmlParser.java~ 2012-02-01 00:25:06.619059734 +0200 -+++ args4j-2.0.16/args4j/src/org/kohsuke/args4j/XmlParser.java 2012-02-01 00:28:06.611756117 +0200 -@@ -95,7 +95,7 @@ public class XmlParser { - - /** - * Implementation of @Option so we can instantiate it. -- * @author Jan Mat�rne -+ * @author Jan Materne - */ - class OptionImpl extends AnnotationImpl implements Option { - protected OptionImpl(ConfigElement ce) throws ClassNotFoundException { -@@ -111,7 +111,7 @@ public class XmlParser { - - /** - * Implementation of @Argument so we can instantiate it. -- * @author Jan Mat�rne -+ * @author Jan Materne - */ - class ArgumentImpl extends AnnotationImpl implements Argument { - protected ArgumentImpl(ConfigElement ce) throws ClassNotFoundException { -@@ -122,7 +122,7 @@ public class XmlParser { - - /** - * Base class for the @Option and @Argument implementation classes. -- * @author Jan Mat�rne -+ * @author Jan Materne - */ - class AnnotationImpl { - protected AnnotationImpl(ConfigElement ce) throws ClassNotFoundException { diff --git a/args4j-wagon-svn-removal.patch b/args4j-wagon-svn-removal.patch deleted file mode 100644 index 2389c27..0000000 --- a/args4j-wagon-svn-removal.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur args4j-2.0.16.orig/pom.xml args4j-2.0.16/pom.xml ---- args4j-2.0.16.orig/pom.xml 2009-09-04 02:27:10.000000000 +0200 -+++ args4j-2.0.16/pom.xml 2011-05-24 13:58:15.362209221 +0200 -@@ -67,13 +67,13 @@ - - - -- -+ - - - diff --git a/args4j.spec b/args4j.spec index 16fd3bf..0c720db 100644 --- a/args4j.spec +++ b/args4j.spec @@ -3,30 +3,24 @@ Name: args4j %global tools_name %{name}-tools %global site_name %{name}-site -Version: 2.0.16 -Release: 11%{?dist} +Version: 2.0.23 +Release: 1%{?dist} Summary: Small Java lib that makes it easy to parse command line options/args in CUI apps License: MIT and BSD Group: Development/Libraries # http://args4j.java.net/ URL: http://%{name}.java.net/ -# Upload Your personal ssh key to java.net (otherwise the export fails) -# svn export https://svn.java.net/svn/args4j~svn/tags/args4j-site-2_0_16 args4j-2.0.16 -# tar caf args4j-2.0.16.tar.xz args4j-2.0.16 -Source0: %{name}-%{version}.tar.xz - -Patch0: %{name}-wagon-svn-removal.patch -Patch1: %{name}-ant-removal.patch -Patch2: %{name}-osgi.patch -# https://github.com/kohsuke/args4j/commit/fc85e79 + some additions -Patch3: %{name}-srcencoding.patch +Source0: https://github.com/kohsuke/%{name}/archive/%{site_name}-%{version}.tar.gz BuildArch: noarch BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: maven-local -BuildRequires: maven-surefire-provider-junit +BuildRequires: maven-dependency-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-shade-plugin +BuildRequires: mockito Requires: java Requires: jpackage-utils @@ -52,23 +46,22 @@ Requires: jpackage-utils This package contains the API documentation for %{name}. %prep -%setup -q - -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%setup -q -n %{name}-%{site_name}-%{version} # removing classpath addition sed -i 's/true/false/g' %{tools_name}/pom.xml +# fix ant group id +sed -i 's/ant/org.apache.ant/g' %{tools_name}/pom.xml + # removing bundled stuff -rm -rf repo -rm -rf www -rm -rf %{name}/lib +find -name '*.class' -exec rm -f '{}' \; +find -name '*.jar' -exec rm -f '{}' \; + +%pom_xpath_remove "pom:parent" %build -mvn-rpmbuild install javadoc:aggregate +mvn-rpmbuild -pl :args4j-site,:args4j,:args4j-tools install javadoc:aggregate %install # jars @@ -104,6 +97,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Thu Jun 27 2013 Mat Booth - 2.0.23-1 +- Update to latest upstream, fixes #808703 +- Also drop unneeded patches + * Wed Feb 13 2013 Fedora Release Engineering - 2.0.16-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 5a3f86e..717a727 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b765c9c25789884cb982e7c8fefc0de0 args4j-2.0.16.tar.xz +3cc3de3c67b26afdbe4c8c23827b2463 args4j-site-2.0.23.tar.gz