[felix-framework] Updated to 4.0.2 + Building with Maven 3
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Jan 5 12:44:37 UTC 2012
commit 03dd545f786e23c7074b24bf8b68b8a22cd7f5cf
Author: Tomas Radej <tradej at redhat.com>
Date: Tue Nov 8 18:13:50 2011 +0100
Updated to 4.0.2 + Building with Maven 3
.gitignore | 2 +
felix-framework-encoding.patch | 40 ++++++++++++++
felix-framework.demap | 26 ---------
felix-framework.spec | 117 ++++++++++++++++-----------------------
sources | 2 +-
5 files changed, 91 insertions(+), 96 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b23691..151afc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
org.apache.felix.framework-2.0.5-project.tar.gz
+/org.apache.felix.framework-4.0.1-source-release.tar.gz
+/org.apache.felix.framework-4.0.2-source-release.tar.gz
diff --git a/felix-framework-encoding.patch b/felix-framework-encoding.patch
new file mode 100644
index 0000000..24d81fa
--- /dev/null
+++ b/felix-framework-encoding.patch
@@ -0,0 +1,40 @@
+diff --git a/pom.xml b/pom.xml
+index 09fba3e..882ff97 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -42,6 +42,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-resources-plugin</artifactId>
++ <configuration>
++ <encoding>UTF-8</encoding>
++ </configuration>
++ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <target>jsr14</target>
+diff --git a/src/main/java/org/osgi/framework/FrameworkUtil.java b/src/main/java/org/osgi/framework/FrameworkUtil.java
+index ec0af1e..35bd754 100644
+--- a/src/main/java/org/osgi/framework/FrameworkUtil.java
++++ b/src/main/java/org/osgi/framework/FrameworkUtil.java
+@@ -108,7 +108,7 @@ public class FrameworkUtil {
+ * <pre>
+ * cn = Bugs Bunny, o = ACME, c = US
+ * ou = Carrots, cn=Daffy Duck, o=ACME, c=US
+- * street = 9C\, Avenue St. Drézéry, o=ACME, c=US
++ * street = 9C\, Avenue St. Drezery, o=ACME, c=US
+ * dc=www, dc=acme, dc=com, o=ACME, c=US
+ * o=ACME, c=US
+ * </pre>
+@@ -116,7 +116,7 @@ public class FrameworkUtil {
+ * The following DNs would not match:
+ *
+ * <pre>
+- * street = 9C\, Avenue St. Drézéry, o=ACME, c=FR
++ * street = 9C\, Avenue St. Drezery, o=ACME, c=FR
+ * dc=www, dc=acme, dc=com, c=US
+ * </pre>
+ *
diff --git a/felix-framework.spec b/felix-framework.spec
index ce0b8b9..653ccd7 100644
--- a/felix-framework.spec
+++ b/felix-framework.spec
@@ -6,47 +6,41 @@
%global groupId org.apache.felix
%global artifactId %{bundle}
-Name: %{project}-framework
-Version: 2.0.5
-Release: 5%{?dist}
-Summary: Apache Felix Framework
-
-Group: Development/Libraries
-License: ASL 2.0
-URL: http://felix.apache.org
-Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
-Source1: %{name}.demap
-
-# Remove <parent>
-# Remove rat-maven-plugin
-Patch0: %{bundle}-%{version}~pom.xml.patch
-
-BuildArch: noarch
-
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: felix-osgi-compendium
-BuildRequires: felix-osgi-core
-BuildRequires: maven2
-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: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-# TODO check availability and use new names
-#BuildRequires: maven-bundle-plugin
-# instead of
-BuildRequires: maven-plugin-bundle
-
-Requires: felix-osgi-compendium
-Requires: felix-osgi-core
-Requires: java >= 1:1.6.0
-
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Name: %{project}-framework
+Version: 4.0.2
+Release: 1%{?dist}
+Summary: Apache Felix Framework
+
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://felix.apache.org
+Source0: http://apache.miloslavbrada.cz//felix/%{bundle}-%{version}-source-release.tar.gz
+
+Patch0: felix-framework-encoding.patch
+
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: felix-osgi-compendium
+BuildRequires: felix-osgi-core
+BuildRequires: maven
+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: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-plugin-bundle
+BuildRequires: apache-rat-plugin
+
+
+Requires: felix-osgi-compendium
+Requires: felix-osgi-core
+Requires: java >= 1:1.6.0
%description
Apache Felix Framework Interfaces and Classes.
@@ -63,17 +57,10 @@ API documentation for %{name}.
%prep
%setup -q -n %{bundle}-%{version}
-%patch0 -p1 -b .sav
-# remove tests due to rat-maven-plugin is removed
-%__rm -rf src/test/java/
+%patch0 -p1
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-%__mkdir_p $MAVEN_REPO_LOCAL
-mvn-jpp -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:aggregate
%install
# jars
@@ -81,40 +68,32 @@ install -d -m 0755 %{buildroot}%{_javadir}/%{project}
install -m 644 target/%{bundle}-%{version}.jar \
%{buildroot}%{_javadir}/%{project}/%{bundle}.jar
-%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP/%{project} %{bundle}
-
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{POM}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
+
+%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%defattr(-,root,root,-)
-%{_javadir}/%{project}/*
-%{POM}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}
%doc LICENSE
+%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
+%{_mavendepmapfragdir}/%{name}
+%{_javadir}/%{project}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}
%doc LICENSE
+%{_javadocdir}/%{name}
%changelog
+* Thu Jan 05 2012 Tomas Radej <tradej at redhat.com> - 4.0.2-1
+- Updated to latest version
+- Guidelines fixes
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 5ac452e..39b1fc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-961994c240406d373aef5932acc304cd org.apache.felix.framework-2.0.5-project.tar.gz
+85b423f09186dd2d94f96b301fc72952 org.apache.felix.framework-4.0.2-source-release.tar.gz
More information about the scm-commits
mailing list