[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia-directory.patch, NONE, 1.1 maven-doxia.spec, 1.22, 1.23

David Walluck david at ryu.zarb.org
Wed Oct 12 03:51:04 CEST 2011


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

Modified Files:
	maven-doxia.spec 
Added Files:
	maven-doxia-directory.patch 
Log Message:
- apply patches

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** maven-doxia.spec	12 Oct 2011 01:42:06 -0000	1.22
--- maven-doxia.spec	12 Oct 2011 01:51:01 -0000	1.23
***************
*** 69,73 ****
  Patch3:         maven-doxia-module-docbook-simple.patch
  Patch4:         maven-doxia-logging.patch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %if ! %{gcj_support}
--- 69,75 ----
  Patch3:         maven-doxia-module-docbook-simple.patch
  Patch4:         maven-doxia-logging.patch
! Patch5:         maven-doxia-directory.patch
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %if ! %{gcj_support}
***************
*** 114,117 ****
--- 116,120 ----
  ##BuildRequires:  itext <= 2.0
  BuildRequires:  xml-commons-jaxp-1.3-apis
+ BuildRequires:  commons-configuration
  BuildRequires:  xmlgraphics-fop
  
***************
*** 127,130 ****
--- 130,134 ----
  Requires:       plexus-velocity
  Requires:       velocity
+ Requires:       commons-configuration
  Requires:       xmlgraphics-fop
  
***************
*** 172,175 ****
--- 176,180 ----
  %patch3 -p0 -b .sav3
  %patch4 -p1 -b .sav4
+ %patch5 -p1 -b .sav5
  
  %if 0

--- NEW FILE: maven-doxia-directory.patch ---
--- maven-doxia-1.1/pom.xml~	2011-10-11 20:58:55.000000000 -0400
+++ maven-doxia-1.1/pom.xml	2011-10-11 21:49:43.765610292 -0400
@@ -248,7 +248,7 @@
         <directory>src/main/resources</directory>
       </resource>
       <resource>
-        <directory>${build.directory}/generated-site/xsd</directory>
+        <directory>${project.build.directory}/generated-site/xsd</directory>
         <includes>
           <include>**/*.xsd</include>
         </includes>




More information about the JPackage-commits mailing list