diff --git a/maven-archiver.spec b/maven-archiver.spec index ad8c223..2790860 100644 --- a/maven-archiver.spec +++ b/maven-archiver.spec @@ -36,9 +36,6 @@ BuildRequires: plexus-interpolation >= 1.25 BuildRequires: plexus-utils >= 3.3.0 BuildRequires: sisu-plexus BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildArch: noarch %description @@ -71,17 +68,25 @@ build-jar-repository -s lib \ %{ant} \ jar javadoc -%{mvn_artifact} pom.xml target/%{name}-%{version}.jar - %install -%mvn_install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE %doc NOTICE -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE %doc NOTICE