diff --git a/.devtoolset-3-felix-gogo-shell.metadata b/.devtoolset-3-felix-gogo-shell.metadata new file mode 100644 index 0000000..9c3a776 --- /dev/null +++ b/.devtoolset-3-felix-gogo-shell.metadata @@ -0,0 +1 @@ +12a2f638f2dd662f6c2cbf2e39c5462541350591 SOURCES/org.apache.felix.gogo.shell-0.10.0-project.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fbc96ac --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/org.apache.felix.gogo.shell-0.10.0-project.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/felix-gogo-shell-groupid.patch b/SOURCES/felix-gogo-shell-groupid.patch new file mode 100644 index 0000000..563c9e7 --- /dev/null +++ b/SOURCES/felix-gogo-shell-groupid.patch @@ -0,0 +1,20 @@ +diff --git a/pom.xml b/pom.xml +index af31761..f49d7c3 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -30,13 +30,13 @@ + 0.10.0 + + +- org.osgi ++ org.apache.felix + org.osgi.core + 4.2.0 + provided + + +- org.osgi ++ org.apache.felix + org.osgi.compendium + 4.0.0 + provided diff --git a/SOURCES/ignoreActivatorException.patch b/SOURCES/ignoreActivatorException.patch new file mode 100644 index 0000000..aeabc7f --- /dev/null +++ b/SOURCES/ignoreActivatorException.patch @@ -0,0 +1,14 @@ +Index: src/main/java/org/apache/felix/gogo/shell/Activator.java +=================================================================== +--- src/main/java/org/apache/felix/gogo/shell/Activator.java (revision 1238398) ++++ src/main/java/org/apache/felix/gogo/shell/Activator.java (working copy) +@@ -74,6 +74,9 @@ + args = (args == null) ? "" : args; + session.execute("gosh --login " + args); + } ++ catch (InterruptedException e){ ++ // ignore ++ } + catch (Exception e) + { + Object loc = session.get(".location"); diff --git a/SPECS/felix-gogo-shell.spec b/SPECS/felix-gogo-shell.spec new file mode 100644 index 0000000..48c5eee --- /dev/null +++ b/SPECS/felix-gogo-shell.spec @@ -0,0 +1,109 @@ +%global project felix +%global bundle org.apache.felix.gogo.shell +%global groupId org.apache.felix +%global artifactId %{bundle} + +%{!?scl:%global pkg_name %{name}} +%{?scl:%scl_package %{project}-gogo-shell} +%{!?maven_scl:%global maven_scl_prefix %{nil}} + +Name: %{?scl_prefix}%{project}-gogo-shell +Version: 0.10.0 +Release: 7%{?dist} +Summary: Community OSGi R4 Service Platform Implementation - Basic Commands +Group: Development/Tools +License: ASL 2.0 +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: %{pkg_name}-groupid.patch + +Patch1: ignoreActivatorException.patch + +BuildArch: noarch + +BuildRequires: java-1.7.0-openjdk-devel >= 1.7.0 +BuildRequires: jpackage-utils +BuildRequires: %{maven_scl_prefix}maven-local +BuildRequires: %{maven_scl_prefix}maven-plugin-bundle +BuildRequires: %{maven_scl_prefix}maven-surefire-provider-junit +BuildRequires: %{?scl_prefix}felix-gogo-parent +BuildRequires: %{?scl_prefix}felix-gogo-runtime +BuildRequires: %{maven_scl_prefix}felix-osgi-compendium +BuildRequires: %{maven_scl_prefix}maven-install-plugin +#BuildRequires: mockito +%{?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 +and other interesting OSGi-related technologies under the Apache license. The +OSGi specifications originally targeted embedded devices and home services +gateways, but they are ideally suited for any project interested in the +principles of modularity, component-orientation, and/or service-orientation. +OSGi technology combines aspects of these aforementioned principles to define a +dynamic service deployment framework that is amenable to remote management. + +%package javadoc +Group: Documentation +Summary: Javadoc for %{pkg_name} + +%description javadoc +This package contains the API documentation for %{pkg_name}. + +%prep +%setup -q -n %{bundle}-%{version} +%patch0 -p1 -F3 +%patch1 + +%build +scl enable %{scl} - <> %{_builddir}/%{bundle}-%{version}/.mfiles-javadoc; +done + + +%files -f .mfiles +%doc DEPENDENCIES LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE + +%changelog +* Sat May 17 2014 Sami Wagiaalla 0.10.0-7 +- Build for DTS 3. +- Install javadoc manually +- Remvoe mockito BR. + +* Fri May 16 2014 Sami Wagiaalla 0.10.0-7 +- Copy mvn_rpmbuild fix from RAWHIDE +- Use maven scl deps. +- enable maven scl for mvn_* macros + +* Wed Feb 13 2013 Krzysztof Daniel 0.10.0-6 +- Make noarch again. + +* Wed Nov 21 2012 Krzysztof Daniel 0.10.0-5 +- Add Exclusive arch. + +* Thu Jul 19 2012 Fedora Release Engineering - 0.10.0-4 +- Initial contribution to scl.