- Remove unneeded deps

OBS-URL: https://build.opensuse.org/package/show/Java:packages/velocity?expand=0&rev=24
This commit is contained in:
Tomáš Chvátal 2017-05-19 16:40:17 +00:00 committed by Git OBS Bridge
parent ab931ecd0e
commit df69ccfecf
2 changed files with 26 additions and 29 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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

View File

@ -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,6 +34,7 @@ BuildRequires: classworlds
BuildRequires: commons-collections
BuildRequires: commons-lang
BuildRequires: commons-logging
BuildRequires: fdupes
BuildRequires: hsqldb
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
@ -52,14 +42,19 @@ 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
@ -110,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
@ -162,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.
@ -208,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