commit c2190c548bfef06666830aa0dab5cbfaf0f93375 Author: Mat Booth fedora@matbooth.co.uk Date: Wed Jun 26 23:57:17 2013 +0100
Update to latest upstream, fixes #808703
- Also drop unneeded patches
.gitignore | 1 + args4j-ant-removal.patch | 17 ------ args4j-osgi.patch | 50 ---------------- args4j-srcencoding.patch | 121 ---------------------------------------- args4j-wagon-svn-removal.patch | 19 ------ args4j.spec | 43 +++++++-------- sources | 2 +- 7 files changed, 22 insertions(+), 231 deletions(-) --- 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.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://%%7Bname%7D.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/%%7Bname%7D/archive/%%7Bsite_name%7D-%%7Bversion%...
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/<addClasspath>true/<addClasspath>false/g' %{tools_name}/pom.xml
+# fix ant group id +sed -i 's/<groupId>ant/<groupId>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 fedora@matbooth.co.uk - 2.0.23-1 +- Update to latest upstream, fixes #808703 +- Also drop unneeded patches + * Wed Feb 13 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 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
java-sig-commits@lists.fedoraproject.org