Fridrich Strba 2019-04-08 11:29:20 +00:00 committed by Git OBS Bridge
parent 2fd3bc284a
commit 309dc9e70e
2 changed files with 14 additions and 13 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 8 11:27:51 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Do not depend on the parent pom and remove its reference from the
pom.xml files, since we are not building using Maven.
- Install unversioned jar/pom files
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 18 08:14:00 UTC 2018 - Fridrich Strba <fstrba@suse.com> Tue Dec 18 08:14:00 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package relaxngDatatype # spec file for package relaxngDatatype
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,7 +29,6 @@ Source1: copying.txt
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local
Requires: sonatype-oss-parent
Obsoletes: %{name}-javadoc Obsoletes: %{name}-javadoc
BuildArch: noarch BuildArch: noarch
@ -42,6 +41,8 @@ implementations.
%setup -q -n relaxng-datatype-java-relaxngDatatype-%{version} %setup -q -n relaxng-datatype-java-relaxngDatatype-%{version}
cp -p %{SOURCE1} . cp -p %{SOURCE1} .
%pom_remove_parent .
%build %build
ant \ ant \
-Dbuild.sysclasspath=only \ -Dbuild.sysclasspath=only \
@ -49,22 +50,15 @@ ant \
%install %install
install -Dpm 644 %{name}.jar \ install -Dpm 644 %{name}.jar \
%{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom # pom
install -d -m 755 %{buildroot}%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar -a relaxngDatatype:relaxngDatatype %add_maven_depmap %{name}.pom %{name}.jar -a relaxngDatatype:relaxngDatatype
%files %files -f .mfiles
%license copying.txt %license copying.txt
%{_javadir}/*.jar %{_javadir}/*.jar
%{_mavenpomdir}/*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%changelog %changelog