From f9c6193edc42afbd656254f9bc9cabf071158eb295c23b33f438e432fff02bd1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 21 Oct 2018 10:09:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=30 --- xmlunit.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/xmlunit.spec b/xmlunit.spec index 5faf81d..9f3dd6b 100644 --- a/xmlunit.spec +++ b/xmlunit.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,7 @@ Release: 0 Summary: Provides classes to do asserts on XML License: BSD-3-Clause Group: Development/Libraries/Java -Url: http://xmlunit.sourceforge.net/ +URL: http://xmlunit.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom BuildRequires: ant @@ -82,7 +82,8 @@ ant -Djavac.source=1.6 -Djavac.target=1.6 -Dbuild.compiler=modern -Dhaltonfailur %install mkdir -p %{buildroot}%{_javadir} -install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir}/ && ln -s %{name}-%{version}.jar %{name}.jar) # Javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} @@ -91,15 +92,20 @@ cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} # poms install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 build/lib/%{name}-%{version}.pom \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap +install -m 644 %{SOURCE1} \ + %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom +%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar %files -%doc README.txt LICENSE.txt -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_datadir}/maven-metadata/%{name}.xml +%license LICENSE.txt +%doc README.txt +%{_javadir}/*.jar +%{_mavenpomdir}/* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif %files javadoc %doc userguide