diff --git a/.args4j.metadata b/.args4j.metadata new file mode 100644 index 0000000..25facb0 --- /dev/null +++ b/.args4j.metadata @@ -0,0 +1 @@ +5fef2d2f88e5caea1cdc654d99e11caa64614f4a SOURCES/args4j-2.0.16.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/args4j-ant-removal.patch b/SOURCES/args4j-ant-removal.patch new file mode 100644 index 0000000..04bf172 --- /dev/null +++ b/SOURCES/args4j-ant-removal.patch @@ -0,0 +1,17 @@ +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/SOURCES/args4j-osgi.patch b/SOURCES/args4j-osgi.patch new file mode 100644 index 0000000..cc39382 --- /dev/null +++ b/SOURCES/args4j-osgi.patch @@ -0,0 +1,50 @@ +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/SOURCES/args4j-srcencoding.patch b/SOURCES/args4j-srcencoding.patch new file mode 100644 index 0000000..e32244f --- /dev/null +++ b/SOURCES/args4j-srcencoding.patch @@ -0,0 +1,121 @@ +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/SOURCES/args4j-wagon-svn-removal.patch b/SOURCES/args4j-wagon-svn-removal.patch new file mode 100644 index 0000000..2389c27 --- /dev/null +++ b/SOURCES/args4j-wagon-svn-removal.patch @@ -0,0 +1,19 @@ +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/SPECS/args4j.spec b/SPECS/args4j.spec new file mode 100644 index 0000000..16fd3bf --- /dev/null +++ b/SPECS/args4j.spec @@ -0,0 +1,136 @@ + +Name: args4j +%global tools_name %{name}-tools +%global site_name %{name}-site + +Version: 2.0.16 +Release: 11%{?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 + +BuildArch: noarch + +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: maven-local +BuildRequires: maven-surefire-provider-junit + +Requires: java +Requires: jpackage-utils + +%description +args4j is a small Java class library that makes it easy +to parse command line options/arguments in your CUI application. +- It makes the command line parsing very easy by using annotations. +- You can generate the usage screen very easily. +- You can generate HTML/XML that lists all options for your documentation. +- Fully supports localization. +- 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.) + +args4j-tools are development-time tools for generating additional artifacits. + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q + +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +# removing classpath addition +sed -i 's/true/false/g' %{tools_name}/pom.xml + +# removing bundled stuff +rm -rf repo +rm -rf www +rm -rf %{name}/lib + +%build +mvn-rpmbuild install javadoc:aggregate + +%install +# jars +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 %{name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -p -m 644 %{tools_name}/target/%{tools_name}-%{version}.jar %{buildroot}%{_javadir}/%{tools_name}.jar + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{site_name}.pom +install -pm 644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +install -pm 644 %{tools_name}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{tools_name}.pom + +%add_maven_depmap JPP-%{site_name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar +%add_maven_depmap JPP-%{tools_name}.pom %{tools_name}.jar + +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} + +%files +%doc %{name}/LICENSE.txt +%{_javadir}/%{name}.jar +%{_javadir}/%{tools_name}.jar +%{_mavenpomdir}/JPP-%{site_name}.pom +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavenpomdir}/JPP-%{tools_name}.pom +%{_mavendepmapfragdir}/%{name} + +%files javadoc +%doc %{name}/LICENSE.txt +%doc %{_javadocdir}/%{name} + +%changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.0.16-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 2.0.16-10 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Dec 13 2012 Roland Grunberg - 2.0.16-9 +- Update to conform with latest Java packaging guidelines. + +* Wed Jul 18 2012 Fedora Release Engineering - 2.0.16-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jan 31 2012 Ville Skyttä - 2.0.16-7 +- Apply upstream source encoding patch to fix build with java 1.7. + +* Thu Jan 12 2012 Fedora Release Engineering - 2.0.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jun 13 2011 Jaromir Capik - 2.0.16-4 +- OSGi metadata generated + +* Mon May 30 2011 Jaromir Capik - 2.0.16-3 +- Removal of bundled stuff in args4j/lib + +* Wed May 25 2011 Jaromir Capik - 2.0.16-2 +- Removal of unused ant dependency + +* Tue May 24 2011 Jaromir Capik - 2.0.16-1 +- Initial version of the package