[felix-osgi-core] Extra groupId "org.osgi" added
Jaromír Cápík
jcapik at fedoraproject.org
Tue Oct 11 09:40:20 UTC 2011
commit 41cf83053b2c3c121c4e59ae10979317e1b8889c
Author: Jaromir Capik <jcapik at redhat.com>
Date: Tue Oct 11 11:40:07 2011 +0200
Extra groupId "org.osgi" added
felix-osgi-core.spec | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/felix-osgi-core.spec b/felix-osgi-core.spec
index 129bdb1..4048571 100644
--- a/felix-osgi-core.spec
+++ b/felix-osgi-core.spec
@@ -2,7 +2,7 @@
Name: felix-osgi-core
Version: 1.4.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Felix OSGi R4 Core Bundle
Group: Development/Libraries
@@ -12,15 +12,12 @@ Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
BuildArch: noarch
-BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: java-devel
BuildRequires: felix-parent
BuildRequires: maven-surefire-provider-junit4
BuildRequires: jpackage-utils
-Requires: java >= 1:1.6.0
-
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires: java
%description
OSGi Service Platform Release 4 Core Interfaces and Classes.
@@ -46,36 +43,30 @@ install -d -m 0755 %{buildroot}%{_javadir}/felix
install -m 644 target/%{bundle}-%{version}.jar \
%{buildroot}%{_javadir}/felix/%{bundle}.jar
-%add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{bundle}
-
# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-%{buildroot}%{_mavenpomdir}/JPP.felix-%{bundle}.pom
+install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.felix-%{bundle}.pom
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap -a "org.osgi:%{bundle}" JPP.felix-%{bundle}.pom felix/%{bundle}.jar
%files
-%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/felix
%{_mavenpomdir}/JPP.felix-%{bundle}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE
%{_javadocdir}/%{name}
%changelog
+* Tue Oct 11 2011 Jaromir Capik <jcapik at redhat.com> 1.4.0-8
+- Extra groupId "org.osgi" added
+- Minor spec file changes according to the latest guidelines
+
* Wed Mar 30 2011 Alexander Kurtakov <akurtako at redhat.com> 1.4.0-7
- Build with maven 3 and drop ant buil.xml files.
More information about the scm-commits
mailing list