diff --git a/modello.spec b/modello.spec index 9f27bb9..1d6cd22 100644 --- a/modello.spec +++ b/modello.spec @@ -32,7 +32,7 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: google-guice BuildRequires: guava -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jsoup BuildRequires: junit BuildRequires: plexus-build-api @@ -121,12 +121,12 @@ install -pm 0644 %{name}-plugins/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{n %add_maven_depmap %{name}/%{name}-plugins.pom for i in core test; do - install -pm 0644 %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom + %mvn_install_pom %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar done for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do - install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom + %mvn_install_pom %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom %add_maven_depmap %{name}/%{name}-plugin-${i}.pom %{name}/%{name}-plugin-${i}.jar done