diff --git a/felix-gogo-command.spec b/felix-gogo-command.spec index d76ee9d..0c61512 100644 --- a/felix-gogo-command.spec +++ b/felix-gogo-command.spec @@ -3,9 +3,12 @@ %global groupId org.apache.felix %global artifactId %{bundle} -Name: %{project}-gogo-command +%{!?scl:%global pkg_name %{name}} +%{?scl:%scl_package %{project}-gogo-command} + +Name: %{?scl_prefix}%{project}-gogo-command Version: 0.12.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Apache Felix Gogo Command Group: Development/Libraries @@ -30,26 +33,27 @@ BuildRequires: jpackage-utils BuildRequires: felix-osgi-core BuildRequires: felix-framework BuildRequires: felix-osgi-compendium -BuildRequires: felix-gogo-runtime -BuildRequires: felix-gogo-parent +BuildRequires: %{?scl_prefix}felix-gogo-runtime +BuildRequires: %{?scl_prefix}felix-gogo-parent BuildRequires: mvn(org.apache.felix:org.apache.felix.bundlerepository) - +%{?scl:BuildRequires: %{?scl_prefix}build} Requires: felix-framework Requires: felix-osgi-compendium -Requires: felix-gogo-runtime +Requires: %{?scl_prefix}felix-gogo-runtime Requires: mvn(org.apache.felix:org.apache.felix.bundlerepository) +%{?scl:Requires: %scl_runtime} %description Provides basic shell commands for Gogo. %package javadoc Group: Documentation -Summary: Javadoc for %{name} +Summary: Javadoc for %{pkg_name} Requires: jpackage-utils %description javadoc -API documentation for %{name}. +API documentation for %{pkg_name}. %global POM %{_mavenpomdir}/JPP.%{project}-%{bundle}.pom @@ -74,8 +78,8 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom %add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar # javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} -%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} +install -d -m 0755 %{buildroot}%{_javadocdir}/%{pkg_name} +%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{pkg_name} %files %doc LICENSE @@ -85,9 +89,12 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} %files javadoc %doc LICENSE -%{_javadocdir}/%{name} +%{_javadocdir}/%{pkg_name} %changelog +* Fri Mar 15 2013 Krzysztof Daniel 0.12.0-7 +- Initial SCLization. + * Wed Feb 13 2013 Fedora Release Engineering - 0.12.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild