Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Factory checked in at 2017-05-20 10:14:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-vfs (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-vfs"
Sat May 20 10:14:34 2017 rev:16 rq:496780 version:1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/jakarta-commons-vfs/jakarta-commons-vfs.changes
2015-04-02 15:56:31.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new/jakarta-commons-vfs.changes
2017-05-20 10:14:36.059933671 +0200
@@ -1,0 +2,6 @@
+Fri May 19 14:00:40 UTC 2017 - tchva...@suse.com
+
+- Fix build with new javapackages-tools
+- Cleanup unused conditionals
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-vfs.spec ++++++
--- /var/tmp/diff_new_pack.dGrmyK/_old 2017-05-20 10:14:36.903814440 +0200
+++ /var/tmp/diff_new_pack.dGrmyK/_new 2017-05-20 10:14:36.903814440 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-vfs
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,15 +16,7 @@
#
-%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-%define _without_maven 1
-%bcond_with maven
-%define section free
%define base_name commons-vfs
-
Name: jakarta-commons-vfs
Version: 1.0
Release: 0
@@ -63,18 +55,8 @@
Requires: jsch
Requires: oro
Requires: xml-commons-apis
-Requires(post): javapackages-tools
-Requires(postun): javapackages-tools
-BuildRequires: javapackages-tools
-BuildRequires: junit
-%if %with maven
-BuildRequires: maven >= 1.1
-BuildRequires: saxon
-BuildRequires: saxon-scripts
-%else
BuildRequires: ant >= 1.6
BuildRequires: ant-junit
-%endif
BuildRequires: jaf_1_1_api
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
@@ -84,13 +66,15 @@
BuildRequires: jakarta-commons-net
BuildRequires: jakarta-slide-webdavclient
BuildRequires: javamail_1_4_api
+BuildRequires: javapackages-local
+BuildRequires: javapackages-tools
BuildRequires: jcifs
BuildRequires: jdom
BuildRequires: jsch
+BuildRequires: junit
BuildRequires: oro
BuildRequires: xml-commons-apis
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Commons VFS provides a single API for accessing various different
@@ -100,24 +84,6 @@
Commons VFS are: * A single consistent API for accessing files of
different types.
-* Support for numerous file system types.
-
-* Caching of file information. Caches information in-JVM, and
- optionally can cache remote file information on the local file
- system.
-
-* Event delivery.
-
-* Support for logical file systems made up of files from various
- different file systems.
-
-* Utilities for integrating Commons VFS into applications, such as a
- VFS-aware ClassLoader and URLStreamHandlerFactory.
-
-* A set of VFS-enabled Ant tasks.
-
-
-
%package javadoc
Summary: Commons Virtual Filesystem
Group: Development/Libraries/Java
@@ -130,24 +96,6 @@
Commons VFS are: * A single consistent API for accessing files of
different types.
-* Support for numerous file system types.
-
-* Caching of file information. Caches information in-JVM, and
- optionally can cache remote file information on the local file
- system.
-
-* Event delivery.
-
-* Support for logical file systems made up of files from various
- different file systems.
-
-* Utilities for integrating Commons VFS into applications, such as a
- VFS-aware ClassLoader and URLStreamHandlerFactory.
-
-* A set of VFS-enabled Ant tasks.
-
-
-
%package manual
Summary: Commons Virtual Filesystem
Group: Development/Libraries/Java
@@ -160,31 +108,12 @@
Commons VFS are: * A single consistent API for accessing files of
different types.
-* Support for numerous file system types.
-
-* Caching of file information. Caches information in-JVM, and
- optionally can cache remote file information on the local file
- system.
-
-* Event delivery.
-
-* Support for logical file systems made up of files from various
- different file systems.
-
-* Utilities for integrating Commons VFS into applications, such as a
- VFS-aware ClassLoader and URLStreamHandlerFactory.
-
-* A set of VFS-enabled Ant tasks.
-
-
-
%prep
%setup -q -n vfs-%{version}
%setup -q -T -D -a 5 -n vfs-%{version}
%patch0 -p0
%patch1 -p1
find . -name "*.jar" | xargs -t rm
-%if %without maven
cp -p %{SOURCE6} %{SOURCE7} .
cp -p %{SOURCE8} core/build.xml
cp -p %{SOURCE9} core/maven-build.xml
@@ -192,40 +121,13 @@
cp -p %{SOURCE11} examples/maven-build.xml
cp -p %{SOURCE12} sandbox/build.xml
cp -p %{SOURCE13} sandbox/maven-build.xml
-%else
-export DEPCAT=$(pwd)/commons-vfs-1.0-depcat.new.xml
-echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
-echo '<depset>' >> $DEPCAT
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT
- popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-%{_bindir}/saxon $DEPCAT %{SOURCE2} > commons-vfs-1.0-depmap.new.xml
-%endif
%build
-%if %with maven
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- cp project.xml project.xml.orig
- %{_bindir}/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
- popd
-done
-maven \
- -Dmaven.repo.remote=file:%{_datadir}/maven/repository \
- -Dmaven.javadoc.source=1.4 \
- -Dmaven.home.local=$(pwd)/.maven \
- -Dmaven.test.error.ignore=true \
- jar javadoc xdoc:transform
-%else
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 OPT_JAR_LIST="junit ant/ant-junit"
-%{ant} \
+ant \
-Dmaven.build.dir=`pwd`/target \
-Dmaven.build.outputDir=`pwd`/target \
-Dmaven.mode.offline=true \
@@ -236,7 +138,6 @@
-Dmaven.test.skip=true \
-Dmaven.test.error.ignore=true \
package javadoc
-%endif
%install
# jars
@@ -252,21 +153,10 @@
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%if %with maven
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-# FIXME: (dwalluck): breaks --short-circuit
-rm -rf target/docs/apidocs
-%else
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf target/site/apidocs
-%endif
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%if %with maven
-## manual
-cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-find $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -name "*.sav" -exec rm {} \;
-%endif
%files
%defattr(0644,root,root,0755)
