Accepting request 145643 from Java:packages

- require avalon-logkit
  * drop excalibur from Factory

OBS-URL: https://build.opensuse.org/request/show/145643
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/velocity?expand=0&rev=10

velocity.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 17 12:17:24 UTC 2012 - mvyskocil@suse.com
+
+- require avalon-logkit
+  * drop excalibur from Factory
+
 -------------------------------------------------------------------
 Wed Jun  3 17:14:32 CEST 2009 - mvyskocil@suse.cz
 

velocity.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package velocity (Version 1.5)
+# spec file for package velocity
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -20,18 +20,18 @@
 
 Name:           velocity
 Version:        1.5
-Release:        1
+Release:        0
 Summary:        Java-based template engine
 License:        Apache-2.0
+Group:          Development/Libraries/Java
 Source0:        http://www.apache.org/dist/velocity/engine/1.5/velocity-1.5.tar.bz2
 Source1:        http://repo1.maven.org/maven2/velocity/velocity/1.5/velocity-1.5.pom
 Patch0:         velocity-build_xml.patch
 Url:            http://velocity.apache.org/
-Group:          Development/Libraries/Java
+Requires:       avalon-logkit
+Requires:       commons-collections
+Requires:       commons-lang
 Requires:       java >= 1.5.0
-Requires:       excalibur-avalon-logkit
-Requires:       jakarta-commons-collections
-Requires:       jakarta-commons-lang
 Requires:       jdom >= 1.0-1
 Requires:       log4j >= 1.1
 #Requires:       jakarta-oro
@@ -39,24 +39,24 @@ Requires:       oro
 # Use servletapi4 instead of servletapi5
 Requires:       servletapi4
 Requires:       werken-xpath
-BuildRequires:  jpackage-utils >= 1.7.4
-BuildRequires:  java-devel = 1.5.0
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  ant-junit
 BuildRequires:  antlr
-BuildRequires:  junit
-BuildRequires:  hsqldb
+BuildRequires:  avalon-logkit
 BuildRequires:  classworlds
-BuildRequires:  excalibur-avalon-logkit
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-lang
+BuildRequires:  commons-collections
+BuildRequires:  commons-lang
+BuildRequires:  hsqldb
+BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  jdom >= 1.0-1
+BuildRequires:  jpackage-utils >= 1.7.4
+BuildRequires:  junit
 BuildRequires:  log4j >= 1.1
 BuildRequires:  oro
 # Use servletapi4 instead of servletapi5
+BuildRequires:  fdupes
 BuildRequires:  servletapi4
 BuildRequires:  werken-xpath
-BuildRequires:  fdupes
 Requires(post):    jpackage-utils >= 1.7.4
 Requires(postun):  jpackage-utils >= 1.7.4
 BuildArch:      noarch
@@ -84,7 +84,6 @@ Velocity+Turbine provides a template service that will allow web
 applications to be developed according to a true MVC model.
 
 %package        manual
-License:        Apache-2.0
 Summary:        Manual for %{name}
 Group:          Development/Libraries/Java
 
@@ -110,9 +109,8 @@ Velocity+Turbine provides a template service that will allow web
 applications to be developed according to a true MVC model.
 
 %package        javadoc
-License:        Apache-2.0
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation/HTML
 Requires(post):   %{__rm}
 Requires(post):   /bin/ln
 Requires(postun): %{__rm}
@@ -139,7 +137,6 @@ Velocity+Turbine provides a template service that will allow web
 applications to be developed according to a true MVC model.
 
 %package        demo
-License:        Apache-2.0
 Summary:        Demo for %{name}
 Group:          Development/Libraries/Java
 Requires:       %{name} = %{version}-%{release}
@@ -178,7 +175,7 @@ done
 #%patch99 -b .sav99
 
 %build
-export JAVA_HOME=%{_jvmdir}/java-1.5.0
+#export JAVA_HOME=%{_jvmdir}/java-1.5.0
 # Use servletapi4 instead of servletapi5 in CLASSPATH
 mkdir -p bin/test-lib
 pushd bin/test-lib
@@ -189,7 +186,7 @@ mkdir -p bin/lib
 pushd bin/lib
 ln -sf $(build-classpath ant)
 ln -sf $(build-classpath antlr)
-ln -sf $(build-classpath excalibur/avalon-logkit)
+ln -sf $(build-classpath avalon-logkit)
 ln -sf $(build-classpath commons-collections)
 ln -sf $(build-classpath commons-lang)
 ln -sf $(build-classpath jdom)