[Jpackage-commits] rpms/free/plexus-ant-factory plexus-ant-factory.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Tue Dec 7 00:02:22 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/plexus-ant-factory
In directory ryu.zarb.org:/tmp/f7_OKHnDHQ/rpms/free/plexus-ant-factory

Modified Files:
	plexus-ant-factory.spec 
Log Message:
1.0-0.a2.1.1.jpp6

Index: plexus-ant-factory.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-ant-factory/plexus-ant-factory.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** plexus-ant-factory.spec	2 Oct 2008 17:15:42 -0000	1.2
--- plexus-ant-factory.spec	6 Dec 2010 23:02:19 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 42,45 ****
--- 42,46 ----
  %define parent plexus
  %define subname ant-factory
+ %define namedversion 1.0-alpha-2.1
  
  %define maven_settings_file %{_builddir}/%{name}/settings.xml
***************
*** 47,58 ****
  Name:           %{parent}-%{subname}
  Version:        1.0
! Release:        0.a1.4%{?dist}
  Epoch:          0
! Summary:        Plexus Component Creator
  License:        ASL 2.0
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
  Source0:        %{name}-src.tar.gz
! # svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-ant-factory-1.0-alpha-1 plexus-ant-factory
  
  Source1:        %{name}-jpp-depmap.xml
--- 48,59 ----
  Name:           %{parent}-%{subname}
  Version:        1.0
! Release:        0.a2.1.1%{?dist}
  Epoch:          0
! Summary:        Plexus Ant Factory
  License:        ASL 2.0
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
  Source0:        %{name}-src.tar.gz
! # svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-ant-factory-1.0-alpha-2.1 plexus-ant-factory
  
  Source1:        %{name}-jpp-depmap.xml
***************
*** 62,68 ****
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.2
  %if %with maven
! BuildRequires:  maven2 >= 2.0.4-9
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
--- 63,70 ----
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
  %if %with maven
! BuildRequires:  maven2 >= 2.0.8
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
***************
*** 72,88 ****
  BuildRequires:  maven2-common-poms >= 1.0-2
  BuildRequires:  maven-release
! BuildRequires:  maven-surefire-plugin
  %endif
  
! BuildRequires:  ant
  BuildRequires:  classworlds
  BuildRequires:  plexus-container-default
  BuildRequires:  plexus-utils
! Requires:       ant
  Requires:       classworlds
  Requires:       plexus-container-default
  Requires:       plexus-utils
! Requires(post): jpackage-utils >= 0:1.7.2
! Requires(postun): jpackage-utils >= 0:1.7.2
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
--- 74,92 ----
  BuildRequires:  maven2-common-poms >= 1.0-2
  BuildRequires:  maven-release
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  apache-commons-parent
  %endif
  
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  classworlds
  BuildRequires:  plexus-container-default
  BuildRequires:  plexus-utils
! Requires:       java >= 0:1.6.0
! Requires:       ant >= 0:1.7.1
  Requires:       classworlds
  Requires:       plexus-container-default
  Requires:       plexus-utils
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
***************
*** 119,123 ****
  mvn-jpp -e -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
  %else
! export CLSSPATH=
  export OPT_JAR_LIST=:
  mkdir -p lib
--- 123,127 ----
  mvn-jpp -e -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
  %else
! export CLASSPATH=
  export OPT_JAR_LIST=:
  mkdir -p lib
***************
*** 135,142 ****
  
  # pom
! %add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-1 JPP/%{parent} %{subname}
  
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
  
  # javadoc
--- 139,146 ----
  
  # pom
! %add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-2.1 JPP/%{parent} %{subname}
  
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
  
  # javadoc
***************
*** 172,177 ****
  %files
  %defattr(0644,root,root,755)
! %{_javadir}/plexus
! %{_datadir}/maven2/*
  %{_mavendepmapfragdir}/*
  
--- 176,182 ----
  %files
  %defattr(0644,root,root,755)
! %dir %{_javadir}/plexus
! %{_javadir}/plexus/*.jar
! %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
  
***************
*** 189,192 ****
--- 194,200 ----
  
  %changelog
+ * Mon Dec 06 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.a2.1.1
+ - 1.0-alpha-2.1
+ 
  * Thu Oct 02 2008 David Walluck <dwalluck at redhat.com> 0:1.0-0.a1.4
  - spec cleanup




More information about the JPackage-commits mailing list