rpms/xmlrpc3/devel xmlrpc3-ant-osgimanifests.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xmlrpc3.spec, 1.15, 1.16
Andrew Overholt
overholt at fedoraproject.org
Wed Dec 9 19:18:14 UTC 2009
Author: overholt
Update of /cvs/pkgs/rpms/xmlrpc3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18714
Modified Files:
.cvsignore sources xmlrpc3.spec
Added Files:
xmlrpc3-ant-osgimanifests.patch
Log Message:
* Wed Dec 09 2009 Andrew Overholt <overholt at redhat.com> 3.0-4.11
- Disable building with maven due to missing -release plugin.
- Provide ability to build with ant.
- Drop maven2-plugin-release BR as it's folded into maven2.
xmlrpc3-ant-osgimanifests.patch:
client/maven-build.xml | 1 +
common/maven-build.xml | 1 +
server/maven-build.xml | 1 +
3 files changed, 3 insertions(+)
--- NEW FILE xmlrpc3-ant-osgimanifests.patch ---
diff -up ./client/maven-build.xml.manifest ./client/maven-build.xml
--- ./client/maven-build.xml.manifest 2009-12-09 13:41:23.000000000 -0500
+++ ./client/maven-build.xml 2009-12-09 13:42:14.000000000 -0500
@@ -187,6 +187,7 @@
compress="true"
index="false"
basedir="${maven.build.outputDir}"
+ manifest="${maven.build.srcDir.0}/META-INF/MANIFEST.MF"
excludes="**/package.html"/>
</target>
diff -up ./common/maven-build.xml.manifest ./common/maven-build.xml
--- ./common/maven-build.xml.manifest 2009-12-09 13:41:59.000000000 -0500
+++ ./common/maven-build.xml 2009-12-09 13:41:03.000000000 -0500
@@ -173,6 +173,7 @@
compress="true"
index="false"
basedir="${maven.build.outputDir}"
+ manifest="${maven.build.srcDir.0}/META-INF/MANIFEST.MF"
excludes="**/package.html"/>
</target>
diff -up ./server/maven-build.xml.manifest ./server/maven-build.xml
--- ./server/maven-build.xml.manifest 2009-12-09 13:41:32.000000000 -0500
+++ ./server/maven-build.xml 2009-12-09 13:42:07.000000000 -0500
@@ -183,6 +183,7 @@
compress="true"
index="false"
basedir="${maven.build.outputDir}"
+ manifest="${maven.build.srcDir.0}/META-INF/MANIFEST.MF"
excludes="**/package.html"/>
</target>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 22 Oct 2008 17:53:11 -0000 1.2
+++ .cvsignore 9 Dec 2009 19:18:14 -0000 1.3
@@ -1 +1,3 @@
xmlrpc-3.0-src.tar.gz
+xmlrpc3-buildfiles.tar.bz2
+xmlrpc3-ant-osgimanifests.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 20 Mar 2007 16:32:40 -0000 1.2
+++ sources 9 Dec 2009 19:18:14 -0000 1.3
@@ -1 +1,3 @@
99500a5d04f2eb558716ba3d5a613d14 xmlrpc-3.0-src.tar.gz
+5c389301aa9319e46b74bb7ab0897f33 xmlrpc3-buildfiles.tar.bz2
+107ca9a1e78fcdacc9d5663a9ad3b464 xmlrpc3-ant-osgimanifests.tar.bz2
Index: xmlrpc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlrpc3/devel/xmlrpc3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xmlrpc3.spec 17 Aug 2009 19:18:43 -0000 1.15
+++ xmlrpc3.spec 9 Dec 2009 19:18:14 -0000 1.16
@@ -28,7 +28,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define mainname xmlrpc
+%global mainname xmlrpc
+%global with_maven 0
Name: xmlrpc3
Version: 3.0
@@ -39,15 +40,25 @@ Group: Development/Libraries
Url: http://ws.apache.org/xmlrpc/
Source0: http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-%{version}-src.tar.gz
Source1: %{name}-jpp-depmap.xml
+%if ! %{with_maven}
+# These build files were generated with mvn ant:ant
+Source2: %{name}-buildfiles.tar.bz2
+Source3: %{name}-ant-osgimanifests.tar.bz2
+%endif
# FIXME: file this upstream
# The tests pom.xml doesn't include necessary dependencies on junit and
# servletapi
Patch0: %{name}-addjunitandservletapitotestpom.patch
+%if %{with_maven}
# Add OSGi MANIFEST information
Patch1: %{name}-client-addosgimanifest.patch
Patch2: %{name}-common-addosgimanifest.patch
+%else
+Patch3: %{name}-ant-osgimanifests.patch
+%endif
BuildRequires: dos2unix
+%if %{with_maven}
BuildRequires: maven2 >= 2.0.4
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-compiler
@@ -59,6 +70,7 @@ BuildRequires: maven2-plugin-eclipse
BuildRequires: maven2-plugin-assembly
BuildRequires: maven2-plugin-release
BuildRequires: maven2-plugin-source
+%endif
BuildRequires: ws-jaxme
BuildRequires: ws-commons-util
BuildRequires: jpackage-utils >= 0:1.6
@@ -144,6 +156,7 @@ Requires: %{name}-server
%prep
%setup -q -n %{mainname}-%{version}
%patch0
+%if %{with_maven}
cp %{SOURCE1} .
pushd client
%patch1
@@ -151,11 +164,80 @@ popd
pushd common
%patch2
popd
+%else
+tar jxf %{SOURCE2}
+tar jxf %{SOURCE3}
+%patch3
+%endif
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+rm -rf $MAVEN_REPO_LOCAL
+mkdir -p $MAVEN_REPO_LOCAL
+
+%if ! %{with_maven}
+mkdir -p $MAVEN_REPO_LOCAL/org/apache/ws/commons/ws-commons-util/1.0.1
+ln -s %{_javadir}/ws-commons-util-1.0.1.jar \
+ $MAVEN_REPO_LOCAL/org/apache/ws/commons/ws-commons-util/1.0.1
+
+mkdir -p $MAVEN_REPO_LOCAL/junit/junit/3.8.1
+ln -s %{_javadir}/junit-3.8.2.jar \
+ $MAVEN_REPO_LOCAL/junit/junit/3.8.1/junit-3.8.1.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
+ln -s %{_javadir}/xml-commons-apis-1.3.04.jar \
+ $MAVEN_REPO_LOCAL/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/jaxme/jaxmeapi/0.5.1/jaxmeapi-0.5.1.jar
+ln -s %{_javadir}/jaxme/ws-jaxmeapi-0.5.1.jar \
+ $MAVEN_REPO_LOCAL/jaxme/jaxmeapi/0.5.1
+
+mkdir -p $MAVEN_REPO_LOCAL/commons-httpclient/commons-httpclient/3.0.1
+ln -s %{_javadir}/commons-httpclient.jar \
+ $MAVEN_REPO_LOCAL/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/commons-logging/commons-logging/1.1
+ln -s %{_javadir}/commons-logging.jar \
+ $MAVEN_REPO_LOCAL/commons-logging/commons-logging/1.1/commons-logging-1.1.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/log4j/log4j/1.2.12
+ln -s %{_javadir}/log4j.jar \
+ $MAVEN_REPO_LOCAL/log4j/log4j/1.2.12/log4j-1.2.12.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/logkit/logkit/1.0.1
+ln -s %{_javadir}/avalon-logkit.jar \
+ $MAVEN_REPO_LOCAL/logkit/logkit/1.0.1/logkit-1.0.1.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/avalon-framework/avalon-framework/4.1.3
+ln -s %{_javadir}/avalon-framework.jar \
+ $MAVEN_REPO_LOCAL/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/javax/servlet/servlet-api/2.4
+ln -s %{_javadir}/servlet_2_4_api.jar \
+ $MAVEN_REPO_LOCAL/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/commons-codec/commons-codec/1.2
+ln -s %{_javadir}/commons-codec.jar \
+ $MAVEN_REPO_LOCAL/commons-codec/commons-codec/1.2/commons-codec-1.2.jar
+
+# These next three will appear broken but become un-broken during the build
+mkdir -p $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-common/3.0
+ln -s ../../../../../../../common/target/xmlrpc-common-3.0.jar \
+ $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-common/3.0/xmlrpc-common-3.0.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-client/3.0
+ln -s ../../../../../../../client/target/xmlrpc-client-3.0.jar \
+ $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-client/3.0/xmlrpc-client-3.0.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-server/3.0
+ln -s ../../../../../../../server/target/xmlrpc-server-3.0.jar \
+ $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-server/3.0/xmlrpc-server-3.0.jar
+%endif
%build
dos2unix LICENSE.txt
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
+%if %{with_maven}
# The java.home is due to java-gcj and libgcj weirdness on 64-bit
# systems
mvn-jpp \
@@ -165,6 +247,20 @@ mvn-jpp \
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
install javadoc:javadoc
+%else
+ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Djunit.skipped=true -Dmaven.test.skip=true javadoc package
+find -name \.svn | xargs rm -rf
+jar cf common/target/%{mainname}-common-%{version}-sources.jar \
+ common/src/main/java/META-INF/MANIFEST.MF \
+ -C common/src/main/java .
+jar cf client/target/%{mainname}-client-%{version}-sources.jar \
+ client/src/main/java/META-INF/MANIFEST.MF \
+ -C client/src/main/java .
+jar cf server/target/%{mainname}-server-%{version}-sources.jar \
+ server/src/main/java/META-INF/MANIFEST.MF \
+ -C server/src/main/java .
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -190,7 +286,13 @@ install -m 644 common/target/%{mainname}
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%if %{with_maven}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%else
+cp -pr common/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr client/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr server/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -228,6 +330,11 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/%{name}-server-%{version}-sources.jar
%changelog
+* Wed Dec 09 2009 Andrew Overholt <overholt at redhat.com> 3.0-4.11
+- Disable building with maven due to missing -release plugin.
+- Provide ability to build with ant.
+- Drop maven2-plugin-release BR as it's folded into maven2.
+
* Mon Aug 17 2009 Andrew Overholt <overholt at redhat.com> 3.0-4.10
- Fixed URL (bug #354031)
More information about the scm-commits
mailing list