[Jpackage-commits] rpms/free/plexus-cdc plexus-cdc.spec,1.8,1.9

jpackage jpackage at ryu.zarb.org
Fri Dec 3 23:29:51 CET 2010


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

Modified Files:
	plexus-cdc.spec 
Log Message:
1.0-0.3.a10.8.jpp6

Index: plexus-cdc.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-cdc/plexus-cdc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** plexus-cdc.spec	29 Apr 2009 08:56:48 -0000	1.8
--- plexus-cdc.spec	3 Dec 2010 22:29:49 -0000	1.9
***************
*** 44,48 ****
  Name:           %{parent}-%{subname}
  Version:        1.0
! Release:        0.3.a10.7%{?dist}
  Epoch:          0
  Summary:        Plexus Component Descriptor Creator
--- 44,48 ----
  Name:           %{parent}-%{subname}
  Version:        1.0
! Release:        0.3.a10.8%{?dist}
  Epoch:          0
  Summary:        Plexus Component Descriptor Creator
***************
*** 53,57 ****
  # svn export http://svn.codehaus.org/plexus/plexus-tools/tags/plexus-cdc-1.0-alpha-10 plexus-cdc/
  # tar czf plexus-cdc-1.0-alpha-10.tar.gz plexus-cdc/
! Source1:		%{name}-jpp-depmap.xml
  Source2:        %{name}-%{version}-build.xml
  
--- 53,57 ----
  # svn export http://svn.codehaus.org/plexus/plexus-tools/tags/plexus-cdc-1.0-alpha-10 plexus-cdc/
  # tar czf plexus-cdc-1.0-alpha-10.tar.gz plexus-cdc/
! Source1:        %{name}-jpp-depmap.xml
  Source2:        %{name}-%{version}-build.xml
  
***************
*** 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,71 ----
  %endif
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  ant >= 0:1.7.1
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.8
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
***************
*** 74,84 ****
  BuildRequires:  maven2-plugin-release
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-surefire = 2.3
! BuildRequires:  maven-surefire-provider-junit = 2.3
  BuildRequires:  maven-doxia
  BuildRequires:  maven-doxia-sitetools
  BuildRequires:  maven2-common-poms >= 1.0
! BuildRequires:  plexus-containers-component-api >= 1.0-0.a34
! 
  %endif
  BuildRequires:  classworlds
--- 74,84 ----
  BuildRequires:  maven2-plugin-release
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit
  BuildRequires:  maven-doxia
  BuildRequires:  maven-doxia-sitetools
  BuildRequires:  maven2-common-poms >= 1.0
! BuildRequires:  apache-commons-parent
! BuildRequires:  plexus-containers-component-api
  %endif
  BuildRequires:  classworlds
***************
*** 86,90 ****
  BuildRequires:  plexus-container-default
  BuildRequires:  plexus-utils
! BuildRequires:  qdox
  %if %{gcj_support}
  BuildRequires:    gnu-crypto
--- 86,90 ----
  BuildRequires:  plexus-container-default
  BuildRequires:  plexus-utils
! BuildRequires:  qdox161
  %if %{gcj_support}
  BuildRequires:    gnu-crypto
***************
*** 98,105 ****
  Requires:       plexus-container-default
  Requires:       plexus-utils
! Requires:       qdox
  
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  
  %description
--- 98,105 ----
  Requires:       plexus-container-default
  Requires:       plexus-utils
! Requires:       qdox161
  
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  %description
***************
*** 184,188 ****
  %post
  %update_maven_depmap
- %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 184,187 ----
***************
*** 194,198 ****
  %postun
  %update_maven_depmap
- %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 193,196 ----
***************
*** 202,214 ****
  %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,-)
--- 200,203 ----
***************
*** 225,232 ****
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  
  %changelog
  * Wed Apr 29 2009 Yong Yang <yyang at redhat.com> 0:1.0-0.3.a10.7
  - rebuild with maven2-2.0.8 built in non-bootstrap mode
--- 214,224 ----
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  
  %changelog
+ * Fri Dec 03 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.3.a10.8
+ - fix to plexus-cdc, plexus-maven-plugin sequence
+ 
  * Wed Apr 29 2009 Yong Yang <yyang at redhat.com> 0:1.0-0.3.a10.7
  - rebuild with maven2-2.0.8 built in non-bootstrap mode




More information about the JPackage-commits mailing list