Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Leap:15.2 checked in at 2020-02-17 17:35:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/jakarta-commons-vfs (Old)
and /work/SRC/openSUSE:Leap:15.2/.jakarta-commons-vfs.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-vfs"
Mon Feb 17 17:35:15 2020 rev:12 rq:774934 version:1.0
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/jakarta-commons-vfs/jakarta-commons-vfs.changes
2020-01-15 15:12:51.886155787 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.jakarta-commons-vfs.new.26092/jakarta-commons-vfs.changes
2020-02-17 17:35:53.412417241 +0100
@@ -1,0 +2,14 @@
+Fri Mar 1 20:27:10 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Install all three built jar files
+- Associate the right pom file with the corresponding artifacts
+- Remove unnecessary sources and simplify the ant build
+
+-------------------------------------------------------------------
+Fri Jan 25 09:29:09 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Remove dependency on jakarta-commons-compress, since nothing
+ in the build needs it
+- Build against javamail and not javamail_1_4_api
+
+-------------------------------------------------------------------
Old:
----
build.xml
commons-build.tar.bz2
commons-vfs-1.0-jpp-depmap.xml
core-build.xml
core-maven-build.xml
examples-build.xml
examples-maven-build.xml
maven-build.xml
pom-maven2jpp-depcat.xsl
pom-maven2jpp-mapdeps.xsl
pom-maven2jpp-newdepmap.xsl
sandbox-build.xml
sandbox-maven-build.xml
New:
----
commons-vfs-1.0-build.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-vfs.spec ++++++
--- /var/tmp/diff_new_pack.0rkYVW/_old 2020-02-17 17:35:53.832418194 +0100
+++ /var/tmp/diff_new_pack.0rkYVW/_new 2020-02-17 17:35:53.832418194 +0100
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-vfs
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -23,22 +23,10 @@
Summary: Commons Virtual Filesystem
License: Apache-2.0
Group: Development/Libraries/Java
-Url: http://jakarta.apache.org/commons/vfs/
+URL: http://jakarta.apache.org/commons/vfs/
# svn export
http://svn.apache.org/repos/asf/jakarta/commons/proper/vfs/tags/vfs-1.0/
Source0: commons-vfs-1.0-src.tar.bz2
-Source1: pom-maven2jpp-depcat.xsl
-Source2: pom-maven2jpp-newdepmap.xsl
-Source3: pom-maven2jpp-mapdeps.xsl
-Source4: commons-vfs-1.0-jpp-depmap.xml
-Source5: commons-build.tar.bz2
-Source6: build.xml
-Source7: maven-build.xml
-Source8: core-build.xml
-Source9: core-maven-build.xml
-Source10: examples-build.xml
-Source11: examples-maven-build.xml
-Source12: sandbox-build.xml
-Source13: sandbox-maven-build.xml
+Source1: commons-vfs-1.0-build.tar.xz
Patch0: commons-vfs-1.0-project_properties.patch
Patch1: commons-vfs-1.0-jakarta-commons-httpclient-3.1.patch
BuildRequires: ant >= 1.6
@@ -47,14 +35,12 @@
BuildRequires: jaf_1_1_api
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-compress
BuildRequires: jakarta-commons-httpclient3
BuildRequires: jakarta-commons-logging
BuildRequires: jakarta-commons-net
BuildRequires: jakarta-slide-webdavclient
-BuildRequires: javamail_1_4_api
+BuildRequires: javamail
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
BuildRequires: jcifs
BuildRequires: jdom
BuildRequires: jsch
@@ -64,12 +50,11 @@
Requires: jaf_1_1_api
Requires: jakarta-commons-codec
Requires: jakarta-commons-collections
-Requires: jakarta-commons-compress
Requires: jakarta-commons-httpclient3
Requires: jakarta-commons-logging
Requires: jakarta-commons-net
Requires: jakarta-slide-webdavclient
-Requires: javamail_1_4_api
+Requires: javamail
Requires: jcifs
Requires: jdom
Requires: jsch
@@ -110,23 +95,17 @@
different types.
%prep
-%setup -q -n vfs-%{version}
-%setup -q -T -D -a 5 -n vfs-%{version}
+%setup -q -n vfs-%{version} -a1
%patch0
%patch1 -p1
find . -name "*.jar" | xargs -t rm
-cp -p %{SOURCE6} %{SOURCE7} .
-cp -p %{SOURCE8} core/build.xml
-cp -p %{SOURCE9} core/maven-build.xml
-cp -p %{SOURCE10} examples/build.xml
-cp -p %{SOURCE11} examples/maven-build.xml
-cp -p %{SOURCE12} sandbox/build.xml
-cp -p %{SOURCE13} sandbox/maven-build.xml
+
+%pom_remove_parent core examples sandbox
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-export CLASSPATH=$(build-classpath commons-collections commons-httpclient3
commons-logging commons-net jaf_1_1_api javamail_1_4_api jcifs jdom jsch junit
slide/jakarta-slide-webdavlib):`pwd`/target/commons-vfs-%{version}.jar:`pwd`/target/test-classes
+export CLASSPATH=$(build-classpath commons-collections commons-httpclient3
commons-logging commons-net jaf_1_1_api javamail/mail jcifs jdom jsch junit
slide/jakarta-slide-webdavlib):`pwd`/target/commons-vfs-%{version}.jar:`pwd`/target/test-classes
export OPT_JAR_LIST="junit ant/ant-junit"
ant \
-Dmaven.build.dir=`pwd`/target \
@@ -143,14 +122,20 @@
%install
# jars
install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 target/%{base_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
-(cd %{buildroot}%{_javadir} && for jar in jakarta-*; do \
-ln -sf ${jar} ${jar/jakarta-/}; done)
-
+install -m 644 target/%{base_name}-%{version}*.jar
%{buildroot}%{_javadir}/%{base_name}.jar
+ln -sf %{base_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 target/%{base_name}-examples-%{version}*.jar
%{buildroot}%{_javadir}/%{base_name}-examples.jar
+ln -sf %{base_name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
+install -m 644 target/%{base_name}-sandbox-%{version}*.jar
%{buildroot}%{_javadir}/%{base_name}-sandbox.jar
+ln -sf %{base_name}-sandbox.jar %{buildroot}%{_javadir}/%{name}-sandbox.jar
#pom
mkdir -p %{buildroot}%{_mavenpomdir}
-install -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+install -m 0644 core/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom
+%add_maven_depmap %{base_name}.pom %{base_name}.jar
+install -m 0644 examples/pom.xml
%{buildroot}%{_mavenpomdir}/%{base_name}-examples.pom
+%add_maven_depmap %{base_name}-examples.pom %{base_name}-examples.jar
+install -m 0644 sandbox/pom.xml
%{buildroot}%{_mavenpomdir}/%{base_name}-sandbox.pom
+%add_maven_depmap %{base_name}-sandbox.pom %{base_name}-sandbox.jar
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@@ -160,11 +145,9 @@
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
-%files
+%files -f .mfiles
%doc *.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_datadir}/maven-metadata/%{name}.xml*
+%{_javadir}/%{name}*.jar
%files manual
%{_docdir}/%{name}-%{version}
