Hello community,
here is the log from the commit of package jakarta-slide-webdavclient for
openSUSE:Factory checked in at 2017-09-20 17:09:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-slide-webdavclient (Old)
and /work/SRC/openSUSE:Factory/.jakarta-slide-webdavclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-slide-webdavclient"
Wed Sep 20 17:09:26 2017 rev:16 rq:527058 version:2.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-slide-webdavclient/jakarta-slide-webdavclient.changes
2015-04-02 15:56:42.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-slide-webdavclient.new/jakarta-slide-webdavclient.changes
2017-09-20 17:09:27.784818414 +0200
@@ -1,0 +2,11 @@
+Mon Sep 18 15:29:59 UTC 2017 - [email protected]
+
+- Moved patch:
+ * jakarta-slide-webdavclient-build-jdk15.patch ->
+ -> jakarta-slide-webdavclient-build-jdk16.patch
+ + Build with java source and targer 1.6
+ * jakarta-slide-webdavclient-enum.patch
+ + rename enum -> emun to build with source and target >= 1.5
+- Clean spec file and fix some rpmlint errors
+
+-------------------------------------------------------------------
Old:
----
jakarta-slide-webdavclient-build-jdk15.patch
New:
----
jakarta-slide-webdavclient-build-jdk16.patch
jakarta-slide-webdavclient-enum.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-slide-webdavclient.spec ++++++
--- /var/tmp/diff_new_pack.8zKmwt/_old 2017-09-20 17:09:28.544711445 +0200
+++ /var/tmp/diff_new_pack.8zKmwt/_new 2017-09-20 17:09:28.548710882 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-slide-webdavclient
#
-# 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
@@ -25,7 +25,6 @@
%define section devel
%define base_name slide
%define jakarta_version 2.1
-
Name: jakarta-slide-webdavclient
Version: %{jakarta_version}
Release: 0
@@ -40,12 +39,13 @@
Source4:
http://mirrors.ibiblio.org/pub/mirrors/maven2/slide/slide-webdavlib/2.1/slide-webdavlib-2.1.pom
# FIXME Temporary fix !!!
Patch0: jakarta-slide-webdavclient-3.0-compat.patch
-Patch1: jakarta-slide-webdavclient-build-jdk15.patch
+Patch1: jakarta-slide-webdavclient-build-jdk16.patch
Patch2: jakarta-slide-webdavclient-jdk15.patch
-BuildArch: noarch
+Patch3: jakarta-slide-webdavclient-enum.patch
BuildRequires: ant >= 1.6
BuildRequires: ant-antlr
BuildRequires: antlr
+BuildRequires: fdupes
BuildRequires: geronimo-j2ee-connector-1_5-api
BuildRequires: jakarta-commons-httpclient3
BuildRequires: jakarta-commons-transaction
@@ -57,16 +57,13 @@
Requires: jakarta-commons-transaction
Requires: jdom
Requires: xml-im-exporter
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
Slide includes a fully featured WebDAV client library and command line
client.
-
-
%if %{with_repolib}
-
%package repolib
Summary: Slide WebDAV client
Group: Development/Libraries/Java
@@ -75,8 +72,6 @@
Slide includes a fully featured WebDAV client library and command line
client.
-
-
%endif
%package javadoc
@@ -87,11 +82,9 @@
Slide includes a fully featured WebDAV client library and command line
client.
-
-
%prep
%setup -q -n jakarta-slide-webdavclient-src-2.1
-find . -name "*.jar" | xargs %{__rm}
+find . -name "*.jar" | xargs rm
#for j in $(find . -name "*.jar"); do
# mv $j $j.no
#done
@@ -99,6 +92,7 @@
%patch0 -b .sav
%patch1 -b .sav
%patch2 -b .sav
+%patch3 -p1
%build
export CLASSPATH=$(build-classpath \
@@ -112,47 +106,47 @@
ant -v -d -Dbuild.sysclasspath=first
%install
-install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/webdavclient
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{base_name}
+install -dm 755 %{buildroot}%{_bindir}
+install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/webdavclient
+install -dm 755 %{buildroot}%{_javadir}/%{base_name}
install -pm 644 \
dist/lib/jakarta-slide-webdavlib-%{jakarta_version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{base_name}
+ %{buildroot}%{_javadir}/%{base_name}
ln -s jakarta-slide-webdavlib-%{jakarta_version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{base_name}/%{name}-webdavlib-%{version}.jar
+ %{buildroot}%{_javadir}/%{base_name}/%{name}-webdavlib-%{version}.jar
install -pm 644 \
dist/lib/jakarta-slide-commandline-%{jakarta_version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{base_name}
+ %{buildroot}%{_javadir}/%{base_name}
ln -s jakarta-slide-commandline-%{jakarta_version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{base_name}/%{name}-commandline-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/%{base_name} && for jar in *-%{version}*; do ln
-sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir}/%{base_name} && for jar in jakarta-*.jar; do ln
-sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
+ %{buildroot}%{_javadir}/%{base_name}/%{name}-commandline-%{version}.jar
+(cd %{buildroot}%{_javadir}/%{base_name} && for jar in *-%{version}*; do ln
-sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+(cd %{buildroot}%{_javadir}/%{base_name} && for jar in jakarta-*.jar; do ln
-sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
#javadoc
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/doc/clientjavadoc/*
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr dist/doc/clientjavadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom
#FIXME
# % add_maven_depmap JPP.%{name}.pom %{base_name}/jakarta-slide-webdavlib.jar
%if %{with_repolib}
- install -d -m 755 $RPM_BUILD_ROOT%{repodir}
- install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
- install -p -m 644 %{SOURCE3}
$RPM_BUILD_ROOT%{repodir}/component-info.xml
+ install -d -m 755 %{buildroot}%{repodir}
+ install -d -m 755 %{buildroot}%{repodirlib}
+ install -p -m 644 %{SOURCE3} %{buildroot}%{repodir}/component-info.xml
tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
- sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
- sed -i "s/@VERSION@/%{version}-brew/g"
$RPM_BUILD_ROOT%{repodir}/component-info.xml
- install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
- install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{repodirsrc}
- install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
- install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
- cp -p $RPM_BUILD_ROOT%{_javadir}/slide/jakarta-slide-webdavlib.jar
$RPM_BUILD_ROOT%{repodirlib}
+ sed -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ sed -i "s/@VERSION@/%{version}-brew/g"
%{buildroot}%{repodir}/component-info.xml
+ install -d -m 755 %{buildroot}%{repodirsrc}
+ install -p -m 644 %{SOURCE2} %{buildroot}%{repodirsrc}
+ install -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
+ install -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ cp -p %{buildroot}%{_javadir}/slide/jakarta-slide-webdavlib.jar
%{buildroot}%{repodirlib}
%endif
%files
-%defattr(0644,root,root,0755)
%doc LICENSE
%{_javadir}/%{base_name}/*.jar
%attr(0755,root,root) %{_bindir}/webdavclient
@@ -161,13 +155,10 @@
%dir %{_javadir}/%{base_name}
%files javadoc
-%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%if %{with_repolib}
-
%files repolib
-%defattr(0644,root,root,0755)
%{repodir}
%dir %{_javadir}/repository.jboss.com
%dir %{_javadir}/repository.jboss.com/apache-%{base_name}
++++++ jakarta-slide-webdavclient-build-jdk15.patch ->
jakarta-slide-webdavclient-build-jdk16.patch ++++++
---
/work/SRC/openSUSE:Factory/jakarta-slide-webdavclient/jakarta-slide-webdavclient-build-jdk15.patch
2011-09-23 02:03:59.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-slide-webdavclient.new/jakarta-slide-webdavclient-build-jdk16.patch
2017-09-20 17:09:27.656836430 +0200
@@ -4,7 +4,7 @@
<echo message="Building Slide WebDAV client lib"/>
<javac srcdir="clientlib/src/java"
destdir="${clientlib.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
-+ source="1.4" target="1.4"
++ source="1.6" target="1.6"
optimize="${compile.optimize}" excludes="**/CVS/**">
<classpath refid="clientlib.classpath"/>
</javac>
@@ -12,13 +12,13 @@
</copy>
<javac srcdir="commandline/src/java" destdir="${cmd.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
-+ source="1.4" target="1.4"
++ source="1.6" target="1.6"
optimize="${compile.optimize}" excludes="**/Slide.java">
<classpath refid="cmd.classpath"/>
</javac>
<javac srcdir="${cmd.build}/src" destdir="${cmd.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
-+ source="1.4" target="1.4"
++ source="1.6" target="1.6"
optimize="${compile.optimize}" includes="**/Slide.java">
<classpath refid="cmd.classpath"/>
</javac>
@@ -26,7 +26,7 @@
<echo message="Building WebDAV ant tasks"/>
<javac srcdir="ant/src/java" destdir="${ant.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
-+ source="1.4" target="1.4"
++ source="1.6" target="1.6"
optimize="${compile.optimize}" excludes="**/*Test.java">
<classpath refid="ant.classpath"/>
</javac>
@@ -34,7 +34,7 @@
<echo message="Building WebDAV JCA connector"/>
<javac srcdir="connector/src/java" destdir="${jca.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
-+ source="1.4" target="1.4"
++ source="1.6" target="1.6"
optimize="${compile.optimize}" excludes="**/*Test.java">
<classpath refid="jca.classpath"/>
</javac>
@@ -42,7 +42,7 @@
<target name="javadoc-clientlib" depends="prepare-build"
description="Create WebDAV client javadocs" unless="skip.javadoc">
<property name="copyright" value="2004"/>
<javadoc sourcepath="clientlib/src/java"
destdir="${clientlib.build}/${clientlib.javadoc.path}"
-+ source="1.4"
++ source="1.6"
doctitle="Slide ${version} WebDAV Client JavaDoc"
windowtitle="Slide WebDAV Client Javadoc"
package="true" noindex="false" author="true" version="true"
packagenames="org.apache.webdav.lib.*">
<classpath refid="clientlib.classpath"/>
@@ -50,7 +50,7 @@
<target name="javadoc-ant" depends="prepare-build" description="Create
ant tasks javadocs" unless="skip.javadoc">
<property name="copyright" value="2004"/>
<javadoc sourcepath="ant/src/java"
destdir="${ant.build}/${ant.javadoc.path}"
-+ source="1.4"
++ source="1.6"
doctitle="Slide ${version} WebDAV ant tasks JavaDoc"
windowtitle="Slide WebDAV ant tasks Javadoc"
package="true" noindex="false" author="true" version="true"
packagenames="org.apache.webdav.ant.*">
<classpath refid="ant.classpath"/>
@@ -58,7 +58,7 @@
<target name="javadoc-jca" depends="prepare-build" description="Create
JCA connector javadocs" unless="skip.javadoc">
<property name="copyright" value="2004"/>
<javadoc sourcepath="connector/src/java"
destdir="${jca.build}/${jca.javadoc.path}"
-+ source="1.4"
++ source="1.6"
doctitle="Slide ${version} WebDAV JCA connector JavaDoc"
windowtitle="Slide WebDAV JCA connector Javadoc"
package="true" noindex="false" author="true" version="true"
packagenames="org.apache.webdav.connector.*">
<classpath refid="jca.classpath"/>
@@ -66,7 +66,7 @@
description="Create connector example war">
<javac destdir="${jca.build}/classes"
debug="${compile.debug}"
-+ source="1.4" target="1.4"
++ source="1.6" target="1.6"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}" >
<src path="${basedir}/connector/example/src/java"/>
++++++ jakarta-slide-webdavclient-enum.patch ++++++
---
jakarta-slide-webdavclient-src-2.1/commandline/src/java/org/apache/webdav/cmd/Client.java
2017-09-18 17:22:32.161020568 +0200
+++
jakarta-slide-webdavclient-src-2.1/commandline/src/java/org/apache/webdav/cmd/Client.java
2017-09-18 17:23:17.885021349 +0200
@@ -368,14 +368,14 @@
if (param != null) {
if (!param.startsWith("/")) {
httpURL = uriToHttpURL(param);
- Enumeration enum = null;
+ Enumeration emun = null;
try {
// OPTIONS business logic
- enum =
+ emun =
webdavResource.optionsMethod(httpURL);
- while (enum.hasMoreElements()) {
- out.print(enum.nextElement());
- if (enum.hasMoreElements()) {
+ while (emun.hasMoreElements()) {
+ out.print(emun.nextElement());
+ if (emun.hasMoreElements()) {
out.print(", ");
} else {
out.println();
@@ -399,13 +399,13 @@
// OPTIONS business logic
httpURL.setUserinfo(userName,
password);
- enum = webdavResource.
+ emun = webdavResource.
optionsMethod(httpURL);
while (
- enum.hasMoreElements()) {
+ emun.hasMoreElements()) {
out.print
- (enum.nextElement());
- if (enum.
+ (emun.nextElement());
+ if (emun.
hasMoreElements()) {
out.print
(", ");
