rpms/xbean
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added xbean-finder and xbean-bundleutils submodules

Browse Source 
patch provided by Marek Goldman
This commit is contained in:
Stanislav Ochotnicky 2011-05-30 11:05:53 +02:00
parent 8c750591d2
commit 566be54101
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pom-3.7.patch
View File

@ -1,7 +1,6 @@
diff --git a/pom.xml b/pom.xml
index 569995c..3631ba4 100644
--- a/pom.xml
+++ b/pom.xml
diff -Naur xbean-3.7/pom.xml xbean-3.7-work/pom.xml
--- xbean-3.7/pom.xml 2010-05-14 10:21:23.000000000 -0400
+++ xbean-3.7-work/pom.xml 2011-05-28 07:55:22.461631687 -0400
@@ -24,12 +24,6 @@
<modelVersion>4.0.0</modelVersion>
@ -72,7 +71,7 @@ index 569995c..3631ba4 100644
</plugin>
</plugins>
</pluginManagement>
@@ -343,22 +319,21 @@
@@ -343,22 +319,22 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
@ -90,7 +89,7 @@ index 569995c..3631ba4 100644
- <module>xbean-classloader</module>
<module>xbean-classpath</module>
<module>xbean-bundleutils</module>
- <module>xbean-finder</module>
<module>xbean-finder</module>
<module>xbean-naming</module>
<module>xbean-reflect</module>
- <module>xbean-blueprint</module>
@ -102,17 +101,16 @@ index 569995c..3631ba4 100644
</modules>
<reporting>
@@ -422,4 +397,4 @@
@@ -422,4 +398,4 @@
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
diff --git a/xbean-reflect/pom.xml b/xbean-reflect/pom.xml
index 5ea1864..288ec1d 100644
--- a/xbean-reflect/pom.xml
+++ b/xbean-reflect/pom.xml
diff -Naur xbean-3.7/xbean-reflect/pom.xml xbean-3.7-work/xbean-reflect/pom.xml
--- xbean-3.7/xbean-reflect/pom.xml 2010-05-14 10:21:23.000000000 -0400
+++ xbean-3.7-work/xbean-reflect/pom.xml 2011-05-28 07:53:16.040651498 -0400
@@ -47,13 +47,6 @@
<optional>true</optional>
</dependency>

12
xbean.spec
View File

@ -2,7 +2,7 @@ Name: xbean
Version: 3.7
BuildArch: noarch
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Java plugin based web server
Group: Development/Libraries
@ -84,7 +84,7 @@ mvn-jpp -e \
%install
# for every module we want to be built
for sub in reflect naming classpath; do
for sub in bundleutils finder reflect naming classpath; do
# install jar
install -Dpm 644 %{name}-${sub}/target/%{name}-${sub}-%{version}.jar \
$RPM_BUILD_ROOT/%{_javadir}/xbean/%{name}-${sub}.jar;
@ -103,10 +103,6 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-main.pom
%add_to_maven_depmap org.apache.xbean %{name} %{version} JPP/%{name} main
# UGLY hack to fix maven without 2 rebuilds
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven/lib/ext
%pre javadoc
# workaround for rpm bug, can be removed in F-17
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
@ -124,7 +120,6 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_mavenpomdir}/*.pom
%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}
%{_datadir}/maven/lib/ext
%files javadoc
%defattr(-,root,root,-)
@ -132,6 +127,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
* Sat May 28 2011 Marek Goldmann <mgoldman@redhat.com> - 3.7-7
- Added xbean-finder and xbean-bundleutils submodules
* Fri Mar 4 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-6
- Add comment for removing javadoc
- Fix maven 3 build