diff --git a/felix-gogo-runtime.spec b/felix-gogo-runtime.spec index fd359b3..0592497 100644 --- a/felix-gogo-runtime.spec +++ b/felix-gogo-runtime.spec @@ -1,9 +1,12 @@ %global project felix %global bundle org.apache.felix.gogo.runtime -Name: %{project}-gogo-runtime +%{!?scl:%global pkg_name %{name}} +%{?scl:%scl_package %{project}-gogo-runtime} + +Name: %{?scl_prefix}%{project}-gogo-runtime Version: 0.10.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Community OSGi R4 Service Platform Implementation - Basic Commands Group: Development/Tools License: ASL 2.0 @@ -14,13 +17,13 @@ Source0: http://www.mirrorservice.org/sites/ftp.apache.org//felix/org.a # Typecast an Event constructor call with java.util.Properties to # java.util.Dictionary because the call to the constructor with Properties # was ambiguous. -Patch1: %{name}-dictionary.patch +Patch1: %{pkg_name}-dictionary.patch # Changed path to DEPENDENCIES, LICENSE and NOTICE from META-INF to root dir -Patch2: %{name}-bundle-resources.patch +Patch2: %{pkg_name}-bundle-resources.patch # Removed failing thread IO test -Patch3: %{name}-deleted-io-test.patch +Patch3: %{pkg_name}-deleted-io-test.patch # Removed relativePath to parent pom -Patch4: %{name}-parent.patch +Patch4: %{pkg_name}-parent.patch BuildArch: noarch @@ -30,10 +33,12 @@ BuildRequires: maven-local BuildRequires: felix-osgi-core BuildRequires: felix-osgi-compendium BuildRequires: maven-surefire-provider-junit4 -BuildRequires: felix-gogo-parent +BuildRequires: %{?scl_prefix}felix-gogo-parent +%{?scl:BuildRequires: %{?scl_prefix}build} Requires: java Requires: jpackage-utils +%{?scl:Requires: %scl_runtime} %description Apache Felix is a community effort to implement the OSGi R4 Service Platform @@ -60,6 +65,7 @@ This package contains the API documentation for %{name}. %patch4 -p1 %build +%{?scl:%scl_maven_opts} mvn-rpmbuild install javadoc:aggregate %install @@ -73,8 +79,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 @@ -85,9 +91,12 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %files javadoc %doc LICENSE -%{_javadocdir}/%{name} +%{_javadocdir}/%{pkg_name} %changelog +* Fri Mar 15 2013 Krzysztof Daniel 0.10.0-8 +- Initial SCLization. + * Wed Feb 13 2013 Fedora Release Engineering - 0.10.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -109,4 +118,3 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} * Mon Nov 07 2011 Tomas Radej - 0.10.0-1 - Initial packaging -