[Jpackage-commits] dist/maven-install-plugin/devel .cvsignore, 1.2, 1.3 maven-install-plugin-jpp-depmap.xml, 1.1, NONE maven-install-plugin.spec, 1.1, 1.2 pom.patch, 1.1, NONE sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Thu Oct 13 18:59:23 CEST 2011


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

Modified Files:
	.cvsignore maven-install-plugin.spec sources 
Removed Files:
	maven-install-plugin-jpp-depmap.xml pom.patch 
Log Message:
- fix for JPP-6

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-install-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:54:37 -0000	1.2
--- .cvsignore	13 Oct 2011 16:59:21 -0000	1.3
***************
*** 1 ****
! maven-install-plugin-2.3.1.tar.bz2
--- 1 ----
! maven-install-plugin-2.3.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-install-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:54:37 -0000	1.2
--- sources	13 Oct 2011 16:59:21 -0000	1.3
***************
*** 1 ****
! 0650a524c0bcabc52f726429dbd81687  maven-install-plugin-2.3.1.tar.bz2
--- 1 ----
! 4fc1f81cb5aeee9fa112adc22df89e01  maven-install-plugin-2.3.tar.bz2

--- maven-install-plugin-jpp-depmap.xml DELETED ---

Index: maven-install-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-install-plugin/devel/maven-install-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-install-plugin.spec	12 Oct 2011 20:54:37 -0000	1.1
--- maven-install-plugin.spec	13 Oct 2011 16:59:21 -0000	1.2
***************
*** 1,5 ****
  Name:           maven-install-plugin
! Version:        2.3.1
! Release:        1%{?dist}
  Summary:        Maven Install Plugin
  
--- 1,5 ----
  Name:           maven-install-plugin
! Version:        2.3
! Release:        11%{?dist}
  Summary:        Maven Install Plugin
  
***************
*** 7,40 ****
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-install-plugin
! # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-install-plugin-2.3.1 && tar cjf maven-install-plugin-2.3.1.tar.bz2 maven-install-plugin-2.3.1/
  Source0:        %{name}-%{version}.tar.bz2
- #Remove this when maven-plugin-testing is ready
- Source1:        %{name}-jpp-depmap.xml
- Patch0:        pom.patch
- 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-compiler-plugin
- BuildRequires: maven-install-plugin
- BuildRequires: maven-jar-plugin
- BuildRequires: maven-javadoc-plugin
- BuildRequires: maven-resources-plugin
- BuildRequires: maven-surefire-maven-plugin
- BuildRequires: plexus-digest
- 
- Requires: maven2
- Requires: jpackage-utils
- Requires: java
- Requires: plexus-digest
- Requires(post):       jpackage-utils
- Requires(postun):     jpackage-utils
- 
- Provides:       maven2-plugin-install = %{version}-%{release}
  Obsoletes:      maven2-plugin-install <= 0:2.0.8
  
  %description
--- 7,40 ----
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-install-plugin
! # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-install-plugin-2.3 && tar cjf maven-install-plugin-2.3.tar.bz2 maven-install-plugin-2.3/
  Source0:        %{name}-%{version}.tar.bz2
  Obsoletes:      maven2-plugin-install <= 0:2.0.8
+ Provides:       maven2-plugin-install = %{epoch}:%{version}-%{release}
+ Requires(post): jpackage-utils
+ Requires(postun): jpackage-utils
+ Requires:       maven2
+ Requires:       jpackage-utils
+ Requires:       java
+ Requires:       plexus-digest >= 0:1.0
+ # XXX: 2.0.5 in 2.3.1
+ Requires:       plexus-utils >= 0:1.5.6
+ BuildRequires:  java-devel
+ BuildRequires:  maven2
+ BuildRequires:  maven2-common-poms
+ BuildRequires:  maven2-plugin-plugin
+ BuildRequires:  maven2-plugin-compiler
+ BuildRequires:  maven2-plugin-install
+ BuildRequires:  maven2-plugin-jar
+ BuildRequires:  maven2-plugin-javadoc
+ BuildRequires:  maven2-plugin-resources
+ # XXX: 1.2
+ BuildRequires:  maven-shared-plugin-testing-harness
+ BuildRequires:  maven-surefire-maven-plugin
+ BuildRequires:  maven-surefire-provider-junit
+ BuildRequires:  plexus-digest >= 0:1.0
+ # XXX: 2.0.5 in 2.3.1
+ BuildRequires:  plexus-utils >= 0:1.5.6
+ BuildArch:      noarch
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 50,67 ****
  
  %prep
! %setup -q -n %{name}-%{version}
! 
! #Add dependency of wagon-provider-api
! %patch0 -p0
  
  %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:javadoc
  
  %install
--- 50,59 ----
  
  %prep
! %setup -q
  
  %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} -Dmaven.test.failure.ignore install javadoc:aggregate
  
  %install
***************
*** 69,85 ****
  
  # jars
! install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}-%{version}.jar
! 
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
!     do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
! 
! %add_to_maven_depmap org.apache.maven.plugins maven-install-plugin %{version} JPP maven-install-plugin
  
  # poms
! install -Dpm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/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}
  
--- 61,74 ----
  
  # jars
! install -Dpm 644 target/maven-install-plugin-%{version}.jar %{buildroot}%{_javadir}/maven-install-plugin-%{version}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
  # poms
! install -Dpm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-maven-install-plugin.pom
! %add_to_maven_depmap org.apache.maven.plugins maven-install-plugin %{version} JPP maven-install-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}
  
***************
*** 94,110 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %changelog
! * Mon Sep 19 2011 David Walluck <dwalluck at redhat.com> 2.3.1-1
! - 2.3.1
  
  * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> - 2.3-10
--- 83,100 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/maven-install-plugin-%{version}.jar
! %{_javadir}*/maven-install-plugin.jar
! %{_datadir}/maven2/poms/JPP-maven-install-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-1
! - fix for JPP-6
  
  * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> - 2.3-10

--- pom.patch DELETED ---




More information about the JPackage-commits mailing list