[Jpackage-commits] dist/maven-jar-plugin/devel .cvsignore, 1.2, 1.3 maven-jar-plugin.spec, 1.1, 1.2 sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Thu Oct 13 19:30:33 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-jar-plugin/devel
In directory ryu.zarb.org:/tmp/cvs-serv9730

Modified Files:
	.cvsignore maven-jar-plugin.spec sources 
Log Message:
- fix for JPP-6

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-jar-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	12 Oct 2011 20:55:49 -0000	1.2
--- .cvsignore	13 Oct 2011 17:30:31 -0000	1.3
***************
*** 1 ****
! maven-jar-plugin-2.4.tar.bz2
--- 1 ----
! maven-jar-plugin-2.3.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-jar-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	12 Oct 2011 20:55:49 -0000	1.2
--- sources	13 Oct 2011 17:30:31 -0000	1.3
***************
*** 1 ****
! 0455083751f66eb21eb77e7d018efdd9  maven-jar-plugin-2.4.tar.bz2
--- 1 ----
! f00cd96bd22b11c19c3d1153678e9bcf  maven-jar-plugin-2.3.tar.bz2

Index: maven-jar-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-jar-plugin/devel/maven-jar-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-jar-plugin.spec	12 Oct 2011 20:55:49 -0000	1.1
--- maven-jar-plugin.spec	13 Oct 2011 17:30:31 -0000	1.2
***************
*** 1,42 ****
  %global _mavenpomdir %{_datadir}/maven2/poms/
  Name:           maven-jar-plugin
! Version:        2.4
! Release:        1%{?dist}
  Summary:        Maven JAR Plugin
- 
  Group:          Development/Libraries
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-jar-plugin/
! # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-jar-plugin-2.4/ && tar cjf maven-jar-plugin-2.4.tar.bz2 maven-jar-plugin-2.4
! Source0:        maven-jar-plugin-2.4.tar.bz2
! Source1:        %{name}-jpp-depmap.xml
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! 
! BuildArch: noarch
! 
! BuildRequires: java-devel >= 1:1.6.0
! BuildRequires: maven2
! BuildRequires: maven2-common-poms
! BuildRequires: maven-plugin-plugin
! BuildRequires: maven-jar-plugin
! BuildRequires: maven-install-plugin
! BuildRequires: maven-resources-plugin
! BuildRequires: maven-compiler-plugin
! BuildRequires: maven-javadoc-plugin
! BuildRequires: maven-surefire-maven-plugin
! BuildRequires: maven-archiver
! BuildRequires: plexus-archiver
! BuildRequires: jakarta-commons-lang
! Requires: maven2
! Requires: plexus-archiver
! Requires: maven-archiver
! Requires: jakarta-commons-lang
! Requires:       jpackage-utils
! Requires:       java
! Requires(post):       jpackage-utils
! Requires(postun):     jpackage-utils
! 
! Provides:       maven2-plugin-jar = %{version}-%{release}
  Obsoletes:      maven2-plugin-jar <= 0:2.0.8
  
  %description
--- 1,52 ----
  %global _mavenpomdir %{_datadir}/maven2/poms/
+ 
  Name:           maven-jar-plugin
! Version:        2.3
! Release:        4%{?dist}
! Epoch:          0
  Summary:        Maven JAR Plugin
  Group:          Development/Libraries
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-jar-plugin/
! # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-jar-plugin-2.3/ && tar cjf maven-jar-plugin-2.3.tar.bz2 maven-jar-plugin-2.3
! Source0:        maven-jar-plugin-2.3.tar.bz2
  Obsoletes:      maven2-plugin-jar <= 0:2.0.8
