rpms/plexus-digest/devel plexus-digest.spec, 1.1, 1.2 plexus-digest-jpp-depmap.xml, 1.1, NONE

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Dec 22 14:45:43 UTC 2009


Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-digest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12433/devel

Modified Files:
	plexus-digest.spec 
Removed Files:
	plexus-digest-jpp-depmap.xml 
Log Message:
- Drop not needed depmap.
- Build with maven.


Index: plexus-digest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-digest/devel/plexus-digest.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- plexus-digest.spec	21 Aug 2009 19:02:53 -0000	1.1
+++ plexus-digest.spec	22 Dec 2009 14:45:42 -0000	1.2
@@ -31,15 +31,15 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define with_maven 0
-%define without_maven 1
+%define with_maven 1
+%define without_maven 0
 
 %define parent plexus
 %define subname digest
 
 Name:           plexus-digest
 Version:        1.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Summary:        Plexus Digest / Hashcode Components
 License:        ASL 2.0
@@ -49,7 +49,6 @@ Source0:        %{name}-1.0-src.tar.gz
 # svn export http://svn.codehaus.org/plexus/tags/plexus-digest-1.0 plexus-digest/
 # tar czf plexus-digest-1.0-src.tar.gz plexus-digest/
 
-Source1:                %{name}-jpp-depmap.xml
 Source2:                %{name}-%{version}-build.xml
 Source3:                %{name}-components.xml
 
@@ -71,7 +70,6 @@ BuildRequires:  maven-surefire-provider-
 BuildRequires:  maven2-common-poms >= 1.0
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
-BuildRequires:  maven-release
 BuildRequires:  qdox >= 1.5
 %endif
 
@@ -118,7 +116,6 @@ mkdir -p $MAVEN_REPO_LOCAL
 mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
         install javadoc:javadoc
 #       -Dmaven.test.failure.ignore=true \
 
@@ -173,6 +170,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-10
+- Drop not needed depmap.
+- Build with maven.
+
 * Fri Aug 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-9
 - Fix License, formatting and comments.
 


--- plexus-digest-jpp-depmap.xml DELETED ---




More information about the fedora-extras-commits mailing list