Accepting request 496818 from Java:packages

- Remove unneeded deps

- New build dependency: javapackages-local

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

velocity.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri May 19 16:41:19 UTC 2017 - tchvatal@suse.com
+
+- Remove unneeded deps
+
+-------------------------------------------------------------------
+Fri May 19 09:23:26 UTC 2017 - dziolkowski@suse.com
+
+- New build dependency: javapackages-local
+
 -------------------------------------------------------------------
 Wed Mar 18 09:46:23 UTC 2015 - tchvatal@suse.com
 

velocity.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package velocity
 #
-# 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
@@ -22,21 +22,10 @@ Release:        0
 Summary:        Java-based template engine
 License:        Apache-2.0
 Group:          Development/Libraries/Java
+Url:            http://velocity.apache.org/
 Source0:        http://www.apache.org/dist/velocity/engine/1.7/%{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}.pom
 Patch0:         velocity-build_xml.patch
-Url:            http://velocity.apache.org/
-Requires:       avalon-logkit
-Requires:       commons-collections
-Requires:       commons-lang
-Requires:       java >= 1.5.0
-Requires:       jdom >= 1.0-1
-Requires:       log4j >= 1.1
-#Requires:       jakarta-oro
-Requires:       oro
-# Use servletapi4 instead of servletapi5
-Requires:       servletapi4
-Requires:       werken-xpath
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  ant-junit
 BuildRequires:  antlr
@@ -45,20 +34,27 @@ BuildRequires:  classworlds
 BuildRequires:  commons-collections
 BuildRequires:  commons-lang
 BuildRequires:  commons-logging
+BuildRequires:  fdupes
 BuildRequires:  hsqldb
+BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  jdom >= 1.0-1
 BuildRequires:  junit
 BuildRequires:  log4j >= 1.1
 BuildRequires:  oro
-# Use servletapi4 instead of servletapi5
-BuildRequires:  fdupes
 BuildRequires:  servletapi4
 BuildRequires:  werken-xpath
-Requires(post):    javapackages-tools
-Requires(postun):  javapackages-tools
-BuildArch:      noarch
+Requires:       avalon-logkit
+Requires:       commons-collections
+Requires:       commons-lang
+Requires:       java >= 1.5.0
+Requires:       jdom >= 1.0-1
+Requires:       log4j >= 1.1
+Requires:       oro
+Requires:       servletapi4
+Requires:       werken-xpath
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 Velocity is a Java-based template engine. It permits anyone to use the
@@ -109,9 +105,6 @@ applications to be developed according to a true MVC model.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation/HTML
-Requires(post):   %{__rm}
-Requires(post):   /bin/ln
-Requires(postun): %{__rm}
 
 %description    javadoc
 Velocity is a Java-based template engine. It permits anyone to use the
@@ -161,7 +154,7 @@ Velocity+Turbine provides a template service that will allow web
 applications to be developed according to a true MVC model.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 # Remove all binary libs used in compiling the package.
 # Note that velocity has some jar files containing macros under
 # examples and test that should not be removed.
@@ -207,21 +200,21 @@ ant \
 
 %install
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 bin/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
 rm -rf docs/api
 # data
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d -m 755 %{buildroot}%{_datadir}/%{name}
+cp -pr examples test %{buildroot}%{_datadir}/%{name}
 %fdupes -s %{buildroot}
 
 %files