[Jpackage-commits] dist/gmaven/devel gmaven-compile.patch, 1.1, NONE gmaven-feature-api-pom.patch, 1.1, NONE gmaven-gmaven-plugin-pom.patch, 1.1, NONE gmaven-gmaven-runtime-gmaven-runtime-1.6-pom.patch, 1.1, NONE gmaven-gmaven-runtime-pom.patch, 1.1, NONE gmaven-no-shitty.patch, 1.1, NONE gmaven-packaging-pom.patch, 1.1, NONE gmaven-plugin-pom.patch, 1.1, NONE gmaven-pom.patch, 1.2, NONE gmaven-support-slf4j-gossip-pom.patch, 1.1, NONE gmaven.spec, 1.6, 1.7

David Walluck david at ryu.zarb.org
Thu Dec 23 02:35:00 CET 2010


Update of /home/projects/jpackage/cvs/dist/gmaven/devel
In directory ryu.zarb.org:/tmp/cvs-serv4185

Modified Files:
	gmaven.spec 
Removed Files:
	gmaven-compile.patch gmaven-feature-api-pom.patch 
	gmaven-gmaven-plugin-pom.patch 
	gmaven-gmaven-runtime-gmaven-runtime-1.6-pom.patch 
	gmaven-gmaven-runtime-pom.patch gmaven-no-shitty.patch 
	gmaven-packaging-pom.patch gmaven-plugin-pom.patch 
	gmaven-pom.patch gmaven-support-slf4j-gossip-pom.patch 
Log Message:
- remove old patches

--- gmaven-packaging-pom.patch DELETED ---

--- gmaven-compile.patch DELETED ---

--- gmaven-support-slf4j-gossip-pom.patch DELETED ---

Index: gmaven.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/gmaven.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** gmaven.spec	23 Dec 2010 01:26:07 -0000	1.6
--- gmaven.spec	23 Dec 2010 01:34:58 -0000	1.7
***************
*** 60,77 ****
  Source1:        %{name}-jpp-depmap.xml
  Source2:        %{name}-settings.xml
! Patch0:         gmaven-support-slf4j-gossip-pom.patch
! Patch1:         gmaven-feature-api-pom.patch
! Patch2:         gmaven-packaging-pom.patch
! Patch3:         gmaven-plugin-pom.patch
! Patch4:         gmaven-pom.patch
! Patch5:         gmaven-no-shitty.patch
! Patch6:         gmaven-gmaven-plugin-pom.patch
! Patch7:         gmaven-gmaven-runtime-pom.patch
! Patch8:         gmaven-compile.patch
! Patch9:         gmaven-gmaven-runtime-gmaven-runtime-1.6-pom.patch
! Patch100:       gmaven-poms.patch
! Patch101:       gmaven-no-gshell-io.patch
! Patch102:       gmaven-javadoc.patch
! Patch103:       gmaven-gossip.patch
  Obsoletes:      mojo-maven2-groovy <= 0:16
  Requires(post): jpackage-utils >= 0:1.7.3
--- 60,67 ----
  Source1:        %{name}-jpp-depmap.xml
  Source2:        %{name}-settings.xml
! Patch0:         gmaven-poms.patch
! Patch1:         gmaven-no-gshell-io.patch
! Patch2:         gmaven-javadoc.patch
! Patch3:         gmaven-gossip.patch
  Obsoletes:      mojo-maven2-groovy <= 0:16
  Requires(post): jpackage-utils >= 0:1.7.3
***************
*** 216,237 ****
  %prep
  %setup -q -n gmaven-%{namedversion}
! %patch100 -b .sav100
! %patch101 -b .sav101
! %patch102 -b .sav102
! %patch103 -b .sav103
  
  %if 0
- perl -pi.bak -e 's/<artifactId>gossip/<artifactId>gossip-core/g;' \
-     gmaven-plugin/pom.xml \
-     gmaven-runtime/gmaven-runtime-loader/pom.xml \
-     gmaven-runtime/pom.xml \
-     pom.xml
- 
- > ../gmaven-gossip.patch
- for i in `find -name \*.bak`; do
- diff -u  $i `dirname $i`/`basename $i .bak` >> ../gmaven-gossip.patch || :
- done
- %endif
- 
  cp -p %{SOURCE2} maven2-settings.xml
  
--- 206,215 ----
  %prep
  %setup -q -n gmaven-%{namedversion}
! %patch100 -b .sav0
! %patch101 -b .sav1
! %patch102 -b .sav2
! %patch103 -b .sav3
  
  %if 0
  cp -p %{SOURCE2} maven2-settings.xml
  
***************
*** 244,258 ****
  mkdir external_repo
  ln -s %{_javadir} external_repo/JPP
  
  %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
  export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  #export MAVEN_OPTS="-Xmx512m"
  %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-         -Dmaven.test.failure.ignore=false \
-         -Dmaven.test.skip=false \
          -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
          deploy javadoc:aggregate
--- 222,239 ----
  mkdir external_repo
  ln -s %{_javadir} external_repo/JPP
+ %endif
  
  %build
+ %if 0
  export M2SETTINGS=$(pwd)/maven2-settings.xml
  export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  #export MAVEN_OPTS="-Xmx512m"
+ %endif
  %{_bindir}/mvn-jpp -e \
+ %if 0
          -s ${M2SETTINGS} \
          -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
+ %endif
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
          deploy javadoc:aggregate

--- gmaven-gmaven-runtime-pom.patch DELETED ---

--- gmaven-plugin-pom.patch DELETED ---

--- gmaven-gmaven-plugin-pom.patch DELETED ---

--- gmaven-no-shitty.patch DELETED ---

--- gmaven-feature-api-pom.patch DELETED ---

--- gmaven-gmaven-runtime-gmaven-runtime-1.6-pom.patch DELETED ---

--- gmaven-pom.patch DELETED ---




More information about the JPackage-commits mailing list