From ad7778198481323d105fa22ee0c74d922bc84a64 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Jun 18 2015 13:04:14 +0000 Subject: Update to 1.2.0 version. The git repo referenced no longer exists and this is prereq for updating felix-framework. --- diff --git a/.gitignore b/.gitignore index f36cb50..ef2a04c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /felix-osgi-obr-resolver-0.1.0.Beta1.tar.xz /noarch /*.src.rpm +/org.apache.felix.resolver-1.2.0-source-release.tar.gz diff --git a/0001-Use-felix-directly.patch b/0001-Use-felix-directly.patch deleted file mode 100644 index 7aaaa65..0000000 --- a/0001-Use-felix-directly.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0996b3e0447e81e445b8d9e486f2eae58966f3b2 Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Thu, 14 Jun 2012 11:15:05 +0200 -Subject: [PATCH 1/2] Use felix directly - ---- - pom.xml | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 3fb1672..2b1db18 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -33,9 +33,9 @@ - org.apache.felix.resolver - - -- org.osgi -- org.osgi.core -- 4.3.0 -+ org.apache.felix -+ org.apache.felix.framework -+ 4.0.2 - - - --- -1.7.10.2 - diff --git a/0002-JDK7-support.patch b/0002-JDK7-support.patch deleted file mode 100644 index 86e904f..0000000 --- a/0002-JDK7-support.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a0ad08bb71b38bb0d9e234f0677d8243e6cce8c0 Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Fri, 15 Jun 2012 13:09:59 +0200 -Subject: [PATCH 2/2] JDK7 support - ---- - src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java | 6 +++--- - src/main/java/org/osgi/service/resolver/Resolver.java | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java b/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java -index 1f44d0d..9bac315 100644 ---- a/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java -+++ b/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java -@@ -73,8 +73,8 @@ public class ResolverImpl implements FelixResolver - - public Map> resolve( - Environment env, -- Collection mandatoryRevisions, -- Collection optionalRevisions) -+ Collection mandatoryRevisions, -+ Collection optionalRevisions) - { - return resolve((FelixEnvironment)env, mandatoryRevisions, optionalRevisions, Collections.EMPTY_SET); - } -@@ -1787,4 +1787,4 @@ public class ResolverImpl implements FelixResolver - && m_cap.equals(((Blame) o).m_cap); - } - } --} -\ No newline at end of file -+} -diff --git a/src/main/java/org/osgi/service/resolver/Resolver.java b/src/main/java/org/osgi/service/resolver/Resolver.java -index 7c7bbe4..f4bb536 100644 ---- a/src/main/java/org/osgi/service/resolver/Resolver.java -+++ b/src/main/java/org/osgi/service/resolver/Resolver.java -@@ -105,7 +105,7 @@ public interface Resolver { - * if environment is null - */ - Map> resolve(Environment environment, -- Collection mandatoryResources, -- Collection optionalResources) -+ Collection mandatoryResources, -+ Collection optionalResources) - throws ResolutionException; - } --- -1.7.10.2 - diff --git a/0003-Compile-with-target-1.5-or-greater.patch b/0003-Compile-with-target-1.5-or-greater.patch deleted file mode 100644 index c69a3bb..0000000 --- a/0003-Compile-with-target-1.5-or-greater.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2a0ea60b4bb95661a10fd5a7b4e7152a951668a4 Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Tue, 24 Jul 2012 11:49:56 +0200 -Subject: [PATCH 3/3] Compile with -target 1.5 or greater - ---- - pom.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pom.xml b/pom.xml -index 2b1db18..bbfb0ce 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -44,7 +44,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - -- jsr14 -+ 1.5 - 1.5 - - --- -1.7.11.2 - diff --git a/felix-osgi-obr-resolver.spec b/felix-osgi-obr-resolver.spec index 2c5ca99..ff1c758 100644 --- a/felix-osgi-obr-resolver.spec +++ b/felix-osgi-obr-resolver.spec @@ -1,23 +1,14 @@ -%global namedreltag .Beta1 -%global namedversion %{version}%{?namedreltag} %global osginame org.apache.felix.resolver Name: felix-osgi-obr-resolver -Version: 0.1.0 -Release: 0.13%{namedreltag}%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Apache Felix Resolver Group: Development/Libraries License: ASL 2.0 -URL: https://github.com/tdiesler/obr-resolver +URL: http://felix.apache.org/documentation/subprojects/apache-felix-osgi-bundle-repository.html -# git clone git://github.com/tdiesler/obr-resolver.git -# cd obr-resolver/ && git archive --format=tar --prefix=felix-osgi-obr-resolver-0.1.0.Beta1/ 0.1.0.Beta1 | xz > felix-osgi-obr-resolver-0.1.0.Beta1.tar.xz -Source0: felix-osgi-obr-resolver-%{namedversion}.tar.xz - -# Provided osgi.core in Fedora is old and the felix impl is the right one in this case -Patch0: 0001-Use-felix-directly.patch -Patch1: 0002-JDK7-support.patch -Patch2: 0003-Compile-with-target-1.5-or-greater.patch +Source0: http://apache.cbox.biz//felix/org.apache.felix.resolver-1.2.0-source-release.tar.gz BuildArch: noarch @@ -38,17 +29,9 @@ Group: Documentation This package contains the API documentation for %{name}. %prep -%setup -q -n felix-osgi-obr-resolver-%{namedversion} - -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n %{osginame}-%{version} -# This is diabled because we don't have OSGi 5 provider in Fedora. -# TODO We need to remove this after OSGi 5 lands in Fedora. -# -# https://bugzilla.redhat.com/show_bug.cgi?id=832420#c2 -# rm -rf src/main/java/org/osgi/framework/wiring +%pom_change_dep org.osgi:org.osgi.core org.apache.felix:org.apache.felix.framework %build %mvn_build @@ -58,10 +41,16 @@ This package contains the API documentation for %{name}. %files -f .mfiles %dir %{_javadir}/%{name} +%license LICENSE +%doc NOTICE DEPENDENCIES %files javadoc -f .mfiles-javadoc +%license LICENSE %changelog +* Thu Jun 18 2015 Alexander Kurtakov 1.2.0-1 +- Update to 1.2.0 version. + * Wed Jun 17 2015 Fedora Release Engineering - 0.1.0-0.13.Beta1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -102,4 +91,3 @@ This package contains the API documentation for %{name}. * Thu Jun 14 2012 Marek Goldmann 0.1.0-0.1.Beta1 - Initial packaging - diff --git a/sources b/sources index 67341c3..2b6bcce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d92a8b08d7a1b1cbfec5e0889c4791fe felix-osgi-obr-resolver-0.1.0.Beta1.tar.xz +5ad2e7bce56a65d9361f85855fdb471e org.apache.felix.resolver-1.2.0-source-release.tar.gz