changeset 6:60e3eecf89a8

Added spec and sources for felix-gogo-runtime dependency along with it's transitive dependencies
author Jie Kang <jkang@redhat.com>
date Wed, 03 Jun 2015 12:15:29 -0400
parents 1386bd56c205
children 6d02ec1d6684
files rpmbuild/SOURCES/felix-gogo-runtime-bundle-resources.patch rpmbuild/SOURCES/felix-gogo-runtime-deleted-io-test.patch rpmbuild/SOURCES/felix-gogo-runtime-dictionary.patch rpmbuild/SOURCES/felix-gogo-runtime-parent.patch rpmbuild/SOURCES/felix-parent-2.1.tar.gz rpmbuild/SOURCES/gogo-parent-0.6.0.tar.gz rpmbuild/SOURCES/org.apache.felix.gogo.runtime-0.12.1.tar.gz rpmbuild/SPECS/felix-gogo-parent.spec rpmbuild/SPECS/felix-gogo-runtime.spec rpmbuild/SPECS/felix-parent.spec
diffstat 10 files changed, 459 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SOURCES/felix-gogo-runtime-bundle-resources.patch	Wed Jun 03 12:15:29 2015 -0400
@@ -0,0 +1,13 @@
+diff --git a/pom.xml b/pom.xml
+index 345457c..d467d41 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -71,7 +71,7 @@
+                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+                         <Bundle-Activator>org.apache.felix.gogo.runtime.activator.Activator</Bundle-Activator>
+-                        <Include-Resource>{maven-resources},META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
++                        <Include-Resource>{maven-resources},LICENSE,NOTICE,DEPENDENCIES</Include-Resource>
+                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                         <_removeheaders>Private-Package,Ignore-Package,Include-Resource</_removeheaders>
+                     </instructions>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SOURCES/felix-gogo-runtime-deleted-io-test.patch	Wed Jun 03 12:15:29 2015 -0400
@@ -0,0 +1,95 @@
+diff --git a/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java b/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java
+deleted file mode 100644
+index 32ea917..0000000
+--- a/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java
++++ /dev/null
+@@ -1,89 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *   http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied.  See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- */
+-package org.apache.felix.gogo.runtime.threadio;
+-
+-import junit.framework.TestCase;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.PrintStream;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-public class TestThreadIO extends TestCase
+-{
+-
+-    /**
+-     * Test if the threadio works in a nested fashion. We first push
+-     * ten markers on the stack and print a message for each, capturing
+-     * the output in a ByteArrayOutputStream. Then we pop them, also printing
+-     * a message identifying the level. Then we verify the output for each level.
+-     */
+-    public void testNested()
+-    {
+-        ThreadIOImpl tio = new ThreadIOImpl();
+-        tio.start();
+-        List<ByteArrayOutputStream> list = new ArrayList<ByteArrayOutputStream>();
+-        for (int i = 0; i < 10; i++)
+-        {
+-            ByteArrayOutputStream out = new ByteArrayOutputStream();
+-            list.add(out);
+-            tio.setStreams(System.in, new PrintStream(out), System.err);
+-            System.out.print("b" + i);
+-        }
+-        for (int i = 9; i >= 0; i--)
+-        {
+-            System.out.println("e" + i);
+-            tio.close();
+-        }
+-        tio.stop();
+-        for (int i = 0; i < 10; i++)
+-        {
+-            String message = list.get(i).toString().trim();
+-            assertEquals("b" + i + "e" + i, message);
+-        }
+-    }
+-
+-    /**
+-     * Simple test too see if the basics work.
+-     */
+-    public void testSimple()
+-    {
+-        ThreadIOImpl tio = new ThreadIOImpl();
+-        tio.start();
+-        System.out.println("Hello World");
+-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+-        ByteArrayOutputStream err = new ByteArrayOutputStream();
+-        tio.setStreams(System.in, new PrintStream(out), new PrintStream(err));
+-        try
+-        {
+-            System.out.println("Simple Normal Message");
+-            System.err.println("Simple Error Message");
+-        }
+-        finally
+-        {
+-            tio.close();
+-        }
+-        tio.stop();
+-        String normal = out.toString().trim();
+-        //String error = err.toString().trim();
+-        assertEquals("Simple Normal Message", normal);
+-        //assertEquals("Simple Error Message", error );
+-        System.out.println("Goodbye World");
+-    }
+-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SOURCES/felix-gogo-runtime-dictionary.patch	Wed Jun 03 12:15:29 2015 -0400
@@ -0,0 +1,21 @@
+diff --git a/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java b/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
+index 2368ce1..dab9269 100644
+--- a/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
++++ b/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
+@@ -19,6 +19,7 @@
+ package org.apache.felix.gogo.runtime.activator;
+ 
+ import java.util.Properties;
++import java.util.Dictionary;
+ 
+ import org.apache.felix.gogo.api.CommandSessionListener;
+ import org.apache.felix.service.command.CommandSession;
+@@ -45,7 +46,7 @@ public class EventAdminListener implements CommandSessionListener
+         if (admin != null) {
+             Properties props = new Properties();
+             props.setProperty("command", command.toString());
+-            Event event = new Event("org/apache/felix/service/command/EXECUTING", props);
++            Event event = new Event("org/apache/felix/service/command/EXECUTING", (Dictionary)props);
+             admin.postEvent(event);
+         }
+     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SOURCES/felix-gogo-runtime-parent.patch	Wed Jun 03 12:15:29 2015 -0400
@@ -0,0 +1,12 @@
+diff --git a/pom.xml b/pom.xml
+index d467d41..5dd4bbb 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -21,7 +21,6 @@
+         <groupId>org.apache.felix</groupId>
+         <artifactId>gogo-parent</artifactId>
+         <version>0.6.0</version>
+-        <relativePath>../gogo-parent/pom.xml</relativePath>
+     </parent>
+     <modelVersion>4.0.0</modelVersion>
+     <packaging>bundle</packaging>
Binary file rpmbuild/SOURCES/felix-parent-2.1.tar.gz has changed
Binary file rpmbuild/SOURCES/gogo-parent-0.6.0.tar.gz has changed
Binary file rpmbuild/SOURCES/org.apache.felix.gogo.runtime-0.12.1.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SPECS/felix-gogo-parent.spec	Wed Jun 03 12:15:29 2015 -0400
@@ -0,0 +1,86 @@
+%global project   felix-gogo
+%global pkgname   parent
+
+%{!?scl:%global pkg_name %{name}}
+%{?scl:%scl_package %{project}-%{pkgname}}
+
+Name:             %{?scl_prefix}%{project}-%{pkgname}
+Version:          0.6.0
+Release:          10%{?dist}
+Summary:          Parent package for Felix Gogo
+License:          ASL 2.0
+URL:              http://felix.apache.org/site/apache-felix-gogo.html
+
+# For building from version control
+# The source for this package was built from upstream's vcs. Use the following
+# commands to generate the tarball:
+# svn checkout http://svn.apache.org/repos/asf/felix/releases/gogo-parent-0.6.0
+# tar -cJvf gogo-parent-0.6.0.tar.gz gogo-parent-0.6.0
+Source0:          gogo-parent-%{version}.tar.gz
+BuildArch:        noarch
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:felix-parent:pom:)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-compiler-plugin)
+BuildRequires:  mvn(org.easymock:easymock)
+BuildRequires:  mvn(org.mockito:mockito-all)
+
+%{?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.
+
+%prep
+%setup -q -n gogo-parent-%{version}
+
+%build
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE NOTICE
+
+%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.6.0-9
+- Rebuild to regenerate Maven auto-requires
+
+* Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 0.6.0-8
+- Adapt to current guidelines
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Mar 15 2013 Krzysztof Daniel <kdaniel@redhat.com> 0.6.0-6
+- Initial SCLization.
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 0.6.0-4
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Nov 07 2011 Tomas Radej <tradej@redhat.com> - 0.6.0-2
+- Added install section to verify dependencies
+- Added (build)requires to maven
+
+* Wed Nov 02 2011 Tomas Radej <tradej@redhat.com> - 0.6.0-1
+- Initial Packaging
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SPECS/felix-gogo-runtime.spec	Wed Jun 03 12:15:29 2015 -0400
@@ -0,0 +1,125 @@
+%global project   felix
+%global bundle    org.apache.felix.gogo.runtime
+
+%{!?scl:%global pkg_name %{name}}
+%{?scl:%scl_package %{project}-gogo-runtime}
+
+Name:           %{?scl_prefix}%{project}-gogo-runtime
+Version:        0.12.1
+Release:        1%{?dist}
+Summary:        Community OSGi R4 Service Platform Implementation - Basic Commands
+License:        ASL 2.0
+URL:            http://felix.apache.org/site/apache-felix-gogo.html
+# For building from version control
+# The source for this package was built from upstream's vcs. Use the following
+# commands to generate the tarball:
+# svn checkout http://svn.apache.org/repos/asf/felix/releases/org.apache.felix.gogo.runtime-0.12.1/
+# tar -cJvf org.apache.felix.gogo.runtime-0.12.1.tar.gz org.apache.felix.gogo.runtime-0.12.1
+Source0:        %{bundle}-%{version}.tar.gz
+
+
+# Typecast an Event constructor call with java.util.Properties to 
+# java.util.Dictionary because the call to the constructor with Properties
+# was ambiguous.
+Patch1:         %{pkg_name}-dictionary.patch
+# Changed path to DEPENDENCIES, LICENSE and NOTICE from META-INF to root dir
+Patch2:         %{pkg_name}-bundle-resources.patch
+# Removed failing thread IO test
+Patch3:         %{pkg_name}-deleted-io-test.patch
+# Removed relativePath to parent pom
+Patch4:         %{pkg_name}-parent.patch
+
+BuildArch:      noarch
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:gogo-parent:pom:)
+BuildRequires:  mvn(org.easymock:easymock)
+BuildRequires:  mvn(org.mockito:mockito-all)
+BuildRequires:  mvn(org.osgi:org.osgi.compendium)
+BuildRequires:  mvn(org.osgi:org.osgi.core)
+
+%{?scl:BuildRequires:	  %{?scl_prefix}build}
+
+%{?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
+Summary:        Javadoc for %{name}
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n %{bundle}-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+%mvn_file : %{project}/%{name}
+
+%build
+%{?scl:%scl_maven_opts}
+%mvn_build
+
+%install
+%mvn_install
+
+
+%files -f .mfiles
+%dir %{_javadir}/%{project}
+%doc DEPENDENCIES LICENSE NOTICE 
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
+
+%changelog
+* Thu Jul 3 2014 Alexander Kurtakov <akurtako@redhat.com> 0.12.1-1
+- Update to upstream 0.12.1.
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.10.0-11
+- Use Requires: java-headless rebuild (#1067528)
+
+* Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 0.10.0-10
+- Adapt to current guidelines
+- Install NOTICE file with javadoc subpackage
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Mar 15 2013 Krzysztof Daniel <kdaniel@redhat.com> 0.10.0-8
+- Initial SCLization.
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 0.10.0-6
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jan 18 2012 Tomas Radej <tradej@redhat.com> - 0.10.0-4
+- Changed jar path
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Dec 16 2011 Tomas Radej <tradej@redhat.com> - 0.10.0-2
+- Repackaged, minor changes
+
+* Mon Nov 07 2011 Tomas Radej <tradej@redhat.com> - 0.10.0-1
+- Initial packaging
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpmbuild/SPECS/felix-parent.spec	Wed Jun 03 12:15:29 2015 -0400
@@ -0,0 +1,107 @@
+Name:           felix-parent
+Version:        2.1
+Release:        7%{?dist}
+Summary:        Parent POM file for Apache Felix Specs
+License:        ASL 2.0
+URL:            http://felix.apache.org/
+# For building from version control
+# The source for this package was built from upstream's vcs. Use the following
+# commads to generate the tarball:
+# svn checkout http://svn.apache.org/repos/asf/felix/releases/felix-parent-2.1
+# tar -cJvf felix-parent-2.1.tar.gz felix-parent-2.1
+Source0:        %{name}-%{version}.tar.gz
+
+BuildArch:      noarch
+
+BuildRequires:  maven-local
+BuildRequires:  mockito
+BuildRequires:  maven-site-plugin
+BuildRequires:  maven-release-plugin
+
+%description
+Parent POM file for Apache Felix Specs.
+
+%prep
+%setup -q -n felix-parent-%{version}
+%mvn_alias : :felix
+%pom_remove_plugin :maven-site-plugin
+%pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin
+%pom_remove_plugin :apache-rat-plugin
+
+# wagon ssh dependency unneeded
+%pom_xpath_remove pom:extensions
+
+%build
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE NOTICE
+
+%changelog
+* Thu Apr 09 2015 Michael Simacek <msimacek@redhat.com> - 2.1-7
+- Add BR maven-release-plugin
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1-5
+- Rebuild to regenerate Maven auto-requires
+
+* Wed Mar 05 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.1-4
+- Remove build extensions from pom
+
+* Mon Aug 5 2013 Krzysztof Daniel <kdaniel@redhat.com> 2.1-3
+- Remove apache-rat-plugin.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul 23 2013 Alexander Kurtakov <akurtako@redhat.com> 2.1-1
+- Update to upstream 2.1.
+
+* Fri May 31 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.1-12
+- Add alias org.apache.felix:felix
+
+* Fri May 31 2013 Marek Goldmann <mgoldman@redhat.com> - 1.2.1-12
+- Cleanup
+- New guidelines
+- felix-parent has many unnecessary Requires, RHBZ#969299
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.2.1-10
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Tue Dec 18 2012 Michal Srb <msrb@redhat.com> - 1.2.1-9
+- Removed dependency on maven-site-plugin
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Mar 30 2011 Alexander Kurtakov <akurtako@redhat.com> 1.2.1-6
+- Fix faulty compiler plugin settings setting source but not target.
+
+* Sun Mar 13 2011 Mat Booth <fedora@matbooth.co.uk> 1.2.1-5
+- Add dep on maven-plugin-jxr.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec 27 2010 Mat Booth <fedora@matbooth.co.uk> - 1.2.1-3
+- Add legacy depmap from maven2-common-poms for felix packages that still
+  specify "felix" instead of "felix-parent"
+
+* Tue Jul 20 2010 Hui Wang <huwang@redhat.com> - 1.2.1-2
+- Update summary and description
+- Add comment in mvn-jpp
+
+* Fri Jul 16 2010 Hui Wang <huwang@redhat.com> - 1.2.1-1
+- Initial version of the package