Accepting request 496717 from Java:packages
1 OBS-URL: https://build.opensuse.org/request/show/496717 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-portlet-1_0-api?expand=0&rev=19
This commit is contained in:
commit
228064b5f6
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 19 10:15:13 UTC 2017 - pcervinka@suse.com
|
||||
|
||||
- New build dependency: javapackages-local
|
||||
- Removed maven conditions
|
||||
- Spec file cleaned
|
||||
- Fixed javadoc Requires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 18 09:46:01 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package apache-portlet-1_0-api
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 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
|
||||
@ -16,9 +16,6 @@
|
||||
#
|
||||
|
||||
|
||||
%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
|
||||
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
|
||||
%define with_maven 0
|
||||
%define short_name portlet
|
||||
%define base_name %{short_name}-1.0-api
|
||||
Name: apache-portlet-1_0-api
|
||||
@ -35,21 +32,12 @@ Source2: apache-portlet-1.0-api-LICENSE.TXT
|
||||
Source3: apache-portlet-1.0-api-build.xml
|
||||
BuildRequires: ant >= 1.6
|
||||
BuildRequires: java-devel >= 1.4
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
Provides: portlet = %{version}
|
||||
Provides: portlet-1.0-api = %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
%if %{with_maven}
|
||||
BuildRequires: maven2 >= 2.0.4-9
|
||||
BuildRequires: maven2-plugin-compiler
|
||||
BuildRequires: maven2-plugin-install
|
||||
BuildRequires: maven2-plugin-jar
|
||||
BuildRequires: maven2-plugin-javadoc
|
||||
BuildRequires: maven2-plugin-release
|
||||
BuildRequires: maven2-plugin-resources
|
||||
BuildRequires: maven2-plugin-surefire
|
||||
%endif
|
||||
|
||||
%description
|
||||
Java Standard Portlet API accoring to JSR-168, from Jetspeed-2 .
|
||||
@ -57,9 +45,6 @@ Java Standard Portlet API accoring to JSR-168, from Jetspeed-2 .
|
||||
%package javadoc
|
||||
Summary: Portlet API 1.0 from Jetspeed2
|
||||
Group: Development/Libraries/Java
|
||||
Requires(post): /bin/ln
|
||||
Requires(post): /bin/rm
|
||||
Requires(postun): /bin/rm
|
||||
|
||||
%description javadoc
|
||||
Java Standard Portlet API accoring to JSR-168, from Jetspeed-2 .
|
||||
@ -74,14 +59,7 @@ cp %{SOURCE1} pom.xml
|
||||
cp %{SOURCE3} build.xml
|
||||
|
||||
%build
|
||||
%if %{with_maven}
|
||||
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
|
||||
mvn-jpp -e \
|
||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||
install javadoc:javadoc
|
||||
%else
|
||||
ant jar javadoc
|
||||
%endif
|
||||
|
||||
%install
|
||||
install -d -m 755 %{buildroot}%{_javadir}
|
||||
|
Loading…
Reference in New Issue
Block a user