apache-commons-vfs.spec

@@ -1,7 +1,7 @@
-%bcond cifs   0
-%bcond ftp    0
-%bcond hadoop 0
-%bcond mina   0
+%bcond_with     cifs
+%bcond_with     ftp
+%bcond_with     hadoop
+%bcond_with     mina
 
 Name:           apache-commons-vfs
 Version:        2.9.0
@@ -12,17 +12,16 @@ BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
 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
 
 # Migrate from the old commons-httpclient, which is no longer available in
 # Fedora, to the newer httpcomponents httpclient.
-Patch:          %{name}-httpclient.patch
+Patch0:         %{name}-httpclient.patch
 
 BuildRequires:  gnupg2
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 BuildRequires:  mvn(com.jcraft:jsch)
 BuildRequires:  mvn(com.sun.mail:jakarta.mail)
 BuildRequires:  mvn(commons-codec:commons-codec)
@@ -86,7 +85,7 @@ Some of the features of Commons VFS are:
 %package       ant
 Summary:       Development files for Commons VFS
 Requires:      %{name} = %{version}-%{release}
-Requires:      ant-openjdk25 
+Requires:      ant
 
 %description   ant
 This package enables support for the Commons VFS ant tasks.
@@ -104,13 +103,12 @@ Summary:       Commons VFS Parent POM
 %description   project
 Commons VFS Parent POM.
 
-%{?javadoc_package}
+%javadoc_package
 
 %prep
 %{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2}
 %autosetup -n commons-vfs-%{version} -p1
 
-%conf
 # Not needed for RPM builds
 %pom_xpath_remove //pom:reporting
 %pom_remove_plugin :apache-rat-plugin