[Jpackage-commits] dist/plexus-archiver/devel .cvsignore, 1.4, 1.5 plexus-archiver-1.0-build.xml, 1.2, NONE plexus-archiver-1.0-project.xml, 1.1, NONE plexus-archiver-jpp-depmap.xml, 1.1, NONE plexus-archiver.spec, 1.8, 1.9 sources, 1.4, 1.5

David Walluck david at ryu.zarb.org
Fri Oct 14 00:47:17 CEST 2011


Update of /home/projects/jpackage/cvs/dist/plexus-archiver/devel
In directory ryu.zarb.org:/tmp/cvs-serv19679

Modified Files:
	.cvsignore plexus-archiver.spec sources 
Removed Files:
	plexus-archiver-1.0-build.xml plexus-archiver-1.0-project.xml 
	plexus-archiver-jpp-depmap.xml 
Log Message:
- 1.0-alpha-12
- fix jar name and location


Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-archiver/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** .cvsignore	19 Sep 2011 09:41:30 -0000	1.4
--- .cvsignore	13 Oct 2011 22:47:15 -0000	1.5
***************
*** 1 ****
! plexus-archiver-1.2.tar.bz2
--- 1 ----
! plexus-archiver-1.0-alpha-12.tar.bz2

Index: plexus-archiver.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-archiver/devel/plexus-archiver.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** plexus-archiver.spec	19 Sep 2011 09:41:30 -0000	1.8
--- plexus-archiver.spec	13 Oct 2011 22:47:15 -0000	1.9
***************
*** 27,70 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
  
! %global namedversion %{version}
  
  Name:           plexus-archiver
! Version:        1.2
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Plexus Archiver Component
  License:        MIT and ASL 2.0
  Group:          Development/Java
! # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-archiver-1.2/ && tar cjf plexus-archiver-1.2.tar.bz2 plexus-archiver-1.2/
  URL:            http://plexus.codehaus.org/plexus-components/plexus-archiver/
  Source0:        plexus-archiver-%{namedversion}.tar.bz2
! Source1:        plexus-archiver-1.0-build.xml
! Source2:        plexus-archiver-1.0-project.xml
! Source3:        %{name}-jpp-depmap.xml
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! 
! BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.6
! BuildRequires:  ant >= 0:1.6
! BuildRequires:  plexus-container-default 
! BuildRequires:  plexus-utils 
! BuildRequires:  plexus-io
! BuildRequires: maven2
! BuildRequires: maven2-common-poms
! BuildRequires: maven-resources-plugin
! BuildRequires: maven-compiler-plugin
! BuildRequires: maven-jar-plugin
! BuildRequires: maven-install-plugin
! BuildRequires: maven-javadoc-plugin
! BuildRequires: maven-surefire-maven-plugin
! BuildRequires: maven-shared-reporting-impl
! 
! Requires:       plexus-container-default 
! Requires:       plexus-utils 
  Requires:       jpackage-utils
! Requires:       plexus-io
  
  %description
--- 27,68 ----
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
! %define reltag _alpha_12
! %define namedreltag -alpha-12
! %global namedversion %{version}%{?namedreltag}
  
  Name:           plexus-archiver
! Version:        1.0
! Release:        1%{?reltag}%{?dist}
  Epoch:          0
  Summary:        Plexus Archiver Component
  License:        MIT and ASL 2.0
  Group:          Development/Java
! # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-archiver-1.0-alpha-12/ && tar cjf plexus-archiver-1.0-alpha-12.tar.bz2 plexus-archiver-1.0-alpha-12/
  URL:            http://plexus.codehaus.org/plexus-components/plexus-archiver/
  Source0:        plexus-archiver-%{namedversion}.tar.bz2
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
  Requires:       jpackage-utils
! Requires:       plexus-container-default
! # XXX: 1.0-alpha-4
! Requires:       plexus-io >= 0:1.0
! Requires:       plexus-utils
! BuildRequires:  jpackage-utils >= 0:1.6
! BuildRequires:  plexus-container-default
! # XXX: 1.0-alpha-4
! BuildRequires:  plexus-io >= 0:1.0
! BuildRequires:  plexus-utils
! BuildRequires:  maven2
! BuildRequires:  maven2-common-poms
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-shared-reporting-impl
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 80,124 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
  Javadoc for %{name}.
  
- 
  %prep
  %setup -q -n plexus-archiver-%{namedversion}
  
- mkdir external_repo
- ln -s %{_javadir} external_repo/JPP
- 
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mvn-jpp \
          -e \
-         -Dmaven2.jpp.mode=true \
-         -Dmaven2.jpp.depmap.file=%{SOURCE3} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven.test.failure.ignore=true \
          install javadoc:javadoc
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -pm 644 target/%{name}-%{namedversion}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/plexus/archiver-%{version}.jar
! (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
!                   do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
!                   
! %add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/plexus archiver
  
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
  
  # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
  
  %clean
--- 78,113 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires:       jpackage-utils
  
  %description javadoc
  Javadoc for %{name}.
  
  %prep
  %setup -q -n plexus-archiver-%{namedversion}
  
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mvn-jpp \
          -e \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven.test.failure.ignore=true \
          install javadoc:javadoc
  
  %install
  rm -rf $RPM_BUILD_ROOT
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -pm 644 target/plexus-archiver-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/plexus-archiver-%{namedversion}.jar
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} `echo $jar | sed "s|-%{namedversion}||g"`; done)
  
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-plexus-archiver.pom
! %add_to_maven_depmap org.codehaus.plexus plexus-archiver %{namedversion} JPP plexus-archiver
  
  # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/plexus-archiver-%{namedversion}
! cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/plexus-archiver-%{namedversion}
! ln -s plexus-archiver-%{namedversion} $RPM_BUILD_ROOT%{_javadocdir}/plexus-archiver 
  
  %clean
***************
*** 132,148 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
! * Fri Sep 16 2011 David Walluck <dwalluck at redhat.com> 0:1.2-1
! - 1.2
  
  * Wed Sep 29 2010 Hui Wang <huwang at redhat.com> 0:1.0-0.4.a12.8
--- 121,139 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/plexus-archiver-%{namedversion}.jar
! %{_javadir}*/plexus-archiver.jar
! %{_datadir}/maven2/poms/JPP-plexus-archiver.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/plexus-archiver-%{namedversion}
! %{_javadocdir}/plexus-archiver
  
  %changelog
! * Fri Sep 16 2011 David Walluck <dwalluck at redhat.com> 0:1.0-1_alpha_12
! - 1.0-alpha-12
! - fix jar name and location
  
  * Wed Sep 29 2010 Hui Wang <huwang at redhat.com> 0:1.0-0.4.a12.8

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-archiver/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** sources	19 Sep 2011 09:41:30 -0000	1.4
--- sources	13 Oct 2011 22:47:15 -0000	1.5
***************
*** 1 ****
! a370918c3ada3229204c9ac5fe12b33d  plexus-archiver-1.2.tar.bz2
--- 1 ----
! 99fdb43e65fa5c47734910885c629ae7  plexus-archiver-1.0-alpha-12.tar.bz2

--- plexus-archiver-jpp-depmap.xml DELETED ---

--- plexus-archiver-1.0-build.xml DELETED ---

--- plexus-archiver-1.0-project.xml DELETED ---




More information about the JPackage-commits mailing list