Fridrich Strba 2019-11-12 08:03:41 +00:00 committed by Git OBS Bridge
parent 8237ce3104
commit 328ecd9707
2 changed files with 25 additions and 32 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Nov 12 08:02:50 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Add correct requires for the packages so that they pull all
required artifacts
- Clean up the packaging a bit
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 26 16:48:35 UTC 2019 - Fridrich Strba <fstrba@suse.com> Tue Mar 26 16:48:35 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -70,6 +70,8 @@ BuildRequires: xalan-j2
BuildRequires: xerces-j2 BuildRequires: xerces-j2
BuildRequires: xpp2 BuildRequires: xpp2
BuildRequires: xpp3 BuildRequires: xpp3
Requires: mvn(jaxen:jaxen)
Requires: mvn(xerces:xercesImpl)
BuildArch: noarch BuildArch: noarch
%description %description
@ -100,6 +102,9 @@ Release: 0
Summary: XOM is a new XML object model Summary: XOM is a new XML object model
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: Development/Languages/Java Group: Development/Languages/Java
Requires: mvn(xalan:xalan)
Requires: mvn(xerces:xercesImpl)
Requires: mvn(xml-apis:xml-apis)
%description -n xom %description -n xom
XOM is designed to be easy to learn and easy to use. It works very XOM is designed to be easy to learn and easy to use. It works very
@ -144,6 +149,11 @@ License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
Provides: jaxen-bootstrap = %{version} Provides: jaxen-bootstrap = %{version}
Obsoletes: jaxen-bootstrap < %{version} Obsoletes: jaxen-bootstrap < %{version}
Requires: mvn(dom4j:dom4j)
Requires: mvn(jdom:jdom)
Requires: mvn(xerces:xercesImpl)
Requires: mvn(xml-apis:xml-apis)
Requires: mvn(xom:xom)
%description -n jaxen %description -n jaxen
Jaxen is a universal object model walker, capable of evaluating XPath Jaxen is a universal object model walker, capable of evaluating XPath
@ -243,40 +253,16 @@ cp *.pom %{buildroot}/%{_mavenpomdir}/
%add_maven_depmap saxpath-%{saxpath_version}.pom saxpath-%{saxpath_version}.jar -f saxpath %add_maven_depmap saxpath-%{saxpath_version}.pom saxpath-%{saxpath_version}.jar -f saxpath
%add_maven_depmap jaxen-%{jaxen_version}.pom jaxen-%{jaxen_version}.jar -f jaxen %add_maven_depmap jaxen-%{jaxen_version}.pom jaxen-%{jaxen_version}.jar -f jaxen
%files %files -f .mfiles
%{_javadir}/jdom*.jar %{_javadir}/jdom.jar
%{_mavenpomdir}/jdom*.pom
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%files -n xom %files -n xom -f .mfiles-xom
%{_javadir}/xom*.jar %{_javadir}/xom.jar
%{_mavenpomdir}/xom*.pom
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}-xom
%else
%{_datadir}/maven-metadata/%{name}-xom.xml*
%endif
%files -n saxpath %files -n saxpath -f .mfiles-saxpath
%{_javadir}/saxpath*.jar %{_javadir}/saxpath.jar
%{_mavenpomdir}/saxpath*.pom
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}-saxpath
%else
%{_datadir}/maven-metadata/%{name}-saxpath.xml*
%endif
%files -n jaxen %files -n jaxen -f .mfiles-jaxen
%{_javadir}/jaxen*.jar %{_javadir}/jaxen.jar
%{_mavenpomdir}/jaxen*.pom
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}-jaxen
%else
%{_datadir}/maven-metadata/%{name}-jaxen.xml*
%endif
%changelog %changelog