Hello community,
here is the log from the commit of package jakarta-commons-net for
openSUSE:Factory checked in at 2014-07-16 16:49:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-net (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-net.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-net"
Changes:
--------
--- /work/SRC/openSUSE:Factory/jakarta-commons-net/jakarta-commons-net.changes
2014-05-02 13:56:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-net.new/jakarta-commons-net.changes
2014-07-16 16:49:58.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 8 09:19:38 UTC 2014 - [email protected]
+
+- Fix sle build properly.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-net.spec ++++++
--- /var/tmp/diff_new_pack.5QtGyz/_old 2014-07-16 16:49:59.000000000 +0200
+++ /var/tmp/diff_new_pack.5QtGyz/_new 2014-07-16 16:49:59.000000000 +0200
@@ -22,8 +22,6 @@
%define without_tests 1
%define base_name net
%define short_name commons-%{base_name}
-%define section free
-
Name: jakarta-commons-net
Version: 1.4.1
Release: 0
@@ -45,13 +43,18 @@
#http://svn-master.apache.org/viewvc?view=revision&revision=1294922
Patch3: commons-net-ftp-leap-year-parsing.patch
BuildRequires: ant >= 1.6
+BuildRequires: java-devel
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
-BuildRequires: java-devel
-BuildRequires: oro
%if %{with_maven}
BuildRequires: maven >= 1.1
BuildRequires: maven-plugin-changes
@@ -67,13 +70,6 @@
BuildRequires: saxon9
BuildRequires: saxon9-scripts
%endif
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: oro >= 2.0.8
-Provides: %{short_name} = %{version}-%{release}
-Obsoletes: %{short_name} < %{version}-%{release}
-Requires(post): javapackages-tools
-Requires(postun): javapackages-tools
%description
This is an Internet protocol suite Java library originally developed by
@@ -82,13 +78,9 @@
well as BSD R command support. The purpose of the library is to provide
fundamental protocol access, not higher-level abstractions.
-
-
%package javadoc
Summary: Jakarta Commons Net Package
Group: Development/Libraries/Java
-Requires(post): /bin/rm,/bin/ln
-Requires(postun): /bin/rm
%description javadoc
This is an Internet protocol suite Java library originally developed by
@@ -97,8 +89,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
@@ -112,8 +102,6 @@
well as BSD R command support. The purpose of the library is to provide
fundamental protocol access, not higher-level abstractions.
-
-
%endif
%prep
@@ -122,7 +110,7 @@
%patch0 -b .sav
%patch1 -b .sav
%patch2 -b .sav
-%patch3 -p0
+%patch3
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
@@ -133,22 +121,22 @@
echo '<depset>' >> $DEPCAT
for p in $(find . -name project.xml); do
pushd $(dirname $p)
- /usr/bin/saxon9 project.xml %{SOURCE1} >> $DEPCAT
+ %{_bindir}/saxon9 project.xml %{SOURCE1} >> $DEPCAT
popd
done
echo >> $DEPCAT
echo '</depset>' >> $DEPCAT
-/usr/bin/saxon9 $DEPCAT %{SOURCE2} > commons-net-1.4.1-depmap.new.xml
+%{_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
- /usr/bin/saxon9 -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+ %{_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:/usr/share/maven/repository \
+ -Dmaven.repo.remote=file:%{_datadir}/maven/repository \
-Dmaven.home.local=${MAVEN_HOME_LOCAL} \
jar:jar javadoc:generate site
%else
@@ -156,18 +144,20 @@
ln -s %{_javadir}/oro.jar target/lib
ln -s %{_javadir}/junit.jar target/lib
%if %{without_tests}
-ant -Dnoget=true -Dfinal.name=commons-net-%{version}
-Dj2se.api=%{_javadocdir}/java jar javadoc
+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 -Dnoget=true -Dfinal.name=commons-net-%{version}
-Dj2se.api=%{_javadocdir}/java jar test javadoc
+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
-%if 0%{?suse_version} == 1110
-export NO_BRP_CHECK_BYTECODE_VERSION=true
-%endif
-
# jars
install -d -m 755 %{buildroot}%{_javadir}
install -m 644 target/%{short_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
@@ -206,6 +196,7 @@
%{_javadocdir}/%{name}
%if %{with_maven}
+
%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/site
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
