[Jpackage-commits] rpms/free/maven-doxia-sitetools maven-doxia-sitetools-disablehtmlunit.patch, 1.1, NONE maven-doxia-sitetools-jpp-depmap.xml, 1.1, 1.2 maven-doxia-sitetools.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Sun Dec 5 15:40:31 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/maven-doxia-sitetools
In directory ryu.zarb.org:/tmp/BqotD1TDBC/rpms/free/maven-doxia-sitetools

Modified Files:
	maven-doxia-sitetools-jpp-depmap.xml 
	maven-doxia-sitetools.spec 
Removed Files:
	maven-doxia-sitetools-disablehtmlunit.patch 
Log Message:
1.0-1.jpp6

Index: maven-doxia-sitetools-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-doxia-sitetools/maven-doxia-sitetools-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-doxia-sitetools-jpp-depmap.xml	30 Sep 2010 18:03:48 -0000	1.1
--- maven-doxia-sitetools-jpp-depmap.xml	5 Dec 2010 14:40:29 -0000	1.2
***************
*** 27,29 ****
--- 27,67 ----
    </dependency>
  -->
+   <dependency>
+         <maven>
+           <groupId>xml-apis</groupId>
+           <artifactId>xmlParserAPIs</artifactId>
+           <version>2.0.2</version>
+         </maven>
+         <jpp>
+           <groupId>JPP</groupId>
+           <artifactId>xml-commons-jaxp-1.3-apis</artifactId>
+           <version>1.3.04</version>
+         </jpp>
+   </dependency>
+   <dependency>
+         <maven>
+           <groupId>xml-apis</groupId>
+           <artifactId>xml-apis-ext</artifactId>
+           <version>1.3.04</version>
+         </maven>
+         <jpp>
+           <groupId>JPP</groupId>
+           <artifactId>xml-commons-jaxp-1.3-apis</artifactId>
+           <version>1.3.04</version>
+         </jpp>
+   </dependency>
+ 
+   <dependency>
+         <maven>
+           <groupId>com.thoughtworks.qdox</groupId>
+           <artifactId>qdox</artifactId>
+           <version>1.6.3</version>
+         </maven>
+         <jpp>
+           <groupId>JPP</groupId>
+           <artifactId>qdox161</artifactId>
+           <version>1.6.1</version>
+         </jpp>
+   </dependency>
+ 
  </dependencies>

Index: maven-doxia-sitetools.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-doxia-sitetools/maven-doxia-sitetools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** maven-doxia-sitetools.spec	30 Sep 2010 18:03:48 -0000	1.3
--- maven-doxia-sitetools.spec	5 Dec 2010 14:40:29 -0000	1.4
***************
*** 31,39 ****
  %define parent maven-doxia
  %define subproj sitetools
! %define namedversion 1.0-alpha-10
  
! Name:           %{parent}-%{subproj}
  Version:        1.0
! Release:        0.1.a10.3%{?dist}
  Epoch:          0
  Summary:        Content generation framework
--- 31,40 ----
  %define parent maven-doxia
  %define subproj sitetools
! %define namedversion 1.0
! %define bootstrap 1
  
! Name:           maven-doxia-sitetools
  Version:        1.0
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Content generation framework
***************
*** 42,55 ****
  URL:            http://maven.apache.org/doxia/
  
! # svn export http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.0-alpha-10/ maven-doxia-sitetools
! # tar czf maven-doxia-sitetools.tar.gz maven-doxia-sitetools/
! Source0:        %{name}.tar.gz
! Source1:        %{name}-jpp-depmap.xml
  
! Patch0:         %{name}-disablehtmlunit.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-compiler
--- 43,56 ----
  URL:            http://maven.apache.org/doxia/
  
! # svn export http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.0/ maven-doxia-sitetools
! # tar czf maven-doxia-sitetools-1.0.tar.gz maven-doxia-sitetools/
  
! Source0:        %{name}-%{version}.tar.gz
! Source1:        %{name}-jpp-depmap.xml
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:  jpackage-utils >= 0:1.7.5
+ BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-plugin-compiler
***************
*** 63,71 ****
  BuildRequires:  maven-surefire-maven-plugin 
  BuildRequires:  maven-surefire-provider-junit 
! BuildRequires:  maven-doxia >= 1.0-0.3.a10
  BuildRequires:  maven-doxia-sitetools
  BuildRequires:  plexus-maven-plugin >= 0:1.2-2
! BuildRequires:  qdox
! BuildRequires:  modello-maven-plugin >= 0:1.0-0.a8.3
  BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
  BuildRequires:  plexus-cdc
--- 64,72 ----
  BuildRequires:  maven-surefire-maven-plugin 
  BuildRequires:  maven-surefire-provider-junit 
! BuildRequires:  maven-doxia >= 0:1.0
  BuildRequires:  maven-doxia-sitetools
  BuildRequires:  plexus-maven-plugin >= 0:1.2-2
! BuildRequires:  qdox161
! BuildRequires:  modello-maven-plugin >= 0:1.3
  BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
  BuildRequires:  plexus-cdc
***************
*** 76,79 ****
--- 77,81 ----
  BuildRequires:  apache-commons-validator
  BuildRequires:  junit
+ BuildRequires:  htmlunit
  BuildRequires:  oro
  BuildRequires:  plexus-container-default
***************
*** 87,90 ****
--- 89,93 ----
  BuildRequires:  saxpath
  
+ Requires:       java >= 0:1.6.0
  Requires:       classworlds
  Requires:       apache-commons-collections
***************
*** 92,96 ****
  Requires:       apache-commons-validator
  Requires:       junit
! Requires:       maven-doxia
  Requires:       oro
  Requires:       plexus-container-default
--- 95,99 ----
  Requires:       apache-commons-validator
  Requires:       junit
! Requires:       maven-doxia >= 0:1.0
  Requires:       oro
  Requires:       plexus-container-default
***************
*** 122,130 ****
  %setup -q -n %{name}
  
- %patch0
- 
- # Disable test that needs htmlunit, until we get it in Fedora
- rm -f doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
- 
  %build
  
--- 125,128 ----
***************
*** 139,142 ****
--- 137,141 ----
        install
  
+ %if ! %{bootstrap}
  for dir in doxia*; do
      pushd $dir
***************
*** 147,150 ****
--- 146,150 ----
      popd
  done
+ %endif
  
  %post
***************
*** 184,190 ****
--- 184,192 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer
  
+ %if ! %{bootstrap}
  cp -pr doxia-decoration-model/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/decoration-model/
  cp -pr doxia-site-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/site-renderer/
  cp -pr doxia-doc-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer/
+ %endif
  
  %clean
***************
*** 193,199 ****
  %files
  %defattr(-,root,root,-)
! %{_javadir}/%{parent}
! %{_datadir}/maven2/poms
! %{_mavendepmapfragdir}
  
  %files javadoc
--- 195,202 ----
  %files
  %defattr(-,root,root,-)
! %dir %{_javadir}/%{parent}
! %{_javadir}/%{parent}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
***************
*** 202,205 ****
--- 205,211 ----
  
  %changelog
+ * Sun Dec 05 2010 Ralph Apel <r.apel at r-apel.de> 1.0-1
+ - 1.0
+ 
  * Thu Sep 30 2010 Ralph Apel <r.apel at r-apel.de> 1.0-0.1.a10.3
  - add depmap file

--- maven-doxia-sitetools-disablehtmlunit.patch DELETED ---




More information about the JPackage-commits mailing list