rpms/felix-framework/devel felix-framework.spec,1.1,1.2

[Victor G. Vasilyev]

Author: victorv

Update of /cvs/pkgs/rpms/felix-framework/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13413

Modified Files:
	felix-framework.spec 
Log Message:
Changes according requests https://bugzilla.redhat.com/show_bug.cgi?id=609130


Index: felix-framework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/felix-framework/devel/felix-framework.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- felix-framework.spec	24 Jul 2010 00:03:14 -0000	1.1
+++ felix-framework.spec	24 Jul 2010 01:26:47 -0000	1.2
@@ -8,8 +8,8 @@
 
 Name:    %{project}-framework
 Version: 2.0.5
-Release: 2%{?dist}
-Summary: Felix Framework Bundle
+Release: 3%{?dist}
+Summary: Apache Felix Framework
 
 Group:   Development/Libraries
 License: ASL 2.0
@@ -29,14 +29,19 @@ BuildRequires: jpackage-utils
 BuildRequires: felix-osgi-compendium
 BuildRequires: felix-osgi-core
 BuildRequires: maven2
-BuildRequires:    maven2-plugin-compiler
-BuildRequires:    maven2-plugin-install
-BuildRequires:    maven2-plugin-jar
-BuildRequires:    maven2-plugin-javadoc
+BuildRequires:    maven-compiler-plugin
+BuildRequires:    maven-install-plugin
+BuildRequires:    maven-invoker-plugin
+BuildRequires:    maven-jar-plugin
+BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-release-plugin
-BuildRequires:    maven2-plugin-resources
-BuildRequires:    maven2-plugin-surefire
+BuildRequires:    maven-resources-plugin
+# TODO check availability and use new names
+#BuildRequires:    maven-surefire-plugin
+#BuildRequires:    maven-bundle-plugin
+# instead of
 BuildRequires:    maven-plugin-bundle
+BuildRequires:    maven-surefire-maven-plugin
 
 Requires: felix-osgi-compendium
 Requires: felix-osgi-core
@@ -46,7 +51,7 @@ Requires(post):   jpackage-utils
 Requires(postun): jpackage-utils
 
 %description
-Felix Framework Interfaces and Classes.
+Apache Felix Framework Interfaces and Classes.
 
 %package javadoc
 Group:          Documentation
@@ -116,8 +121,14 @@ install -d -m 0755 %{buildroot}%{_javado
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
+%doc LICENSE
 
 %changelog
+* Tue Jul 13 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.0.5-3
+- BR: maven-invoker-plugin required for maven-javadoc-plugin
+- Use new names of the maven plgins
+- Add license file to independent subpackage javadoc
+
 * Tue Jul 13 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.0.5-2
 - Use maven instead of ant