[Jpackage-commits] rpms/free/plexus-cdc plexus-cdc-DefaultComponentDescriptorWriterTest.patch, NONE, 1.1.2.1 plexus-cdc-jpp-depmap.xml, 1.2, 1.2.2.1 plexus-cdc.spec, 1.2, 1.2.2.1

jpackage jpackage at ryu.zarb.org
Fri Feb 27 18:53:25 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/plexus-cdc
In directory ryu.zarb.org:/tmp/SFXl22noBl/rpms/free/plexus-cdc

Modified Files:
      Tag: JPACKAGE-5_0
	plexus-cdc-jpp-depmap.xml plexus-cdc.spec 
Added Files:
      Tag: JPACKAGE-5_0
	plexus-cdc-DefaultComponentDescriptorWriterTest.patch 
Log Message:
1.0-0.a11.1.jpp5

Index: plexus-cdc-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-cdc/plexus-cdc-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** plexus-cdc-jpp-depmap.xml	22 Nov 2007 17:33:46 -0000	1.2
--- plexus-cdc-jpp-depmap.xml	27 Feb 2009 17:53:23 -0000	1.2.2.1
***************
*** 13,16 ****
  	</dependency>
  
! </dependencies>
  
--- 13,28 ----
  	</dependency>
  
! 	<dependency>
! 	  <maven>
! 		<groupId>com.thoughtworks.qdox</groupId>
! 		<artifactId>qdox</artifactId>
! 		<version>1.6.3</version>
! 	  </maven>
! 	  <jpp>
! 		<groupId>JPP</groupId>
! 		<artifactId>qdox</artifactId>
! 		<version>1.6.1</version>
! 	  </jpp>
! 	</dependency>
  
+ </dependencies>

--- NEW FILE: plexus-cdc-DefaultComponentDescriptorWriterTest.patch ---
--- src/test/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorWriterTest.java.sav	2008-06-09 14:51:21.000000000 +0200
+++ src/test/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorWriterTest.java	2008-06-09 14:52:12.000000000 +0200
@@ -39,7 +39,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        descriptorWriter = (DefaultComponentDescriptorWriter) lookup(ComponentDescriptorWriter.class);
+        descriptorWriter = (DefaultComponentDescriptorWriter) lookup("org.codehaus.plexus.cdc.ComponentDescriptorWriter");
         assertNotNull(descriptorWriter);
     }
 

Index: plexus-cdc.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-cdc/plexus-cdc.spec,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** plexus-cdc.spec	22 Nov 2007 17:33:46 -0000	1.2
--- plexus-cdc.spec	27 Feb 2009 17:53:23 -0000	1.2.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 41,60 ****
  %define parent plexus
  %define subname cdc
  
  Name:           plexus-cdc
  Version:        1.0
! Release:        0.a10.1jpp
  Epoch:          0
  Summary:        Plexus Component Descriptor Creator
  License:        Apache Software License
  Group:          Development/Java
- Vendor:         JPackage Project
- Distribution:   JPackage
  URL:            http://plexus.codehaus.org/
  Source0:        %{name}-src.tar.gz
! # svn export http://svn.plexus.codehaus.org/plexus/tags/plexus-cdc-1.0-alpha-10 plexus-cdc
  
! Source1:                %{name}-jpp-depmap.xml
! Source2:                %{name}-%{version}-build.xml
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
--- 41,60 ----
  %define parent plexus
  %define subname cdc
+ %define named_version 1.0-alpha-11
  
  Name:           plexus-cdc
  Version:        1.0
! Release:        0.a11.1%{dist}
  Epoch:          0
  Summary:        Plexus Component Descriptor Creator
  License:        Apache Software License
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
  Source0:        %{name}-src.tar.gz
! # svn export http://svn.codehaus.org/plexus/plexus-tools/tags/plexus-cdc-1.0-alpha-11/
  
! Source1:        %{name}-jpp-depmap.xml
! Source2:        %{name}-%{version}-build.xml
! Patch0:         plexus-cdc-DefaultComponentDescriptorWriterTest.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
***************
*** 64,71 ****
  %endif
  
! BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  ant >= 0:1.6
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.4-9
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
--- 64,72 ----
  %endif
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.7
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
***************
*** 74,78 ****
  BuildRequires:  maven2-plugin-release
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-surefire
  BuildRequires:  maven2-common-poms >= 1.0
  %endif
--- 75,79 ----
  BuildRequires:  maven2-plugin-release
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven-surefire-plugin
  BuildRequires:  maven2-common-poms >= 1.0
  %endif
***************
*** 82,85 ****
--- 83,87 ----
  BuildRequires:  plexus-utils
  BuildRequires:  qdox
+ BuildRequires:  slf4j
  %if %{gcj_support}
  BuildRequires:    gnu-crypto
***************
*** 89,92 ****
--- 91,95 ----
  %endif
  
+ Requires:       java >= 0:1.5.0
  Requires:       jdom
  Requires:       maven2-common-poms >= 1.0
***************
*** 94,100 ****
  Requires:       plexus-utils
  Requires:       qdox
  
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  
  %description
--- 97,104 ----
  Requires:       plexus-utils
  Requires:       qdox
+ Requires:       slf4j
  
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  %description
***************
*** 109,114 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 113,116 ----
***************
*** 116,123 ****
  
  %prep
! %setup -q -n %{name}
  cp %{SOURCE2} build.xml
! mv src/test/resources src/test/java
! mkdir src/test/resources
  
  %build
--- 118,126 ----
  
  %prep
! %setup -q -n %{name}-%{named_version}
  cp %{SOURCE2} build.xml
! 
! %patch0 -b .sav0
! 
  
  %build
***************
*** 153,157 ****
  install -pm 644 target/*.jar \
            $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
! %add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-4 JPP/%{parent} %{subname}
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
--- 156,160 ----
  install -pm 644 target/*.jar \
            $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
! %add_to_maven_depmap org.codehaus.plexus %{name} %{named_version} JPP/%{parent} %{subname}
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
***************
*** 179,183 ****
  %post
  %update_maven_depmap
- %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 182,185 ----
***************
*** 189,193 ****
  %postun
  %update_maven_depmap
- %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 191,194 ----
***************
*** 197,215 ****
  %endif
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %files
  %defattr(-,root,root,-)
  %{_javadir}/plexus
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
--- 198,206 ----
  %endif
  
  %files
  %defattr(-,root,root,-)
  %{_javadir}/plexus
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
***************
*** 220,227 ****
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  
  %changelog
  * Thu Nov 22 2007 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.a10.1jpp
  - 1.0-alpha-10
--- 211,221 ----
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  
  %changelog
+ * Fri Feb 27 2009 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.a11.1.jpp5
+ - 1.0-alpha-11
+ 
  * Thu Nov 22 2007 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.a10.1jpp
  - 1.0-alpha-10




More information about the JPackage-commits mailing list