[felix-gogo-shell] Initial SCLization.

Krzysztof Daniel kdaniel at fedoraproject.org
Fri Mar 15 12:14:11 UTC 2013


commit 888941d6250b52a9dedbf733e1b054f0fa48f528
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Mar 15 13:13:58 2013 +0100

    Initial SCLization.

 felix-gogo-shell.spec |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/felix-gogo-shell.spec b/felix-gogo-shell.spec
index 951e69e..9901a8c 100644
--- a/felix-gogo-shell.spec
+++ b/felix-gogo-shell.spec
@@ -1,9 +1,12 @@
 %global project   felix
 %global bundle    org.apache.felix.gogo.shell
 
-Name:             %{project}-gogo-shell
+%{!?scl:%global pkg_name %{name}}
+%{?scl:%scl_package %{project}-gogo-shell}
+
+Name:             %{?scl_prefix}%{project}-gogo-shell
 Version:          0.10.0
-Release:          6%{?dist}
+Release:          7%{?dist}
 Summary:          Community OSGi R4 Service Platform Implementation - Basic Commands
 Group:            Development/Tools
 License:          ASL 2.0
@@ -12,7 +15,7 @@ URL:              http://felix.apache.org/site/apache-felix-gogo.html
 Source0:          http://mirror.catn.com/pub/apache//felix/org.apache.felix.gogo.shell-0.10.0-project.tar.gz
   
 # Changed GroupID from osgi to felix
-Patch0:           %{name}-groupid.patch
+Patch0:           %{pkg_name}-groupid.patch
 
 Patch1:           ignoreActivatorException.patch
 
@@ -23,12 +26,14 @@ BuildRequires:    jpackage-utils
 BuildRequires:    maven-local
 BuildRequires:    maven-plugin-bundle
 BuildRequires:    maven-surefire-provider-junit4
-BuildRequires:    felix-gogo-parent
-BuildRequires:    felix-gogo-runtime
+BuildRequires:    %{?scl_prefix}felix-gogo-parent
+BuildRequires:    %{?scl_prefix}felix-gogo-runtime
 BuildRequires:    felix-osgi-compendium
+%{?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
@@ -41,11 +46,11 @@ dynamic service deployment framework that is amenable to remote management.
 
 %package javadoc
 Group:            Documentation
-Summary:          Javadoc for %{name}
+Summary:          Javadoc for %{pkg_name}
 Requires:         jpackage-utils
 
 %description javadoc
-This package contains the API documentation for %{name}.
+This package contains the API documentation for %{pkg_name}.
 
 %prep
 %setup -q -n %{bundle}-%{version}
@@ -53,6 +58,7 @@ This package contains the API documentation for %{name}.
 %patch1
 
 %build
+%{?scl:%scl_maven_opts}
 mvn-rpmbuild install javadoc:aggregate 
 
 %install
@@ -66,8 +72,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
@@ -78,9 +84,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 <kdaniel at redhat.com> 0.10.0-7
+- Initial SCLization.
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list