Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Factory checked in at 2017-09-20 17:09:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-vfs (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-vfs"
Wed Sep 20 17:09:18 2017 rev:17 rq:527033 version:1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/jakarta-commons-vfs/jakarta-commons-vfs.changes
2017-05-20 10:14:36.059933671 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new/jakarta-commons-vfs.changes
2017-09-20 17:09:19.645964120 +0200
@@ -1,0 +2,5 @@
+Mon Sep 18 13:28:49 UTC 2017 - [email protected]
+
+- Fix build with jdk9: specify java source and target version 1.6
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-vfs.spec ++++++
--- /var/tmp/diff_new_pack.OUdMci/_old 2017-09-20 17:09:20.437852645 +0200
+++ /var/tmp/diff_new_pack.OUdMci/_new 2017-09-20 17:09:20.437852645 +0200
@@ -41,22 +41,9 @@
Source13: sandbox-maven-build.xml
Patch0: commons-vfs-1.0-project_properties.patch
Patch1: commons-vfs-1.0-jakarta-commons-httpclient-3.1.patch
-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: jcifs
-Requires: jdom
-Requires: jsch
-Requires: oro
-Requires: xml-commons-apis
BuildRequires: ant >= 1.6
BuildRequires: ant-junit
+BuildRequires: fdupes
BuildRequires: jaf_1_1_api
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
@@ -74,6 +61,20 @@
BuildRequires: junit
BuildRequires: oro
BuildRequires: xml-commons-apis
+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: jcifs
+Requires: jdom
+Requires: jsch
+Requires: oro
+Requires: xml-commons-apis
BuildArch: noarch
%description
@@ -111,7 +112,7 @@
%prep
%setup -q -n vfs-%{version}
%setup -q -T -D -a 5 -n vfs-%{version}
-%patch0 -p0
+%patch0
%patch1 -p1
find . -name "*.jar" | xargs -t rm
cp -p %{SOURCE6} %{SOURCE7} .
@@ -141,9 +142,9 @@
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/%{base_name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in jakarta-*; do \
+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)
#pom
@@ -152,25 +153,23 @@
%add_maven_depmap
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/apidocs
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
%files
-%defattr(0644,root,root,0755)
%doc *.txt
%{_javadir}/*
%{_mavenpomdir}/*
%{_datadir}/maven-metadata/%{name}.xml*
%files manual
-%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}
%files javadoc
-%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%changelog
++++++ core-maven-build.xml ++++++
--- /var/tmp/diff_new_pack.OUdMci/_old 2017-09-20 17:09:20.513841948 +0200
+++ /var/tmp/diff_new_pack.OUdMci/_new 2017-09-20 17:09:20.513841948 +0200
@@ -92,10 +92,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.3"
+ target="1.6"
verbose="false"
fork="false"
- source="1.3">
+ source="1.6">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
@@ -133,10 +133,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.3"
+ target="1.6"
verbose="false"
fork="false"
- source="1.3">
+ source="1.6">
<src>
<pathelement location="${maven.build.testDir.0}"/>
</src>
++++++ examples-maven-build.xml ++++++
--- /var/tmp/diff_new_pack.OUdMci/_old 2017-09-20 17:09:20.541838007 +0200
+++ /var/tmp/diff_new_pack.OUdMci/_new 2017-09-20 17:09:20.541838007 +0200
@@ -87,10 +87,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.3"
+ target="1.6"
verbose="false"
fork="false"
- source="1.3">
+ source="1.6">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
++++++ sandbox-maven-build.xml ++++++
--- /var/tmp/diff_new_pack.OUdMci/_old 2017-09-20 17:09:20.609828436 +0200
+++ /var/tmp/diff_new_pack.OUdMci/_new 2017-09-20 17:09:20.609828436 +0200
@@ -86,10 +86,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.3"
+ target="1.6"
verbose="false"
fork="false"
- source="1.3">
+ source="1.6">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
@@ -127,10 +127,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.3"
+ target="1.6"
verbose="false"
fork="false"
- source="1.3">
+ source="1.6">
<src>
<pathelement location="${maven.build.testDir.0}"/>
</src>
