- Cleanup with spec-cleaner and fix build on Factory.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-validator?expand=0&rev=4

apache-commons-validator.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  8 12:28:41 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner and fix build on Factory.
+
 -------------------------------------------------------------------
 Mon Apr 14 14:22:53 UTC 2014 - darin@darins.net
 

apache-commons-validator.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-validator
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -14,48 +14,43 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 %define short_name commons-validator
-
 Name:           apache-%{short_name}
+Version:        1.3.1
+Release:        0
 Summary:        Apache Commons Validator
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Version:        1.3.1
-Release:        0
 Url:            http://commons.apache.org/commons/
 Source0:        %{short_name}-%{version}-src.tar.gz
 Patch0:         commons-validator-1.3.1-crosslink.patch
 # https://issues.apache.org/jira/browse/VALIDATOR-303
 Patch1:         commons-validator-1.3.1-srcencoding.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-
 BuildRequires:  ant
 BuildRequires:  apache-commons-beanutils
+BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-logging
 BuildRequires:  jakarta-commons-digester
 BuildRequires:  java-devel
 BuildRequires:  junit
 BuildRequires:  oro
-%if 0%{?suse_version} == 1110
-BuildRequires: ant-apache-oro
-%endif
-
 Requires:       apache-commons-beanutils >= 1.5
+Requires:       apache-commons-collections
 Requires:       apache-commons-logging >= 1.0.2
 Requires:       jakarta-commons-digester >= 1.3
 Requires:       oro >= 2.0.6
-%if 0%{?suse_version} == 1110
-Requires:       ant-apache-oro
-%endif
-
 Provides:       %{short_name} = %{version}-%{release}
 Obsoletes:      %{short_name} < %{version}-%{release}
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
+%if 0%{?suse_version} == 1110
+BuildRequires:  ant-apache-oro
+Requires:       ant-apache-oro
+%endif
 
 %description
 A common issue when receiving data either electronically or from user
@@ -67,9 +62,10 @@ to address some of these issues and speed development and maintenance
 of validation rules.
 
 %package javadoc
-PreReq:         coreutils
 Summary:        Javadoc for jakarta-commons-validator
 Group:          Development/Libraries/Java
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq:         coreutils
 
 %description javadoc
 A common issue when receiving data either electronically or from user
@@ -83,8 +79,6 @@ of validation rules.
 This package contains the javadoc documentation for the Jakarta Commons
 Validator Package.
 
-
-
 %prep
 %setup -q -n %{short_name}-%{version}-src
 %patch0 -p1
@@ -100,6 +94,7 @@ sed -i 's:junit.awtui.TestRunner.main:junit.textui.TestRunner.main:g' \
 
 %build
 export CLASSPATH=$(build-classpath \
+                   commons-collections \
                    commons-logging \
                    commons-digester \
                    commons-beanutils \
@@ -110,6 +105,7 @@ ant -Dskip.download=true -Dbuild.sysclasspath=first dist
 
 %check
 export CLASSPATH=$(build-classpath \
+                   commons-collections \
                    commons-logging \
                    commons-digester \
                    commons-beanutils \
@@ -129,9 +125,6 @@ ln -s %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr dist/docs/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt