[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia-module-docbook-simple.patch, NONE, 1.1 maven-doxia.spec, 1.19, 1.20

David Walluck david at ryu.zarb.org
Wed Oct 12 03:21:32 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv30342

Modified Files:
	maven-doxia.spec 
Added Files:
	maven-doxia-module-docbook-simple.patch 
Log Message:
- add maven-doxia-module-docbook-simple.patch

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** maven-doxia.spec	12 Oct 2011 00:59:02 -0000	1.19
--- maven-doxia.spec	12 Oct 2011 01:21:30 -0000	1.20
***************
*** 68,72 ****
  Patch1:         maven-doxia-module-apt-pom.patch
  Patch2:         maven-doxia-module-xdoc-pom.patch
! Patch3:         maven-doxia-logging.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
--- 68,73 ----
  Patch1:         maven-doxia-module-apt-pom.patch
  Patch2:         maven-doxia-module-xdoc-pom.patch
! Patch3:         maven-doxia-module-docbook-simple.patch
! Patch4:         maven-doxia-logging.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
***************
*** 168,177 ****
  %patch1 -p0 -b .sav1
  %patch2 -p0 -b .sav2
! %patch3 -p1 -b .sav3
  
  cp %{SOURCE7} settings.xml
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
  sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  
  %build
--- 169,181 ----
  %patch1 -p0 -b .sav1
  %patch2 -p0 -b .sav2
! %patch3 -p0 -b .sav3
! %patch4 -p1 -b .sav4
  
+ %if 0
  cp %{SOURCE7} settings.xml
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
  sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+ %endif
  
  %build
***************
*** 179,190 ****
--- 183,198 ----
  %if %{with_maven}
  
+ %if 0
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/poms/
  
  export M2_SETTINGS=$(pwd)/settings.xml
+ %endif
  
  mvn-jpp \
          -e \
+ %if 0
          -s ${M2_SETTINGS} \
+ %endif
          -Dmaven2.jpp.depmap.file=%{SOURCE6} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \

--- NEW FILE: maven-doxia-module-docbook-simple.patch ---
--- doxia-modules/doxia-module-docbook-simple/pom.xml.orig	2009-03-03 13:32:44.000000000 -0500
+++ doxia-modules/doxia-module-docbook-simple/pom.xml	2011-10-11 21:19:52.587890684 -0400
@@ -49,7 +49,6 @@
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>




More information about the JPackage-commits mailing list