From 81bc75eff192fd9b3b550ed987491fdc6b3d87ac6a7b737e1872f297547b022e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 2 Feb 2015 10:17:14 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=23 --- apache-ivy-2.3.0-src.tar.gz | 3 - apache-ivy-2.4.0-src.tar.gz | 3 + apache-ivy.spec | 8 +- ivy-2.3.0.pom => ivy-2.4.0.pom | 350 ++++++++++++++++++--------------- 4 files changed, 200 insertions(+), 164 deletions(-) delete mode 100644 apache-ivy-2.3.0-src.tar.gz create mode 100644 apache-ivy-2.4.0-src.tar.gz rename ivy-2.3.0.pom => ivy-2.4.0.pom (82%) diff --git a/apache-ivy-2.3.0-src.tar.gz b/apache-ivy-2.3.0-src.tar.gz deleted file mode 100644 index 4528df5..0000000 --- a/apache-ivy-2.3.0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20f9ba64b6f24328497394d8b3e24b8e15e12ad230958be9c76d6f8cccf081de -size 2790722 diff --git a/apache-ivy-2.4.0-src.tar.gz b/apache-ivy-2.4.0-src.tar.gz new file mode 100644 index 0000000..ea0453b --- /dev/null +++ b/apache-ivy-2.4.0-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:202f08ca41f4bdf1c081aa8b2e531565be6c73e9e5e0d68137f454f14eb16ef6 +size 3616939 diff --git a/apache-ivy.spec b/apache-ivy.spec index 88a4bdd..5021112 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,7 +1,7 @@ # # spec file for package apache-ivy # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,15 @@ Name: apache-ivy -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Java-based dependency manager License: Apache-2.0 Group: Development/Tools/Building Url: http://ant.apache.org/ivy/ -Source0: %{name}-%{version}-src.tar.gz +Source0: http://www.apache.org/dist/ant/ivy/%{version}/%{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 +Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}.pom BuildRequires: ant BuildRequires: bouncycastle BuildRequires: commons-httpclient diff --git a/ivy-2.3.0.pom b/ivy-2.4.0.pom similarity index 82% rename from ivy-2.3.0.pom rename to ivy-2.4.0.pom index 10ee384..81116e1 100644 --- a/ivy-2.3.0.pom +++ b/ivy-2.4.0.pom @@ -1,157 +1,193 @@ - - - - - 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 - - - + + + + + 4.0.0 + + org.apache + apache + 7 + + org.apache.ivy + ivy + 2.4.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.50 + true + + + com.jcraft + jsch.agentproxy + 0.0.6 + true + + + com.jcraft + jsch.agentproxy.connector-factory + 0.0.6 + true + + + com.jcraft + jsch.agentproxy.jsch + 0.0.6 + 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 + + + From d51ea6546b129725021ee53b190fc0e697b49964a0e2304772c447397a68544e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 2 Feb 2015 10:25:08 +0000 Subject: [PATCH 2/3] Accepting request 283735 from Java:packages OBS-URL: https://build.opensuse.org/request/show/283735 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=24 --- apache-ivy-2.3.0-src.tar.gz | 3 + apache-ivy-2.4.0-src.tar.gz | 3 - apache-ivy.spec | 8 +- ivy-2.4.0.pom => ivy-2.3.0.pom | 350 +++++++++++++++------------------ 4 files changed, 164 insertions(+), 200 deletions(-) create mode 100644 apache-ivy-2.3.0-src.tar.gz delete mode 100644 apache-ivy-2.4.0-src.tar.gz rename ivy-2.4.0.pom => ivy-2.3.0.pom (82%) diff --git a/apache-ivy-2.3.0-src.tar.gz b/apache-ivy-2.3.0-src.tar.gz new file mode 100644 index 0000000..4528df5 --- /dev/null +++ b/apache-ivy-2.3.0-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20f9ba64b6f24328497394d8b3e24b8e15e12ad230958be9c76d6f8cccf081de +size 2790722 diff --git a/apache-ivy-2.4.0-src.tar.gz b/apache-ivy-2.4.0-src.tar.gz deleted file mode 100644 index ea0453b..0000000 --- a/apache-ivy-2.4.0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:202f08ca41f4bdf1c081aa8b2e531565be6c73e9e5e0d68137f454f14eb16ef6 -size 3616939 diff --git a/apache-ivy.spec b/apache-ivy.spec index 5021112..88a4bdd 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,7 +1,7 @@ # # spec file for package apache-ivy # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,15 +17,15 @@ Name: apache-ivy -Version: 2.4.0 +Version: 2.3.0 Release: 0 Summary: Java-based dependency manager License: Apache-2.0 Group: Development/Tools/Building Url: http://ant.apache.org/ivy/ -Source0: http://www.apache.org/dist/ant/ivy/%{version}/%{name}-%{version}-src.tar.gz +Source0: %{name}-%{version}-src.tar.gz Source1: ivy.1 -Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}.pom +Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom BuildRequires: ant BuildRequires: bouncycastle BuildRequires: commons-httpclient diff --git a/ivy-2.4.0.pom b/ivy-2.3.0.pom similarity index 82% rename from ivy-2.4.0.pom rename to ivy-2.3.0.pom index 81116e1..10ee384 100644 --- a/ivy-2.4.0.pom +++ b/ivy-2.3.0.pom @@ -1,193 +1,157 @@ - - - - - 4.0.0 - - org.apache - apache - 7 - - org.apache.ivy - ivy - 2.4.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.50 - true - - - com.jcraft - jsch.agentproxy - 0.0.6 - true - - - com.jcraft - jsch.agentproxy.connector-factory - 0.0.6 - true - - - com.jcraft - jsch.agentproxy.jsch - 0.0.6 - 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 - - - + + + + + 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 + + + From 0972a0a44b2de8cfc0343bd8fe91883e0cd58f99f8ce2cef5719dad60e778f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 18 Mar 2015 10:06:03 +0000 Subject: [PATCH 3/3] new jpackage-tools OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=25 --- apache-ivy.changes | 5 +++++ apache-ivy.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apache-ivy.changes b/apache-ivy.changes index 795c744..548ccf0 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 18 09:46:01 UTC 2015 - tchvatal@suse.com + +- Fix build with new javapackages-tools + ------------------------------------------------------------------- Tue Jul 8 11:01:30 UTC 2014 - tchvatal@suse.com diff --git a/apache-ivy.spec b/apache-ivy.spec index 88a4bdd..7a1c44e 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,7 +1,7 @@ # # spec file for package apache-ivy # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -58,7 +58,7 @@ JavaDoc documentation for %{name} %setup -q # Fix messed-up encodings -for F in RELEASE_NOTES README LICENSE NOTICE CHANGES.txt +for F in README LICENSE NOTICE do sed 's/\r//' $F |iconv -f iso8859-1 -t utf8 >$F.utf8 touch -r $F $F.utf8 @@ -119,7 +119,7 @@ install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1 %attr(755,root,root) %{_bindir}/* %attr(644,root,root) %{_mandir}/man1/* %{_mavenpomdir}/JPP-ivy.pom -%{_mavendepmapfragdir}/%{name} +%{_datadir}/maven-metadata/%{name}.xml %files javadoc %defattr(-,root,root,-)