Accepting request 146891 from Java:packages

- Define ${target.ivy.version} during build
- Include an ivy(1) command line script and man page (forwarded request 146847 from archie172)

OBS-URL: https://build.opensuse.org/request/show/146891
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-ivy?expand=0&rev=3

apache-ivy.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan  2 17:08:16 UTC 2013 - archie@dellroad.org
+
+- Define ${target.ivy.version} during build
+- Include an ivy(1) command line script and man page
+
 -------------------------------------------------------------------
 Mon Jan 16 14:55:55 UTC 2012 - mvyskocil@suse.cz
 

apache-ivy.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-ivy
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@ Group:          Development/Tools/Building
 Url:            http://ant.apache.org/ivy/
 #Source0:        http://www.apache.org/dist/ant/ivy/2.1.0/%{name}-%{version}-src.tar.gz
 Source0:        %{name}-%{version}-src.tar.gz
+Source1:        ivy.1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -98,7 +99,7 @@ commons-httpclient
 %endif
 
 # Build
-ant /localivy /offline jar javadoc
+ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc
 
 %install
 # Code
@@ -110,6 +111,18 @@ ln -sf ivy-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ivy.jar
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -rp build/doc/reports/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
+# Command line script
+MAIN_CLASS=`sed -rn 's/^Main-Class: (.*)$/\1/gp' META-INF/MANIFEST.MF | tr -d '\r'`
+%if 0%{?suse_version}
+%jpackage_script "${MAIN_CLASS}" "" "" ant:ant/ant-nodeps:ivy:oro:jsch:jakarta-commons-httpclient3 ivy
+%else
+%jpackage_script "${MAIN_CLASS}" "" "" ant:ant/ant-nodeps:ivy:oro:jsch:commons-httpclient ivy
+%endif
+
+# Man page
+install -d ${RPM_BUILD_ROOT}%{_mandir}/man1
+install %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1/ivy.1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -117,6 +130,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_javadir}/*
 %doc RELEASE_NOTES CHANGES.txt LICENSE NOTICE README
+%attr(755,root,root) %{_bindir}/*
+%attr(644,root,root) %{_mandir}/man1/*
 
 %files javadoc
 %defattr(-,root,root,-)

ivy.1

@@ -0,0 +1,128 @@
+.\"  -*- nroff -*-
+.\"
+.Dd January 2, 2013
+.Dt IVY 1
+.Os
+.Sh NAME
+.Nm ivy
+.Nd Ivy depedency manager
+.Sh SYNOPSIS
+.Nm ivy
+.Bk -words
+.Op options ...
+.Ek
+.Sh DESCRIPTION
+.Nm
+invokes the Ivy dependency manager from the command line.
+.Sh OPTIONS
+.Ss Settings Options
+.Bl -tag -width Ds
+.It Fl settings Ar settingsfile
+Use given file for settings.
+.It Fl cache Ar cachedir
+Use given directory for cache.
+.It Fl novalidate
+Do not validate ivy files against xsd.
+.It Fl m2compatible
+Use maven2 compatibility.
+.El
+.Ss Resolve Options
+.Bl -tag -width Ds
+.It Fl ivy Ar ivyfile
+Use given file as ivy file.
+.It Fl refresh
+Refresh dynamic resolved revisions.
+.It Fl dependency Ar organisation Ar module Ar revision 
+Use this instead of ivy file to do the rest of the
+work with this as a dependency.
+.It Fl confs Ar configurations
+Resolve given configurations.
+.It Fl types Ar types
+Comma separated list of accepted artifact types.
+.It Fl mode Ar resolvemode
+The resolve mode to use.
+.It Fl notransitive
+Do not resolve dependencies transitively.
+.El
+.Ss Retrieve Options
+.Bl -tag -width Ds
+.It Fl retrieve Ar retrievepattern
+Use given pattern as retrieve pattern.
+.It Fl ivypattern Ar pattern
+Use given pattern to copy the ivy files.
+.It Fl sync
+Use sync mode for retrieve.
+.It Fl symlink
+Create symbolic links.
+.El
+.Ss Cache Path Options
+.Bl -tag -width Ds
+.It Fl cachepath Ar cachepathfile
+Outputs a classpath consisting of all dependencies
+in cache (including transitive ones) of the given
+ivy file to the given
+.Ar cachepathfile .
+.El
+.Ss Deliver Options
+.Bl -tag -width Ds
+.It Fl deliverto Ar ivypattern
+Use given pattern as resolved ivy file pattern.
+.El
+.Ss Publish Options
+.Bl -tag -width Ds
+.It Fl publish Ar resolvername
+Use given resolver to publish to.
+.It Fl publishpattern Ar artpattern
+Use given pattern to find artifacts to publish.
+.It Fl revision Ar revision
+Use given revision to publish the module.
+.It Fl status Ar status
+Use given status to publish the module.
+.It Fl overwrite
+Overwrite files in the repository if they exist.
+.El
+.Ss HTTP Auth Options
+.Bl -tag -width Ds
+.It Fl realm Ar realm
+Use given realm for HTTP AUTH.
+.It Fl host Ar host
+Use given host for HTTP AUTH.
+.It Fl username Ar username
+Use given username for HTTP AUTH.
+.It Fl passwd Ar passwd
+Use given password for HTTP AUTH.
+.El
+.Ss Launcher Options
+.Bl -tag -width Ds
+.It Fl main Ar main
+The FQCN of the main class to launch.
+.It Fl args Ar args
+The arguments to give to the launched process.
+.It Fl cp Ar cp
+Extra classpath to use when launching process.
+.El
+.Ss Message Options
+.Bl -tag -width Ds
+.It Fl debug
+Set message level to debug.
+.It Fl verbose
+Set message level to verbose.
+.It Fl warn
+Set message level to warn.
+.It Fl error
+Set message level to error.
+.El
+.Ss Help Options
+.Bl -tag -width Ds
+.It Fl ?
+Display this help.
+.It Fl deprecated
+Show deprecated options.
+.It Fl version
+Displays version information.
+.El
+.Sh SEE ALSO
+.Rs
+.%T "Ivy: The agile dependency manager"
+.%O http://ant.apache.org/ivy/
+.Re