Author: fnasser
Update of /cvs/extras/rpms/maven-wagon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15668
Modified Files:
Tag: private-newmaven-branch
maven-wagon.spec
Log Message:
Prepare for post-bootstrap build
Index: maven-wagon.spec
===================================================================
RCS file: /cvs/extras/rpms/maven-wagon/devel/maven-wagon.spec,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -p -r1.6.2.1 -r1.6.2.2
--- maven-wagon.spec 18 May 2009 22:42:38 -0000 1.6.2.1
+++ maven-wagon.spec 18 May 2009 22:56:38 -0000 1.6.2.2
@@ -28,8 +28,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-#%define _without_gcj_support 1
-
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
# If you don't want to build with maven, and use straight ant instead,
@@ -51,7 +49,7 @@
Name: maven-%{bname}
Version: 1.0
-Release: 0.2.b2.3jpp.2%{?dist}
+Release: 0.2.b2.6%{?dist}
Epoch: 0
Summary: Tools to manage artifacts and deployment
License: Apache Software License
@@ -97,7 +95,7 @@ BuildRequires: jpackage-utils >= 0:1.7.
BuildRequires: ant >= 0:1.6
BuildRequires: junit
%if %{with_maven}
-BuildRequires: maven2 >= 0:2.0.4
+BuildRequires: maven2 >= 0:2.0.8
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
@@ -105,8 +103,9 @@ BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-project-info-reports
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-site
-BuildRequires: maven2-plugin-surefire
-#BuildRequires: maven2-default-skin
+BuildRequires: maven2-plugin-surefire = 2.3
+BuildRequires: maven-surefire-provider-junit = 2.3
+BuildRequires: maven2-default-skin
%endif
BuildRequires: classworlds
BuildRequires: concurrent
@@ -234,7 +233,7 @@ mvn-jpp \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
- install install javadoc:javadoc
+ install install javadoc:javadoc
%else
@@ -452,6 +451,9 @@ install -m 644 wagon-providers/wagon-ssh
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api
+
+ls -lR wagon-provider-api/target/
+
cp -pr wagon-provider-api/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/file
@@ -484,8 +486,8 @@ cp -pr wagon-providers/wagon-ssh-ganymed
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh
cp -pr wagon-providers/wagon-ssh/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh
-#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/webdav
-#cp -pr wagon-providers/wagon-webdav/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh
+##install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/webdav
+##cp -pr wagon-providers/wagon-webdav/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test
cp -pr wagon-provider-test/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test
@@ -558,6 +560,19 @@ fi
%endif
%changelog
+* Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.6
+- Rebuild with new maven2-2.0.8 built in non-bootstrap mode
+
+* Mon Mar 16 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.5
+- rebuild with new maven2 2.0.8-9 built in bootstrap mode
+
+* Tue Mar 10 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.4
+- rebuild with maven2 2.0.8 built in bootstrap mode
+- FIXME: javadoc:javadoc didn't generate javadoc, commented all apidocs resources
+
+* Tue Jan 14 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.3jpp.3
+- re-build with gcj
+
* Tue Jan 13 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.b2.3jpp.2
- re-build with maven