osgi.org groupId patch removed (fixed in felix-osgi-* packages)

This commit is contained in:
Jaromir Capik 2011-10-13 11:29:48 +02:00
parent 477536f725
commit 30af6af9f8
2 changed files with 4 additions and 23 deletions

View File

@ -1,18 +0,0 @@
diff -Naur org.apache.felix.utils-1.1.0.orig/pom.xml org.apache.felix.utils-1.1.0/pom.xml
--- org.apache.felix.utils-1.1.0.orig/pom.xml 2010-11-03 22:46:40.000000000 +0100
+++ org.apache.felix.utils-1.1.0/pom.xml 2011-09-05 19:55:42.050738227 +0200
@@ -30,12 +30,12 @@
<artifactId>org.apache.felix.utils</artifactId>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>4.1.0</version>
</dependency>

View File

@ -3,7 +3,7 @@
Name: felix-utils
Version: 1.1.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Utility classes for OSGi
License: ASL 2.0
Group: Development/Libraries
@ -11,8 +11,6 @@ URL: http://felix.apache.org
Source0: http://www.fightrice.com/mirrors/apache/felix/%{site_name}-%{version}-project.tar.gz
Patch0: %{name}-osgi-groupid.patch
BuildArch: noarch
BuildRequires: java-devel
@ -40,8 +38,6 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{site_name}-%{version}
%patch0 -p1
%build
# one of the tests fails in mock (local build is ok)
mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore=true
@ -70,6 +66,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
* Thu Oct 13 2011 Jaromir Capik <jcapik@redhat.com> - 1.1.0-3
- osgi.org groupId patch removed (fixed in felix-osgi-* packages)
* Wed Sep 08 2011 Jaromir Capik <jcapik@redhat.com> - 1.1.0-2
- Moved to felix subdir
- Minor spec file changes