[Jpackage-commits] dist/plexus-io/JPP-6 .cvsignore, 1.2, 1.3 plexus-io.spec, 1.3, 1.4 sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Thu Oct 13 22:27:38 CEST 2011


Update of /home/projects/jpackage/cvs/dist/plexus-io/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv25701

Modified Files:
	.cvsignore plexus-io.spec sources 
Log Message:
- 1.0-alpha-5
- use flat dir location
- use official name


Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-io/JPP-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	28 May 2008 19:33:24 -0000	1.2
--- .cvsignore	13 Oct 2011 20:27:36 -0000	1.3
***************
*** 1 ****
! plexus-io-1.0-alpha-1.tar.gz
--- 1 ----
! plexus-io-1.0-alpha-5.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-io/JPP-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	28 May 2008 19:33:24 -0000	1.2
--- sources	13 Oct 2011 20:27:36 -0000	1.3
***************
*** 1 ****
! 87cc5c51b265163fa4f3acffa46963aa  plexus-io-1.0-alpha-1.tar.gz
--- 1 ----
! bceed7b55f5a8e681205b9b273331fc1  plexus-io-1.0-alpha-5.tar.bz2

Index: plexus-io.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-io/JPP-6/plexus-io.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** plexus-io.spec	29 Jun 2011 19:37:20 -0000	1.3
--- plexus-io.spec	13 Oct 2011 20:27:36 -0000	1.4
***************
*** 29,37 ****
  #
  
! %bcond_without maven
! 
! %global parent plexus
! %global subname io
! %global namedversion 1.0-alpha-1
  
  %define section free
--- 29,33 ----
  #
  
! %global namedversion 1.0-alpha-5
  
  %define section free
***************
*** 39,43 ****
  Name:           plexus-io
  Version:        1.0
! Release:        0.a1.2%{?dist}
  Epoch:          0
  Summary:        Plexus IO Component
--- 35,39 ----
  Name:           plexus-io
  Version:        1.0
! Release:        0.a5.1%{?dist}
  Epoch:          0
  Summary:        Plexus IO Component
***************
*** 45,53 ****
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
! # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-io-1.0-alpha-1/
! Source0:        %{name}-%{namedversion}.tar.gz
! Source1:        plexus-io-1.0-build.xml
! Source2:        plexus-io-settings.xml
! Source3:        plexus-io-1.0-jpp-depmap.xml
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
--- 41,46 ----
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
! # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-io-1.0-alpha-5/
! Source0:        %{name}-%{namedversion}.tar.bz2
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
***************
*** 57,63 ****
  Requires:       plexus-utils
  BuildRequires:  jpackage-utils >= 0:1.7.3
- BuildRequires:  ant >= 0:1.6
  BuildRequires:  commons-parent
- %if %with maven
  BuildRequires:  maven2 >= 2.0.4-10jpp
  BuildRequires:  maven2-plugin-compiler
--- 50,54 ----
***************
*** 69,73 ****
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-surefire
- %endif
  BuildRequires:  classworlds >= 0:1.1
  BuildRequires:  plexus-container-default 
--- 60,63 ----
***************
*** 94,113 ****
  
  %prep
! %setup -q -n %{name}-%{namedversion}
! cp -p %{SOURCE1} build.xml
  
  %build
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! %if %with maven
! %{_bindir}/mvn-jpp -Dmaven2.jpp.depmap.file=%{SOURCE3} -Dmaven.repo.local=${MAVEN_REPO_LOCAL} install javadoc:aggregate
! %else
! export CLASSPATH=$(build-classpath \
! classworlds \
! plexus/container-default \
! plexus/utils \
! )
! CLASSPATH=$CLASSPATH:target/classes:target/test-classes
! %{ant} -Dbuild.sysclasspath=only jar javadoc
! %endif
  
  %install
--- 84,92 ----
  
  %prep
! %setup -q -n plexus-io-%{namedversion}
  
  %build
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! %{_bindir}/mvn-jpp -Dmaven.repo.local=${MAVEN_REPO_LOCAL} install javadoc:aggregate
  
  %install
***************
*** 115,131 ****
  
  # jars
! install -d -m 755 %{buildroot}%{_javadir}/plexus
! install -pm 644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/plexus/io-%{namedversion}.jar
! %add_to_maven_depmap org.codehaus.plexus plexus-io %{namedversion} JPP/%{parent} %{subname}
! (cd %{buildroot}%{_javadir}/plexus && for jar in *-%{namedversion}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
  
  # poms
  install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -pm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
  
  # javadoc
! install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! ln -s %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
  
  %clean
--- 94,110 ----
  
  # jars
! install -d -m 755 %{buildroot}%{_javadir}
! install -pm 644 target/plexus-io-%{namedversion}.jar %{buildroot}%{_javadir}/plexus-io-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} `echo $jar | sed "s|-%{namedversion}||g"`; done)
  
  # poms
  install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -pm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-plexus-io.pom
! %add_to_maven_depmap org.codehaus.plexus plexus-io %{namedversion} JPP plexus-io
  
  # javadoc
! install -d -m 755 %{buildroot}%{_javadocdir}/plexus-io-%{namedversion}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/plexus-io-%{namedversion}
! ln -s plexus-io-%{namedversion} %{buildroot}%{_javadocdir}/plexus-io
  
  %clean
***************
*** 139,153 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/%{parent}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %{_javadocdir}/%{name}-%{namedversion}
! %{_javadocdir}/%{name}
  
  %changelog
  * Wed Jun 29 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.a1.2
  - use full version in dir and file names
--- 118,138 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/plexus-io-%{namedversion}.jar
! %{_javadir}*/plexus-io.jar
! %{_datadir}/maven2/poms/JPP-plexus-io.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/plexus-io-%{namedversion}
! %{_javadocdir}/plexus-io
  
  %changelog
+ * Thu Oct 13 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.a5.1
+ - 1.0-alpha-5
+ - use flat dir location
+ - use official name
+ 
  * Wed Jun 29 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.a1.2
  - use full version in dir and file names




More information about the JPackage-commits mailing list