Compare commits
42 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
38ddfd155d | ||
|
8401bdae1c | ||
|
|
1c3cd26c38 | ||
|
|
15e35bd029 | ||
|
344f3f825a | ||
|
|
b4f3c4c39c | ||
|
|
2ec99d8b1a | ||
|
|
f344e56046 | ||
|
|
5c44cace7a | ||
|
|
beeaa680c6 | ||
|
|
57a7c7de06 | ||
|
|
26e1c88def | ||
|
|
7bcb2f5650 | ||
| 60529da115 | |||
|
29d0eb0ffb | ||
|
eca30124da |
||
|
|
b0d6a6d1d7 | ||
|
|
a278a08b86 |
||
|
|
c04a85c45e |
||
|
|
28b14a7149 |
||
|
|
b36869e010 | ||
|
|
387d77c8db | ||
|
|
e8fd80f28c | ||
|
|
66dc77f5e2 | ||
|
ec1e603315 | ||
|
|
6c3d381183 | ||
|
3045b270cb | ||
|
6afa19541c | ||
|
|
d7a8505ac6 | ||
|
|
4a177e2587 | ||
|
|
1c4bb4d8fa | ||
|
|
71751ae015 | ||
|
|
323bc543a7 | ||
|
|
5f3c30933b | ||
|
|
d550751175 | ||
|
7915d28f10 | ||
|
|
a9e6b646ac | ||
|
|
ed1942a387 | ||
|
|
327ddd042a | ||
|
|
d4f36a8431 | ||
|
|
699d9a6602 | ||
|
cdcbc2e0f0 |
7 changed files with 9812 additions and 318 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1 +1,3 @@
|
|||
/commons-vfs-2.0-src.tar.gz
|
||||
/*.src.rpm
|
||||
/commons-vfs-*-src.tar.gz
|
||||
/commons-vfs-*-src.tar.gz.asc
|
||||
|
|
|
|||
|
|
@ -1,155 +0,0 @@
|
|||
diff -Nru commons-vfs-2.0/core/pom.xml commons-vfs-2.0-gil/core/pom.xml
|
||||
--- commons-vfs-2.0/core/pom.xml 2011-08-18 15:57:10.000000000 +0200
|
||||
+++ commons-vfs-2.0-gil/core/pom.xml 2012-06-18 11:47:33.151985239 +0200
|
||||
@@ -40,7 +40,7 @@
|
||||
<artifactId>commons-logging</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
- <groupId>ant</groupId>
|
||||
+ <groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
@@ -64,11 +64,11 @@
|
||||
<artifactId>commons-httpclient</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
+ <!--dependency>
|
||||
<groupId>org.apache.jackrabbit</groupId>
|
||||
<artifactId>jackrabbit-webdav</artifactId>
|
||||
<optional>true</optional>
|
||||
- </dependency>
|
||||
+ </dependency-->
|
||||
<dependency>
|
||||
<groupId>com.jcraft</groupId>
|
||||
<artifactId>jsch</artifactId>
|
||||
@@ -167,6 +167,37 @@
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
+ <plugin>
|
||||
+ <groupId>org.apache.maven.plugins</groupId>
|
||||
+ <artifactId>maven-compiler-plugin</artifactId>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>default-compile</id>
|
||||
+ <phase>compile</phase>
|
||||
+ <configuration>
|
||||
+ <excludes>
|
||||
+ <exclude>**/webdav/*</exclude>
|
||||
+ </excludes>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>compile</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ <execution>
|
||||
+ <id>default-testCompile</id>
|
||||
+ <phase>test-compile</phase>
|
||||
+ <configuration>
|
||||
+ <testExcludes>
|
||||
+ <exclude>**/webdav/test/*</exclude>
|
||||
+ </testExcludes>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>testCompile</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+
|
||||
</plugins>
|
||||
</build>
|
||||
<profiles>
|
||||
diff -Nru commons-vfs-2.0/pom.xml commons-vfs-2.0-gil/pom.xml
|
||||
--- commons-vfs-2.0/pom.xml 2011-08-18 15:57:11.000000000 +0200
|
||||
+++ commons-vfs-2.0-gil/pom.xml 2012-06-18 11:53:03.379995343 +0200
|
||||
@@ -187,14 +187,14 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||
</plugin>
|
||||
- <plugin>
|
||||
+ <!--plugin>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-build-plugin</artifactId>
|
||||
- <!-- version inherited from commons-parent -->
|
||||
+ < version inherited from commons-parent >
|
||||
<configuration>
|
||||
<commons.release.name>commons-${commons.componentid}-${commons.release.version}</commons.release.name>
|
||||
</configuration>
|
||||
- </plugin>
|
||||
+ </plugin-->
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
@@ -243,9 +243,10 @@
|
||||
</tag>
|
||||
</tags>
|
||||
<aggregate>true</aggregate>
|
||||
+ <excludePackageNames>*.webdav.*</excludePackageNames>
|
||||
</configuration>
|
||||
</plugin>
|
||||
- <plugin>
|
||||
+ <!--plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>findbugs-maven-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
@@ -254,7 +255,7 @@
|
||||
<effort>Default</effort>
|
||||
<excludeFilterFile>findbugs-exclude-filter.xml</excludeFilterFile>
|
||||
</configuration>
|
||||
- </plugin>
|
||||
+ </plugin-->
|
||||
</plugins>
|
||||
</reporting>
|
||||
|
||||
@@ -273,11 +274,11 @@
|
||||
<type>test-jar</type>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
+ <!--dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-vfs-sandbox</artifactId>
|
||||
<version>${project.version}</version>
|
||||
- </dependency>
|
||||
+ </dependency-->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-vfs-examples</artifactId>
|
||||
@@ -310,13 +311,13 @@
|
||||
<artifactId>commons-compress</artifactId>
|
||||
<version>1.1</version>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
+ <!--dependency>
|
||||
<groupId>org.apache.jackrabbit</groupId>
|
||||
<artifactId>jackrabbit-webdav</artifactId>
|
||||
<version>1.5.2</version>
|
||||
- </dependency>
|
||||
+ </dependency-->
|
||||
<dependency>
|
||||
- <groupId>ant</groupId>
|
||||
+ <groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.6.2</version>
|
||||
</dependency>
|
||||
@@ -349,7 +350,7 @@
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
- <dependencies>
|
||||
+ <!--dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.scm</groupId>
|
||||
<artifactId>maven-scm-api</artifactId>
|
||||
@@ -360,7 +361,7 @@
|
||||
<artifactId>maven-scm-provider-svnexe</artifactId>
|
||||
<version>1.4</version>
|
||||
</dependency>
|
||||
- </dependencies>
|
||||
+ </dependencies-->
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
84
apache-commons-vfs-httpclient.patch
Normal file
84
apache-commons-vfs-httpclient.patch
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
--- commons-vfs-2.9.0/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java.orig 2020-01-22 08:10:15.000000000 -0700
|
||||
+++ commons-vfs-2.9.0/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/URLFileName.java 2023-06-11 21:45:22.283275117 -0600
|
||||
@@ -16,8 +16,9 @@
|
||||
*/
|
||||
package org.apache.commons.vfs2.provider;
|
||||
|
||||
-import org.apache.commons.httpclient.URIException;
|
||||
-import org.apache.commons.httpclient.util.URIUtil;
|
||||
+import java.net.URISyntaxException;
|
||||
+import java.nio.charset.Charset;
|
||||
+import org.apache.http.client.utils.URIBuilder;
|
||||
import org.apache.commons.vfs2.FileName;
|
||||
import org.apache.commons.vfs2.FileSystemException;
|
||||
import org.apache.commons.vfs2.FileType;
|
||||
@@ -68,22 +69,28 @@ public class URLFileName extends Generic
|
||||
*
|
||||
* @param charset the charset used for the path encoding
|
||||
* @return The encoded path.
|
||||
- * @throws URIException If an error occurs encoding the URI.
|
||||
+ * @throws URISyntaxException If an error occurs encoding the URI.
|
||||
* @throws FileSystemException If some other error occurs.
|
||||
*/
|
||||
- public String getPathQueryEncoded(final String charset) throws URIException, FileSystemException {
|
||||
+ public String getPathQueryEncoded(final String charset) throws URISyntaxException, FileSystemException {
|
||||
+ final String path = getPathDecoded();
|
||||
if (getQueryString() == null) {
|
||||
+ if (path == "") {
|
||||
+ return "";
|
||||
+ }
|
||||
if (charset != null) {
|
||||
- return URIUtil.encodePath(getPathDecoded(), charset);
|
||||
+ final Charset cset = Charset.forName(charset);
|
||||
+ return new URIBuilder(path, cset).toString();
|
||||
}
|
||||
- return URIUtil.encodePath(getPathDecoded());
|
||||
+ return new URIBuilder(path).toString();
|
||||
}
|
||||
|
||||
final StringBuilder sb = new StringBuilder(BUFFER_SIZE);
|
||||
if (charset != null) {
|
||||
- sb.append(URIUtil.encodePath(getPathDecoded(), charset));
|
||||
+ final Charset cset = Charset.forName(charset);
|
||||
+ sb.append(new URIBuilder(path, cset).toString());
|
||||
} else {
|
||||
- sb.append(URIUtil.encodePath(getPathDecoded()));
|
||||
+ sb.append(new URIBuilder(path).toString());
|
||||
}
|
||||
sb.append("?");
|
||||
sb.append(getQueryString());
|
||||
@@ -128,9 +135,9 @@ public class URLFileName extends Generic
|
||||
* @param charset The character set.
|
||||
* @return The encoded URI
|
||||
* @throws FileSystemException if some other exception occurs.
|
||||
- * @throws URIException if an exception occurs encoding the URI.
|
||||
+ * @throws URISyntaxException if an exception occurs encoding the URI.
|
||||
*/
|
||||
- public String getURIEncoded(final String charset) throws FileSystemException, URIException {
|
||||
+ public String getURIEncoded(final String charset) throws FileSystemException, URISyntaxException {
|
||||
final StringBuilder sb = new StringBuilder(BUFFER_SIZE);
|
||||
appendRootUri(sb, true);
|
||||
sb.append(getPathQueryEncoded(charset));
|
||||
--- commons-vfs-2.9.0/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java.orig 2020-01-22 08:10:15.000000000 -0700
|
||||
+++ commons-vfs-2.9.0/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java 2023-06-11 21:36:11.292184559 -0600
|
||||
@@ -20,10 +20,10 @@ import java.io.FileNotFoundException;
|
||||
import java.io.InputStream;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.MalformedURLException;
|
||||
+import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
|
||||
-import org.apache.commons.httpclient.URIException;
|
||||
import org.apache.commons.vfs2.FileName;
|
||||
import org.apache.commons.vfs2.FileSystemException;
|
||||
import org.apache.commons.vfs2.FileType;
|
||||
@@ -59,7 +59,7 @@ public class UrlFileObject extends Abstr
|
||||
}
|
||||
}
|
||||
|
||||
- protected URL createURL(final FileName name) throws MalformedURLException, FileSystemException, URIException {
|
||||
+ protected URL createURL(final FileName name) throws MalformedURLException, FileSystemException, URISyntaxException {
|
||||
if (name instanceof URLFileName) {
|
||||
final URLFileName urlName = (URLFileName) getName();
|
||||
|
||||
|
|
@ -1,205 +1,204 @@
|
|||
%global base_name vfs
|
||||
%global short_name commons-%{base_name}
|
||||
Name: apache-commons-vfs
|
||||
Version: 2.0
|
||||
Release: 11%{?dist}
|
||||
Summary: Commons Virtual File System
|
||||
License: ASL 2.0
|
||||
Url: http://commons.apache.org/%{base_name}/
|
||||
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
||||
%bcond cifs 0
|
||||
%bcond ftp 0
|
||||
%bcond hadoop 0
|
||||
%bcond mina 0
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.jcraft:jsch)
|
||||
BuildRequires: mvn(commons-collections:commons-collections)
|
||||
BuildRequires: mvn(commons-httpclient:commons-httpclient)
|
||||
BuildRequires: mvn(commons-logging:commons-logging)
|
||||
BuildRequires: mvn(commons-net:commons-net)
|
||||
BuildRequires: mvn(org.apache.ant:ant)
|
||||
BuildRequires: mvn(org.apache.commons:commons-compress)
|
||||
BuildRequires: mvn(org.apache.commons:commons-parent)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
|
||||
BuildRequires: mvn(org.jdom:jdom)
|
||||
Name: apache-commons-vfs
|
||||
Version: 2.9.0
|
||||
Release: %autorelease
|
||||
Summary: Commons Virtual File System
|
||||
License: Apache-2.0
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
# test deps
|
||||
BuildRequires: mvn(junit:junit)
|
||||
URL: https://commons.apache.org/proper/commons-vfs/
|
||||
VCS: git:https://github.com/apache/commons-vfs.git
|
||||
Source0: https://archive.apache.org/dist/commons/vfs/source/commons-vfs-%{version}-src.tar.gz
|
||||
Source1: https://archive.apache.org/dist/commons/vfs/source/commons-vfs-%{version}-src.tar.gz.asc
|
||||
Source2: https://downloads.apache.org/commons/KEYS
|
||||
|
||||
BuildArch: noarch
|
||||
Provides: %{name}2 = %{version}-%{release}
|
||||
# Migrate from the old commons-httpclient, which is no longer available in
|
||||
# Fedora, to the newer httpcomponents httpclient.
|
||||
Patch: %{name}-httpclient.patch
|
||||
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: maven-local-openjdk25
|
||||
BuildRequires: mvn(com.jcraft:jsch)
|
||||
BuildRequires: mvn(com.sun.mail:jakarta.mail)
|
||||
BuildRequires: mvn(commons-codec:commons-codec)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(commons-logging:commons-logging)
|
||||
BuildRequires: mvn(commons-net:commons-net)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.ant:ant)
|
||||
BuildRequires: mvn(org.apache.commons:commons-collections4)
|
||||
BuildRequires: mvn(org.apache.commons:commons-compress)
|
||||
BuildRequires: mvn(org.apache.commons:commons-lang3)
|
||||
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
||||
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
|
||||
BuildRequires: mvn(org.apache.httpcomponents:httpcore-nio)
|
||||
BuildRequires: mvn(org.apache.logging.log4j:log4j-core)
|
||||
BuildRequires: mvn(org.apache.logging.log4j:log4j-slf4j-impl)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin)
|
||||
BuildRequires: mvn(org.apache.sshd:sshd-core)
|
||||
BuildRequires: mvn(org.bouncycastle:bcprov-jdk16)
|
||||
BuildRequires: mvn(org.mockito:mockito-core)
|
||||
BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
%if %{with hadoop}
|
||||
BuildRequires: mvn(javax.ws.rs:jsr311-api)
|
||||
BuildRequires: mvn(org.apache.hadoop:hadoop-common)
|
||||
BuildRequires: mvn(org.apache.hadoop:hadoop-hdfs)
|
||||
BuildRequires: mvn(org.apache.hadoop:hadoop-hdfs-client)
|
||||
%endif
|
||||
%if %{with ftp}
|
||||
BuildRequires: mvn(org.apache.ftpserver:ftpserver-core)
|
||||
%endif
|
||||
%if %{with cifs}
|
||||
BuildRequires: mvn(jcifs:jcifs)
|
||||
%endif
|
||||
%if %{with mina}
|
||||
BuildRequires: mvn(org.apache.mina:mina-core)
|
||||
%endif
|
||||
|
||||
Provides: %{name}2 = %{version}-%{release}
|
||||
|
||||
%description
|
||||
Commons VFS provides a single API for accessing various
|
||||
different file systems. It presents a uniform view of the
|
||||
files from various different sources, such as the files on
|
||||
local disk, on an HTTP server, or inside a Zip archive.
|
||||
Commons VFS provides a single API for accessing various file systems.
|
||||
It presents a uniform view of the files from various sources, such as
|
||||
the files on local disk, on an HTTP server, or inside a Zip archive.
|
||||
|
||||
Some of the features of Commons VFS are:
|
||||
* A single consistent API for accessing files of different
|
||||
types.
|
||||
* 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.
|
||||
* Caching of file information. Caches information in-JVM, and
|
||||
optionally can cache remote file information on the local file
|
||||
system (replicator).
|
||||
* 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.
|
||||
* Support for logical file systems made up of files from various 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 ant
|
||||
%package ant
|
||||
Summary: Development files for Commons VFS
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: ant-openjdk25
|
||||
|
||||
%description ant
|
||||
%description ant
|
||||
This package enables support for the Commons VFS ant tasks.
|
||||
|
||||
%package examples
|
||||
%package examples
|
||||
Summary: Commons VFS Examples
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description examples
|
||||
%description examples
|
||||
VFS is a Virtual File System library - Examples.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
%package project
|
||||
Summary: Commons VFS Parent POM
|
||||
|
||||
%description javadoc
|
||||
This package contains javadoc for %{name}.
|
||||
%description project
|
||||
Commons VFS Parent POM.
|
||||
|
||||
%{?javadoc_package}
|
||||
|
||||
%prep
|
||||
%setup -q -n %{short_name}-%{version}
|
||||
perl -pi -e 's/\r$//g;' *.txt
|
||||
%{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2}
|
||||
%autosetup -n commons-vfs-%{version} -p1
|
||||
|
||||
# Remove unused dependencies
|
||||
%pom_remove_dep :maven-scm-api
|
||||
%pom_remove_dep :maven-scm-provider-svnexe
|
||||
# Remove not available module
|
||||
%pom_remove_dep :commons-vfs-sandbox
|
||||
# Disable unwanted module
|
||||
%pom_disable_module dist
|
||||
|
||||
# Fix plugin configuration
|
||||
%pom_xpath_inject "pom:project/pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" "
|
||||
<excludePackageNames>*.webdav.*</excludePackageNames>"
|
||||
# Fix ant gId
|
||||
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" "
|
||||
org.apache.ant"
|
||||
|
||||
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" "
|
||||
org.apache.ant" core
|
||||
|
||||
# Remove unwanted dependency
|
||||
%pom_remove_dep :jackrabbit-webdav core
|
||||
|
||||
# Disable jackrabbit-webdav support
|
||||
%pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin core "
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-compile</id>
|
||||
<phase>compile</phase>
|
||||
<configuration>
|
||||
<excludes>
|
||||
<exclude>**/webdav/*</exclude>
|
||||
</excludes>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>default-testCompile</id>
|
||||
<phase>test-compile</phase>
|
||||
<configuration>
|
||||
<testExcludes>
|
||||
<exclude>**/webdav/test/*</exclude>
|
||||
</testExcludes>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>testCompile</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>"
|
||||
|
||||
rm -rf core/src/main/java/org/apache/commons/vfs2/provider/webdav
|
||||
rm -rf core/src/test/java/org/apache/commons/vfs2/provider/webdav
|
||||
sed -i 's|"webdav",||' core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
|
||||
|
||||
# not really needed
|
||||
%conf
|
||||
# Not needed for RPM builds
|
||||
%pom_xpath_remove //pom:reporting
|
||||
%pom_remove_plugin :apache-rat-plugin
|
||||
%pom_remove_plugin :japicmp-maven-plugin
|
||||
%pom_remove_plugin :maven-checkstyle-plugin
|
||||
%pom_remove_plugin :commons-build-plugin
|
||||
%pom_remove_plugin :findbugs-maven-plugin
|
||||
%pom_remove_plugin :maven-pmd-plugin
|
||||
%pom_remove_plugin :maven-project-info-reports-plugin
|
||||
%pom_remove_plugin :spotbugs-maven-plugin
|
||||
|
||||
# Disable unwanted module
|
||||
%pom_disable_module commons-vfs2-distribution
|
||||
|
||||
# Fix ant gId
|
||||
%pom_change_dep -r :ant org.apache.ant:
|
||||
|
||||
# Remove webdav client (jackrabbit not packaged)
|
||||
%pom_remove_dep -r org.apache.jackrabbit:
|
||||
%pom_disable_module commons-vfs2-jackrabbit1
|
||||
%pom_disable_module commons-vfs2-jackrabbit2
|
||||
|
||||
# Remove http3 client. It needs the old commons-httpclient, which is no
|
||||
# longer available in Fedora. We support the http4 client.
|
||||
%pom_remove_dep -r commons-httpclient:commons-httpclient
|
||||
rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/http
|
||||
rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/https
|
||||
|
||||
# Remove http5 client (httpclient5 not packaged)
|
||||
%pom_remove_dep -r org.apache.httpcomponents.client5:httpclient5
|
||||
rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/http5
|
||||
rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/http5s
|
||||
|
||||
# hadoop has been retired
|
||||
%if %{without hadoop}
|
||||
%pom_remove_dep -r org.apache.hadoop
|
||||
%pom_remove_dep -r javax.ws.rs
|
||||
rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/hdfs
|
||||
%endif
|
||||
|
||||
# ftpserver is not available
|
||||
%if %{without ftp}
|
||||
%pom_remove_dep -r :ftpserver-core
|
||||
rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/ftps
|
||||
%endif
|
||||
|
||||
# jcifs not packaged and also export controlled in the US
|
||||
%if %{without cifs}
|
||||
%pom_remove_dep :jcifs
|
||||
%endif
|
||||
|
||||
# mina is not available
|
||||
%if %{without mina}
|
||||
%pom_remove_dep :mina-core
|
||||
%endif
|
||||
|
||||
# Fix installation directory and symlink
|
||||
%mvn_file :%{short_name}2 %{name}
|
||||
%mvn_file :%{short_name}2 %{name}2
|
||||
%mvn_file :%{short_name}2 %{short_name}
|
||||
%mvn_file :%{short_name}2 %{short_name}2
|
||||
%mvn_file :%{short_name}2-examples %{name}-examples
|
||||
%mvn_file :%{short_name}2-examples %{name}2-examples
|
||||
%mvn_file :%{short_name}2-examples %{short_name}-examples
|
||||
%mvn_file :%{short_name}2-examples %{short_name}2-examples
|
||||
%mvn_file :commons-vfs2 %{name}
|
||||
%mvn_file :commons-vfs2 %{name}2
|
||||
%mvn_file :commons-vfs2 commons-vfs
|
||||
%mvn_file :commons-vfs2 commons-vfs2
|
||||
%mvn_file :commons-vfs2-examples %{name}-examples
|
||||
%mvn_file :commons-vfs2-examples %{name}2-examples
|
||||
%mvn_file :commons-vfs2-examples commons-vfs-examples
|
||||
%mvn_file :commons-vfs2-examples commons-vfs2-examples
|
||||
|
||||
%mvn_alias :commons-vfs2 "org.apache.commons:%{short_name}" "%{short_name}:%{short_name}"
|
||||
%mvn_alias :commons-vfs2-examples "org.apache.commons:%{short_name}-examples" "%{short_name}:%{short_name}-examples"
|
||||
|
||||
# main package wins parent POM
|
||||
%mvn_package ":commons-vfs2-project" commons-vfs2
|
||||
%mvn_alias :commons-vfs2 "org.apache.commons:commons-vfs" "commons-vfs:commons-vfs"
|
||||
%mvn_alias :commons-vfs2-examples "org.apache.commons:commons-vfs-examples" "commons-vfs:commons-vfs-examples"
|
||||
|
||||
%build
|
||||
%mvn_build -s
|
||||
%mvn_build -sf
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/ant.d
|
||||
echo "ant commons-logging %{short_name}" > %{short_name}
|
||||
install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name}
|
||||
echo "ant commons-logging commons-vfs" > commons-vfs
|
||||
install -p -m 644 commons-vfs %{buildroot}%{_sysconfdir}/ant.d/commons-vfs
|
||||
|
||||
%files -f .mfiles-commons-vfs2
|
||||
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
|
||||
%doc README.md RELEASE-NOTES.txt
|
||||
%license LICENSE.txt NOTICE.txt
|
||||
|
||||
%files examples -f .mfiles-commons-vfs2-examples
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
%files project -f .mfiles-commons-vfs2-project
|
||||
%license LICENSE.txt NOTICE.txt
|
||||
|
||||
%files ant
|
||||
%config %{_sysconfdir}/ant.d/%{short_name}
|
||||
%config(noreplace) %{_sysconfdir}/ant.d/commons-vfs
|
||||
|
||||
%changelog
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Jun 28 2013 gil cattaneo <puntogil@libero.it> 2.0-10
|
||||
- used pom_xpath_set macro
|
||||
|
||||
* Fri Jun 28 2013 gil cattaneo <puntogil@libero.it> 2.0-9
|
||||
- swith to pom macros
|
||||
- packaged in /usr/share/java instead of /usr/share/java/apache-commons-vfs
|
||||
|
||||
* Fri Jun 28 2013 Michal Srb <msrb@redhat.com> - 2.0-8
|
||||
- Fix directory ownership
|
||||
|
||||
* Thu Jun 27 2013 Michal Srb <msrb@redhat.com> - 2.0-7
|
||||
- Build with XMvn
|
||||
- Do not ignore test failures
|
||||
- Fix BR
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2.0-5
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Wed Aug 1 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-4
|
||||
- Rebuild against javamail
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Mon Jun 18 2012 gil cattaneo <puntogil@libero.it> 2.0-2
|
||||
- add subpackage ant
|
||||
- install NOTICE.txt in javadocs subpackage
|
||||
|
||||
* Mon May 14 2012 gil cattaneo <puntogil@libero.it> 2.0-1
|
||||
- initial rpm
|
||||
%autochangelog
|
||||
|
|
|
|||
112
changelog
Normal file
112
changelog
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
* Fri May 08 2020 Fabio Valentini <decathorpe@gmail.com> - 2.6.0-1
|
||||
- Update to version 2.6.0.
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Oct 05 2019 Fabio Valentini <decathorpe@gmail.com> - 2.4.1-1
|
||||
- Update to version 2.4.1.
|
||||
|
||||
* Fri Jul 26 2019 Fabio Valentini <decathorpe@gmail.com> - 2.1-16
|
||||
- Disable ftp support by default.
|
||||
|
||||
* Wed Jul 24 2019 Fabio Valentini <decathorpe@gmail.com> - 2.1-15
|
||||
- Disable hadoop support by default.
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon Feb 06 2017 Michael Simacek <msimacek@redhat.com> - 2.1-10
|
||||
- Add conditionals for ftp and ssh
|
||||
|
||||
* Mon Feb 06 2017 Michael Simacek <msimacek@redhat.com> - 2.1-9
|
||||
- Remove rat-plugin
|
||||
|
||||
* Sun Jan 29 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1-8
|
||||
- Fix hadoop build conditionals
|
||||
|
||||
* Fri Oct 28 2016 gil cattaneo <puntogil@libero.it> 2.1-7
|
||||
- enable HDFS support (rhbz#1387108)
|
||||
|
||||
* Mon Oct 3 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1-6
|
||||
- Remove build-requires on perl
|
||||
|
||||
* Thu Jul 21 2016 gil cattaneo <puntogil@libero.it> 2.1-5
|
||||
- add missing BR
|
||||
|
||||
* Sat Jun 25 2016 gil cattaneo <puntogil@libero.it> 2.1-4
|
||||
- disable tests failure
|
||||
|
||||
* Thu Jun 02 2016 gil cattaneo <puntogil@libero.it> 2.1-3
|
||||
- disable hadoop stuff with bcond
|
||||
|
||||
* Thu Jun 02 2016 Michael Simacek <msimacek@redhat.com> - 2.1-2
|
||||
- Remove support for retired hadoop
|
||||
|
||||
* Sun May 22 2016 gil cattaneo <puntogil@libero.it> 2.1-1
|
||||
- update to 2.1
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu Jan 29 2015 gil cattaneo <puntogil@libero.it> 2.0-15
|
||||
- introduce license macro
|
||||
|
||||
* Wed Jul 30 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-14
|
||||
- Fix build-requires on apache-commons-parent
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-12
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Jun 28 2013 gil cattaneo <puntogil@libero.it> 2.0-10
|
||||
- used pom_xpath_set macro
|
||||
|
||||
* Fri Jun 28 2013 gil cattaneo <puntogil@libero.it> 2.0-9
|
||||
- swith to pom macros
|
||||
- packaged in /usr/share/java instead of /usr/share/java/apache-commons-vfs
|
||||
|
||||
* Fri Jun 28 2013 Michal Srb <msrb@redhat.com> - 2.0-8
|
||||
- Fix directory ownership
|
||||
|
||||
* Thu Jun 27 2013 Michal Srb <msrb@redhat.com> - 2.0-7
|
||||
- Build with XMvn
|
||||
- Do not ignore test failures
|
||||
- Fix BR
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2.0-5
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Wed Aug 1 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-4
|
||||
- Rebuild against javamail
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Mon Jun 18 2012 gil cattaneo <puntogil@libero.it> 2.0-2
|
||||
- add subpackage ant
|
||||
- install NOTICE.txt in javadocs subpackage
|
||||
|
||||
* Mon May 14 2012 gil cattaneo <puntogil@libero.it> 2.0-1
|
||||
- initial rpm
|
||||
3
sources
3
sources
|
|
@ -1 +1,2 @@
|
|||
ce839bb9f345de1c5da819239b395898 commons-vfs-2.0-src.tar.gz
|
||||
SHA512 (commons-vfs-2.9.0-src.tar.gz) = 8ecff4867ec512d5b0cd6339867d9d9a2d94746b5d39e025025341c447b0d1cdee48ddba7824735698026c5f8e848e740f6216270596079016d26f0a0a026468
|
||||
SHA512 (commons-vfs-2.9.0-src.tar.gz.asc) = 2780f06c890b03124dfd71ee1d59c8d5b585caca7e552257317bfcfcd46e5688ca50c9bf21b4bf7c6516afac753b6cf7f0cf68fc20f03158b4f0a74632c93b70
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue