From 593b2691d8149ac03c4c8e5f87f76b73599c94caabac93dcc6b99f0430d02712 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 6 Nov 2013 14:08:27 +0000 Subject: [PATCH] - Remove jakarta-commons-httpclient3, we do no longer provide it - Add ant.d config snippet for ivy - call add_maven_depmap OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=18 --- apache-ivy.changes | 7 ++ apache-ivy.spec | 43 ++++++------- ivy-2.3.0.pom | 157 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+), 24 deletions(-) create mode 100644 ivy-2.3.0.pom diff --git a/apache-ivy.changes b/apache-ivy.changes index 36f99b3..26c19e4 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 6 10:58:10 UTC 2013 - mvyskocil@suse.com + +- Remove jakarta-commons-httpclient3, we do no longer provide it +- Add ant.d config snippet for ivy +- call add_maven_depmap + ------------------------------------------------------------------- Mon Sep 9 11:04:12 UTC 2013 - tchvatal@suse.com diff --git a/apache-ivy.spec b/apache-ivy.spec index 2b12a7d..9557204 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -26,6 +26,7 @@ Group: Development/Tools/Building Url: http://ant.apache.org/ivy/ Source0: %{name}-%{version}-src.tar.gz Source1: ivy.1 +Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -33,12 +34,8 @@ Provides: ivy = %{version}-%{release} BuildRequires: ant BuildRequires: ant-nodeps -%if 0%{?suse_version} -BuildRequires: jakarta-commons-httpclient3 -%else -BuildRequires: commons-httpclient -%endif BuildRequires: bouncycastle +BuildRequires: commons-httpclient BuildRequires: java-devel >= 1.5 BuildRequires: javapackages-tools BuildRequires: jsch @@ -90,47 +87,45 @@ sed '/vfs.*=.*org.apache.ivy.plugins.resolver.VfsResolver/d' -i \ # Craft class path mkdir -p lib -build-jar-repository lib ant ant/ant-nodeps oro jsch \ -%if 0%{?suse_version} -jakarta-commons-httpclient3 -%else -commons-httpclient -%endif +build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient # Build ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc %install # Code -install -d $RPM_BUILD_ROOT%{_javadir} -install -p -m644 build/artifact/jars/ivy.jar $RPM_BUILD_ROOT%{_javadir}/ivy-%{version}.jar -ln -sf ivy-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ivy.jar +install -d %{buildroot}%{_javadir} +install -p -m644 build/artifact/jars/ivy.jar %{buildroot}%{_javadir}/ivy.jar + +install -d -m 0755 %{buildroot}/%{_mavenpomdir}/ +install -m 0644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom +# Maven depmap +%add_maven_depmap JPP-ivy.pom ivy.jar # API Documentation -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -rp build/doc/reports/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d %{buildroot}%{_javadocdir}/%{name} +cp -rp build/doc/reports/api/. %{buildroot}%{_javadocdir}/%{name} # 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 + +mkdir -p %{buildroot}%{_sysconfdir}/ant.d +echo "ivy" > %{buildroot}%{_sysconfdir}/ant.d/%{name} # Man page install -d ${RPM_BUILD_ROOT}%{_mandir}/man1 install %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1/ivy.1 -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) -%{_javadir}/* %doc RELEASE_NOTES CHANGES.txt LICENSE NOTICE README +%config %{_sysconfdir}/ant.d/%{name} +%{_javadir}/ivy.jar %attr(755,root,root) %{_bindir}/* %attr(644,root,root) %{_mandir}/man1/* +%{_mavenpomdir}/JPP-ivy.pom +%{_mavendepmapfragdir}/%{name} %files javadoc %defattr(-,root,root,-) diff --git a/ivy-2.3.0.pom b/ivy-2.3.0.pom new file mode 100644 index 0000000..10ee384 --- /dev/null +++ b/ivy-2.3.0.pom @@ -0,0 +1,157 @@ + + + + + 4.0.0 + + org.apache + apache + 7 + + org.apache.ivy + ivy + 2.3.0 + Apache Ivy + http://ant.apache.org/ivy/ + + scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/ + scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk + http://svn.apache.org/repos/asf/ant/ivy/core/trunk + + + + Ant/Ivy Developers List + dev-subscribe@ant.apache.org + dev-unsubscribe@ant.apache.org + dev@ant.apache.org + http://mail-archives.apache.org/mod_mbox/ant-dev + + + Ivy Users List + ivy-user-subscribe@ant.apache.org + ivy-user-unsubscribe@ant.apache.org + ivy-user@ant.apache.org + http://mail-archives.apache.org/mod_mbox/ant-ivy-user + + + + jira + http://issues.apache.org/jira/browse/IVY + + + + org.apache.ant + ant + 1.7.1 + true + + + org.apache.ant + ant-nodeps + 1.7.1 + true + + + org.apache.ant + ant-trax + 1.7.1 + true + + + commons-httpclient + commons-httpclient + 3.0 + true + + + oro + oro + 2.0.8 + true + + + commons-vfs + commons-vfs + 1.0 + true + + + com.jcraft + jsch + 0.1.31 + true + + + org.bouncycastle + bcpg-jdk14 + 1.45 + true + + + org.bouncycastle + bcprov-jdk14 + 1.45 + true + + + junit + junit + 3.8.2 + test + + + commons-lang + commons-lang + 2.6 + test + + + org.apache.ant + ant-testutil + 1.7.0 + test + + + ant + ant-launcher + 1.6.2 + test + + + ant-contrib + ant-contrib + 1.0b3 + test + + + xerces + xercesImpl + 2.6.2 + test + + + xerces + xmlParserAPIs + 2.6.2 + test + + +