diff --git a/oro.spec b/oro.spec index 98cddf2..6363b37 100644 --- a/oro.spec +++ b/oro.spec @@ -1,7 +1,7 @@ # # spec file for package oro # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ License: Apache-2.0 Group: Development/Libraries/Java Url: http://jakarta.apache.org/oro/ Source0: http://archive.apache.org/dist/jakarta/oro/%{full_name}-%{version}.tar.gz -Source2: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom +Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -66,17 +66,26 @@ ant \ -Dfinal.name=%{name} jar javadocs %install -%mvn_file : %{full_name} %{name} -%mvn_artifact %{SOURCE2} %{name}.jar - -%mvn_install -J docs/api +# jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0655 %{name}.jar %{buildroot}%{_javadir}/ +ln -sf %{name}.jar %{buildroot}%{_javadir}/%{full_name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +install -pm %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes %{buildroot}%{_javadocdir} %files -f .mfiles %doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS STYLE %license LICENSE +%{_javadir}/%{full_name}.jar -%files javadoc -f .mfiles-javadoc +%files javadoc %license LICENSE +%{_javadocdir}/%{name} %changelog