+ Provides:       maven2-plugin-jar = %{epoch}:%{version}-%{release}
+ Requires(post): jpackage-utils
+ Requires(postun): package-utils
+ Requires:       maven2 >= 0:2.0.6
+ # XXX: 2.5
+ Requires:       maven-archiver
+ # XXX: 2.0.1
+ Requires:       plexus-archiver
+ # XXX: 3.0
+ Requires:       plexus-utils
+ # XXX: 2.5
+ Requires:       maven-archiver
+ Requires:       jakarta-commons-lang >= 0:2.1
+ Requires:       jpackage-utils
+ BuildRequires:  java-devel
+ BuildRequires:  maven2 >= 0:2.0.6
+ BuildRequires:  maven2-common-poms
+ BuildRequires:  maven2-plugin-plugin
+ BuildRequires:  maven2-plugin-jar
+ BuildRequires:  maven2-plugin-install
+ BuildRequires:  maven2-plugin-resources
+ BuildRequires:  maven2-plugin-compiler
+ BuildRequires:  maven2-plugin-javadoc
+ BuildRequires:  maven-surefire-maven-plugin
+ BuildRequires:  maven-surefire-provider-junit
+ # XXX: 2.5
+ BuildRequires:  maven-archiver
+ # XXX: 1.2
+ BuildRequires:  maven-shared-plugin-testing-harness
+ # XXX: 2.0.1
+ BuildRequires:  plexus-archiver
+ # XXX: 3.0
+ BuildRequires:  plexus-utils
+ BuildRequires:  jakarta-commons-lang >= 0:2.1
+ BuildRequires:  junit >= 0:3.8.2
+ BuildArch:      noarch
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 52,70 ****
  API documentation for %{name}.
  
- 
  %prep
  %setup -q 
  #let plexus-container-default be retrieved as a dependency
! sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
  
  %build
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mvn-jpp \
!         -e \
!         -Dmaven2.jpp.mode=true \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         -Dmaven.test.skip=true \
!         install javadoc:aggregate
  
  %install
--- 62,74 ----
  API documentation for %{name}.
  
  %prep
  %setup -q 
  #let plexus-container-default be retrieved as a dependency
! #sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
  
  %build
! export MAVEN_OPTS="-Dproject.build.sourceEncoding=UTF-8 -Dfile.encoding=UTF-8"
! export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} install javadoc:aggregate
  
  %install
***************
*** 73,91 ****
  # jars
  install -d -m 0755 %{buildroot}%{_javadir}
! install -p -m 644 target/maven-jar-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! 
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
!     do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
! 
! %add_to_maven_depmap org.apache.maven.plugins maven-jar-plugin %{version} JPP maven-jar-plugin
  
  # poms
  install -d -m 755 %{buildroot}%{_mavenpomdir}
! install -pm 644 pom.xml \
!     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
  
  # javadoc
  install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
  ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
--- 77,91 ----
  # jars
  install -d -m 0755 %{buildroot}%{_javadir}
! install -p -m 644 target/maven-jar-plugin-%{version}.jar %{buildroot}%{_javadir}/maven-jar-plugin-%{version}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
  # poms
  install -d -m 755 %{buildroot}%{_mavenpomdir}
! install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-maven-jar-plugin.pom
! %add_to_maven_depmap org.apache.maven.plugins maven-jar-plugin %{version} JPP maven-jar-plugin
  
  # javadoc
  install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
***************
*** 100,129 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_mavenpomdir}/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %changelog
! * Mon Sep 19 2011 David Walluck <dwalluck at redhat.com> 2.4-1
! - 2.4
! - skip tests
! 
! * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> 2.3.1-3
! - Adjust BRs
! 
! * Mon Sep 13 2010 Hui Wang <huwang at redhat.com> 2.3.1-2
! - Adjust BRs
! - Add depmap file
! 
! * Fri Sep 10 2010 Alexander Kurtakov <akurtako at redhat.com> 2.3.1-1
! - Update to 2.3.1.
! - Keep plexus-container-default on the dependency tree.
! - Drop depmap - not needed now.
  
  * Wed May 19 2010 Alexander Kurtakov <akurtako at redhat.com> 2.3-3
--- 100,117 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/maven-jar-plugin-%{version}.jar
! %{_javadir}*/maven-jar-plugin.jar
! %{_mavenpomdir}/JPP-maven-jar-plugin.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %changelog
! * Mon Sep 19 2011 David Walluck <dwalluck at redhat.com> 2.3-4
! - fix for JPP-6
  
  * Wed May 19 2010 Alexander Kurtakov <akurtako at redhat.com> 2.3-3




More information about the JPackage-commits mailing list