Hello community,
here is the log from the commit of package jakarta-commons-net for
openSUSE:Factory checked in at 2017-05-31 13:30:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-net (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-net.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-net"
Wed May 31 13:30:09 2017 rev:21 rq:496778 version:1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/jakarta-commons-net/jakarta-commons-net.changes
2015-04-02 15:56:25.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-net.new/jakarta-commons-net.changes
2017-05-31 13:30:12.360438167 +0200
@@ -1,0 +2,5 @@
+Fri May 19 13:56:33 UTC 2017 - [email protected]
+
+- Fix build with new javapackages-tools
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-net.spec ++++++
--- /var/tmp/diff_new_pack.d41Iba/_old 2017-05-31 13:30:14.344158556 +0200
+++ /var/tmp/diff_new_pack.d41Iba/_new 2017-05-31 13:30:14.348157991 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-net
#
-# 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,10 +16,6 @@
#
-%define _without_maven 1
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-%define without_tests 1
%define base_name net
%define short_name commons-%{base_name}
Name: jakarta-commons-net
@@ -44,32 +40,13 @@
Patch3: commons-net-ftp-leap-year-parsing.patch
BuildRequires: ant >= 1.6
BuildRequires: java-devel
+BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: oro
Requires: oro >= 2.0.8
Provides: %{short_name} = %{version}-%{release}
Obsoletes: %{short_name} < %{version}-%{release}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
-%if ! %{without_tests}
-BuildRequires: ant-junit >= 1.6
-BuildRequires: junit >= 3.8.1
-%endif
-%if %{with_maven}
-BuildRequires: maven >= 1.1
-BuildRequires: maven-plugin-changes
-BuildRequires: maven-plugin-checkstyle
-BuildRequires: maven-plugin-jcoverage
-BuildRequires: maven-plugin-jdepend
-BuildRequires: maven-plugin-jxr
-BuildRequires: maven-plugin-license
-BuildRequires: maven-plugin-tasklist
-BuildRequires: maven-plugin-test
-BuildRequires: maven-plugin-xdoc
-BuildRequires: maven-plugins-base
-BuildRequires: saxon9
-BuildRequires: saxon9-scripts
-%endif
%description
This is an Internet protocol suite Java library originally developed by
@@ -89,21 +66,6 @@
well as BSD R command support. The purpose of the library is to provide
fundamental protocol access, not higher-level abstractions.
-%if %{with_maven}
-
-%package manual
-Summary: Jakarta Commons Net Package
-Group: Development/Libraries/Java
-
-%description manual
-This is an Internet protocol suite Java library originally developed by
-ORO, Inc. This version supports Finger, Whois, TFTP, Telnet, POP3,
-FTP, NNTP, SMTP, and some miscellaneous protocols like Time and Echo as
-well as BSD R command support. The purpose of the library is to provide
-fundamental protocol access, not higher-level abstractions.
-
-%endif
-
%prep
%setup -q -n %{short_name}-%{version}
gzip -dc %{SOURCE5} | tar xf -
@@ -115,47 +77,13 @@
find . -name "*.jar" -exec rm -f {} \;
%build
-%if %{with_maven}
-export DEPCAT=$(pwd)/commons-net-1.4.1-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}/saxon9 project.xml %{SOURCE1} >> $DEPCAT
- popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-%{_bindir}/saxon9 $DEPCAT %{SOURCE2} > commons-net-1.4.1-depmap.new.xml
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- cp project.xml project.xml.orig
- %{_bindir}/saxon9 -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
- popd
-done
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-# -Dmaven.test.failure.ignore=true \
-maven -e \
- -Dmaven.repo.remote=file:%{_datadir}/maven/repository \
- -Dmaven.home.local=${MAVEN_HOME_LOCAL} \
- jar:jar javadoc:generate site
-%else
mkdir -p target/lib
ln -s %{_javadir}/oro.jar target/lib
ln -s %{_javadir}/junit.jar target/lib
-%if %{without_tests}
ant \
-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-Dnoget=true -Dfinal.name=commons-net-%{version}
-Dj2se.api=%{_javadocdir}/java \
jar javadoc
-%else
-export OPT_JAR_LIST="ant/ant-junit junit"
-ant \
- -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
- -Dnoget=true -Dfinal.name=commons-net-%{version}
-Dj2se.api=%{_javadocdir}/java jar \
- test javadoc
-%endif
-%endif
%install
# jars
@@ -171,18 +99,7 @@
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-%if %{with_maven}
-cp -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%else
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
-%endif
-#rm -rf target/docs/apidocs
-# manual
-%if %{with_maven}
-install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}
-install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/site
-cp -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}/site
-%endif
%files
%defattr(0644,root,root,0755)
@@ -195,11 +112,4 @@
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
-%if %{with_maven}
-
-%files manual
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}/site
-%endif
-
%changelog
