[Jpackage-commits] rpms/free/maven-doxia maven-doxia-jpp-depmap.xml, 1.3, 1.3.2.1 maven-doxia.spec, 1.5, 1.5.2.1

jpackage jpackage at ryu.zarb.org
Mon Feb 9 11:39:34 CET 2009


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

Modified Files:
      Tag: JPACKAGE-5_0
	maven-doxia-jpp-depmap.xml maven-doxia.spec 
Log Message:
1.0-0.a10.4.jpp5

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-doxia/maven-doxia.spec,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C 2 -d -r1.5 -r1.5.2.1
*** maven-doxia.spec	21 Dec 2007 15:44:46 -0000	1.5
--- maven-doxia.spec	9 Feb 2009 10:39:32 -0000	1.5.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
***************
*** 44,54 ****
  Name:           maven-doxia
  Version:        1.0
! Release:        0.a10.2jpp
  Epoch:          0
  Summary:        Doxia is a content generation framework
  License:        Apache Software License
  Group:          Development/Java
! Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  URL:            http://maven.apache.org/doxia/
  Source0:        %{bname}-%{namedversion}.tar.gz
--- 44,54 ----
  Name:           maven-doxia
  Version:        1.0
! Release:        0.a10.4%{dist}
  Epoch:          0
  Summary:        Doxia is a content generation framework
  License:        Apache Software License
  Group:          Development/Java
! #Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! #Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  URL:            http://maven.apache.org/doxia/
  Source0:        %{bname}-%{namedversion}.tar.gz
***************
*** 72,82 ****
  
  BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.7.3
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-nodeps
  BuildRequires:  ant-junit
  BuildRequires:  junit >= 0:3.8.2
! BuildRequires:  modello >= 0:1.0-0.a15
  %if %{with_maven}
  BuildRequires:  maven2 >= 0:2.0.4
--- 72,82 ----
  
  BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-nodeps
  BuildRequires:  ant-junit
  BuildRequires:  junit >= 0:3.8.2
! BuildRequires:  modello >= 0:1.0-0.a17
  %if %{with_maven}
  BuildRequires:  maven2 >= 0:2.0.4
***************
*** 89,96 ****
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
! BuildRequires:  maven2-plugin-surefire
  BuildRequires:  plexus-maven-plugin >= 0:1.3.5
! BuildRequires:  modello-maven-plugin >= 0:1.0-0.a15
  %endif
  BuildRequires:  excalibur-avalon-framework
  BuildRequires:  geronimo-jta-1.0.1B-api
--- 89,98 ----
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
! BuildRequires:  maven-shared-archiver
! BuildRequires:  maven-surefire-plugin
  BuildRequires:  plexus-maven-plugin >= 0:1.3.5
! BuildRequires:  modello-maven-plugin >= 0:1.0-0.a17
  %endif
+ BuildRequires:  cssparser
  BuildRequires:  excalibur-avalon-framework
  BuildRequires:  geronimo-jta-1.0.1B-api
***************
*** 98,104 ****
  BuildRequires:  itext >= 0:1.4
  BuildRequires:  jakarta-commons-cli
! BuildRequires:  jakarta-commons-collections >= 0:3.2
  BuildRequires:  jakarta-commons-lang
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  plexus-cli
  BuildRequires:  plexus-containers-container-default
--- 100,107 ----
  BuildRequires:  itext >= 0:1.4
  BuildRequires:  jakarta-commons-cli
! BuildRequires:  jakarta-commons-collections >= 0:3.1
  BuildRequires:  jakarta-commons-lang
  BuildRequires:  jakarta-commons-logging
+ BuildRequires:  jaxen
  BuildRequires:  plexus-cli
  BuildRequires:  plexus-containers-container-default
***************
*** 106,116 ****
  BuildRequires:  plexus-utils >= 0:1.4.8
  BuildRequires:  plexus-velocity >= 0:1.1.7
  BuildRequires:  velocity >= 0:1.5
  BuildRequires:  xalan-j2 >= 0:2.7.0
  
  Requires:       excalibur-avalon-framework
  Requires:       itext >= 0:1.4
  Requires:       jakarta-commons-cli
! Requires:       jakarta-commons-collections
  Requires:       jakarta-commons-lang
  Requires:       jakarta-commons-logging
--- 109,122 ----
  BuildRequires:  plexus-utils >= 0:1.4.8
  BuildRequires:  plexus-velocity >= 0:1.1.7
+ BuildRequires:  saxpath
  BuildRequires:  velocity >= 0:1.5
  BuildRequires:  xalan-j2 >= 0:2.7.0
  
+ Requires:       java >= 0:1.5.0
+ Requires:       cssparser
  Requires:       excalibur-avalon-framework
  Requires:       itext >= 0:1.4
  Requires:       jakarta-commons-cli
! Requires:       jakarta-commons-collections >= 0:3.1
  Requires:       jakarta-commons-lang
  Requires:       jakarta-commons-logging
***************
*** 120,128 ****
  Requires:       plexus-utils >= 0:1.4.8
  Requires:       plexus-velocity >= 0:1.1.7
  Requires:       velocity >= 0:1.5
  Requires:       xalan-j2 >= 0:2.7.0
  
! Requires(post):   jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
  
  %description
--- 126,135 ----
  Requires:       plexus-utils >= 0:1.4.8
  Requires:       plexus-velocity >= 0:1.1.7
+ Requires:       saxpath
  Requires:       velocity >= 0:1.5
  Requires:       xalan-j2 >= 0:2.7.0
  
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  
  %description
