diff --git a/felix-osgi-core.spec b/felix-osgi-core.spec index 5c95b7b..e7f0d53 100644 --- a/felix-osgi-core.spec +++ b/felix-osgi-core.spec @@ -2,7 +2,7 @@ Name: felix-osgi-core Version: 1.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Felix OSGi R4 Core Bundle Group: Development/Libraries @@ -18,6 +18,7 @@ BuildRequires: ant BuildRequires: jpackage-utils Requires: java >= 1:1.6.0 +Requires: felix-parent Requires(post): jpackage-utils Requires(postun): jpackage-utils @@ -28,6 +29,7 @@ OSGi Service Platform Release 4 Core Interfaces and Classes. %package javadoc Group: Documentation Summary: Javadoc for %{name} +Requires: jpackage-utils %description javadoc API documentation for %{name}. @@ -45,8 +47,6 @@ tar xf %{SOURCE1} package javadoc %install -%__rm -rf %{buildroot} - # jars install -d -m 0755 %{buildroot}%{_javadir}/felix install -m 644 target/%{bundle}-%{version}.jar \ @@ -55,9 +55,9 @@ install -m 644 target/%{bundle}-%{version}.jar \ %add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{bundle} # poms -install -d -m 755 %{buildroot}%{_datadir}/maven2/poms +install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml \ -%{buildroot}%{_datadir}/maven2/poms/JPP.felix-%{bundle}.pom +%{buildroot}%{_mavenpomdir}/JPP.felix-%{bundle}.pom # javadoc install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} @@ -73,14 +73,20 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} %defattr(-,root,root,-) %doc LICENSE %{_javadir}/felix -%{_datadir}/maven2/poms/JPP.felix-%{bundle}.pom +%{_mavenpomdir}/JPP.felix-%{bundle}.pom %{_mavendepmapfragdir}/%{name} %files javadoc %defattr(-,root,root,-) +%doc LICENSE %{_javadocdir}/%{name} %changelog +* Tue Dec 14 2010 Stanislav Ochotnicky - 1.4.0-4 +- Add felix-parent to Requires (maven builds require this) +- Add license and jpackage-utils Requires to javadoc subpackage +- Use mavenpomdir macro + * Mon Dec 13 2010 Alexander Kurtakov 1.4.0-3 - Fix pom name. - Adapt to current guidelines.