Fridrich Strba 2019-03-25 17:46:06 +00:00 committed by Git OBS Bridge
parent 9c37da507f
commit c119c56996
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 25 17:45:27 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove pom parent, since we don't use it when not building with
maven
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 6 06:47:05 UTC 2019 - Fridrich Strba <fstrba@suse.com> Wed Feb 6 06:47:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -36,14 +36,12 @@ Patch1: commons-logging-1.2-sourcetarget.patch
Patch2: commons-logging-manifests.patch Patch2: commons-logging-manifests.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: apache-commons-parent
BuildRequires: glassfish-servlet-api BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: junit BuildRequires: junit
BuildRequires: log4j-mini >= 1.2 BuildRequires: log4j-mini >= 1.2
Requires: java >= 1.8 Requires: java >= 1.8
Requires: mvn(org.apache.commons:commons-parent:pom:)
Provides: jakarta-%{short_name} = %{version}-%{release} Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version} Obsoletes: jakarta-%{short_name} < %{version}
Provides: %{short_name} = %{version}-%{release} Provides: %{short_name} = %{version}-%{release}
@ -72,6 +70,8 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
#FIXME #FIXME
rm ./src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java rm ./src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
%pom_remove_parent .
%build %build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL mkdir -p $MAVEN_REPO_LOCAL