***************
*** 136,141 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 143,146 ----
***************
*** 175,178 ****
--- 180,184 ----
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+         -Dmaven.test.failure.ignore=true \
          install javadoc:javadoc
  popd
***************
*** 222,226 ****
  modello/plugin-xsd \
  plexus/classworlds \
! plexus/container-default \
  plexus/utils \
  )
--- 228,233 ----
  modello/plugin-xsd \
  plexus/classworlds \
! plexus/containers-component-api \
! plexus/containers-container-default \
  plexus/utils \
  )
***************
*** 256,264 ****
--- 263,275 ----
  
  build-jar-repository -s -p $MDLIB \
+       commons-cli \
+       commons-collections \
        commons-httpclient \
        commons-io \
        commons-lang \
+       commons-logging \
        htmlunit \
        itext \
+       jaxen \
        js \
        nekohtml \
***************
*** 276,282 ****
--- 287,296 ----
  export CLASSPATH=
  CLASSPATH=$CLASSPATH:$MDLIB/../doxia-%{namedversion}/doxia-core/target/test-classes
+ CLASSPATH=$CLASSPATH:$MDLIB/commons-cli.jar
+ CLASSPATH=$CLASSPATH:$MDLIB/commons-collections.jar
  CLASSPATH=$CLASSPATH:$MDLIB/commons-httpclient.jar
  CLASSPATH=$CLASSPATH:$MDLIB/commons-io.jar
  CLASSPATH=$CLASSPATH:$MDLIB/commons-lang.jar
+ CLASSPATH=$CLASSPATH:$MDLIB/commons-logging.jar
  CLASSPATH=$CLASSPATH:$MDLIB/doxia-module-docbook-simple.jar
  CLASSPATH=$CLASSPATH:$MDLIB/doxia-module-latex.jar
***************
*** 290,293 ****
--- 304,308 ----
  CLASSPATH=$CLASSPATH:$MDLIB/htmlunit.jar
  CLASSPATH=$CLASSPATH:$MDLIB/itext.jar
+ CLASSPATH=$CLASSPATH:$MDLIB/jaxen.jar
  CLASSPATH=$CLASSPATH:$MDLIB/js.jar
  CLASSPATH=$CLASSPATH:$MDLIB/nekohtml.jar
***************
*** 451,477 ****
  rm -rf $RPM_BUILD_ROOT
  
! %if %{with_maven}
! %post javadoc
! rm -f %{_javadocdir}/%{name}
! ln -s %{name}-%{namedversion} %{_javadocdir}/%{name}
! 
! %postun javadoc
! if [ "$1" = "0" ]; then
!   rm -f %{_javadocdir}/%{name}
! fi
! %endif
  
  %files
! %defattr(-,root,root,-)
  %{_javadir}/%{name}
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Fri Dec 21 2007 Ralph Apel <r.apel at r-apel.de> 1.0-0.a10.2jpp
  - Backward compatibility patching
--- 466,501 ----
  rm -rf $RPM_BUILD_ROOT
  
! #%if %{with_maven}
! #%post javadoc
! #rm -f %{_javadocdir}/%{name}
! #ln -s %{name}-%{namedversion} %{_javadocdir}/%{name}
! #
! #%postun javadoc
! #if [ "$1" = "0" ]; then
! #  rm -f %{_javadocdir}/%{name}
! #fi
! #%endif
  
  %files
! %defattr(0644,root,root,0755)
  %{_javadir}/%{name}
! %{_datadir}/maven2/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Fri Dec 12 2008 David Walluck <dwalluck at redhat.com> 0:1.0-0.a10.4
+ - relax jakarta-commons-collections requirements
+ 
+ * Fri Aug 01 2008 Ralph Apel <r.apel at r-apel.de> 1.0-0.a10.3jpp5
+ - Import to cvs
+ - Drop javadoc scriptlets
+ - Adapt to modello-1.0-0.a17
+ - Add libs to nomaven build CLASSPATH
+ 
  * Fri Dec 21 2007 Ralph Apel <r.apel at r-apel.de> 1.0-0.a10.2jpp
  - Backward compatibility patching

Index: maven-doxia-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-doxia/maven-doxia-jpp-depmap.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** maven-doxia-jpp-depmap.xml	21 Dec 2007 14:51:44 -0000	1.3
--- maven-doxia-jpp-depmap.xml	9 Feb 2009 10:39:32 -0000	1.3.2.1
***************
*** 19,25 ****
  	</maven>
  	<jpp>
! 	  <groupId>JPP/maven2</groupId>
  	  <artifactId>archiver</artifactId>
! 	  <version>2.0.4</version>
  	</jpp>
    </dependency>
--- 19,25 ----
  	</maven>
  	<jpp>
! 	  <groupId>JPP/maven-shared</groupId>
  	  <artifactId>archiver</artifactId>
! 	  <version>2.3</version>
  	</jpp>
    </dependency>
***************
*** 109,111 ****
--- 109,124 ----
    </dependency>
  
+  <dependency>
+    <maven>
+      <groupId>javax.jms</groupId>
+      <artifactId>jms</artifactId>
+      <version>1.1</version>
+    </maven>
+    <jpp>
+      <groupId>JPP</groupId>
+      <artifactId>jms_1_1_api</artifactId>
+      <version>1.1</version>
+    </jpp>
+  </dependency>
+ 
  </dependencies>




More information about the JPackage-commits mailing list