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

David Walluck david at ryu.zarb.org
Thu Oct 13 21:50:35 CEST 2011


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

Modified Files:
	.cvsignore maven-resources-plugin.spec sources 
Log Message:
- 2.4.2

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-resources-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	11 Dec 2010 23:56:05 -0000	1.2
--- .cvsignore	13 Oct 2011 19:50:33 -0000	1.3
***************
*** 1 ****
! maven-resources-plugin-2.4.3.tar.gz
--- 1 ----
! maven-resources-plugin-2.4.2.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-resources-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	11 Dec 2010 23:56:05 -0000	1.2
--- sources	13 Oct 2011 19:50:33 -0000	1.3
***************
*** 1 ****
! a2e29f55c99c6148da77f3325b8b8b99  maven-resources-plugin-2.4.3.tar.gz
--- 1 ----
! c64f69a8e2a2f1258e1ebaadb3dc0559  maven-resources-plugin-2.4.2.tar.bz2

Index: maven-resources-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-resources-plugin/devel/maven-resources-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-resources-plugin.spec	11 Dec 2010 23:56:05 -0000	1.1
--- maven-resources-plugin.spec	13 Oct 2011 19:50:33 -0000	1.2
***************
*** 1,40 ****
  Name:           maven-resources-plugin
! Version:        2.4.3
  Release:        1%{?dist}
  Summary:        Maven Resources Plugin
! 
! Group:          Development/Libraries
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-resources-plugin
! #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.4.3 maven-resources-plugin-2.4.3
! # Exported revision 1043805.
! #tar zcf maven-resources-plugin-2.4.3.tar.gz maven-resources-plugin-2.4.3/
! Source0:        %{name}-%{version}.tar.gz
! Source1:        %{name}-jpp-depmap.xml
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! 
! BuildArch: noarch
! 
! BuildRequires: java-devel >= 1:1.6.0
! BuildRequires: maven2
! BuildRequires: maven2-common-poms 
! BuildRequires: maven2-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: maven-plugin-testing-harness
! 
! Requires: maven-plugin-testing-harness
! Requires: maven2
! Requires:       jpackage-utils
! Requires:       java
! Requires(post):       jpackage-utils
! Requires(postun):     jpackage-utils
! 
! Provides:       maven2-plugin-resources = %{version}-%{release}
  Obsoletes:      maven2-plugin-resources <= 0:2.0.8
  
  %description
--- 1,34 ----
  Name:           maven-resources-plugin
! Version:        2.4.2
  Release:        1%{?dist}
+ Epoch:          0
  Summary:        Maven Resources Plugin
! Group:          Development/Java
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-resources-plugin
! # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.4.2 && tar cjf maven-resources-plugin-2.4.2.tar.bz2 maven-resources-plugin-2.4.2
! Source0:        maven-resources-plugin-2.4.2.tar.bz2
  Obsoletes:      maven2-plugin-resources <= 0:2.0.8
+ Provides:       maven2-plugin-resources = %{epoch}:%{version}-%{release}
+ Requires(post): jpackage-utils
+ Requires(postun): jpackage-utils
+ Requires:       maven-shared-plugin-testing-harness
+ Requires:       maven2
+ Requires:       jpackage-utils
+ BuildRequires:  java-devel
+ BuildRequires:  jpackage-utils
+ 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
+ BuildRequires:  maven-surefire-maven-plugin
+ BuildRequires:  maven-surefire-provider-junit
+ BuildRequires:  maven-shared-plugin-testing-harness
+ BuildArch:      noarch
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 50,66 ****
  API documentation for %{name}.
  
- 
  %prep
! %setup -q -n %{name}-%{version}
  
  %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.failure.ignore=true \
!         install javadoc:javadoc
  
  %install
--- 44,56 ----
  API documentation for %{name}.
  
  %prep
! %setup -q
  
  %build
! export LC_ALL=en_US.UTF-8
! export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
! export MAVEN_OPTS="-Xms1g -Xmx1g -XX:MaxPermSize=128m -Xss1m -Dproject.build.sourceEncoding=UTF-8 -Dfile.encoding=UTF-8"
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy javadoc:javadoc
  
  %install
***************
*** 68,86 ****
  
  # 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-resources-plugin %{version} JPP maven-resources-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}
! rm -rf target/site/api*
  
  %post
--- 58,72 ----
  
  # jars
! install -Dpm 644 target/maven-resources-plugin-%{version}.jar %{buildroot}%{_javadir}/maven-resources-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-resources-plugin.pom
! %add_to_maven_depmap org.apache.maven.plugins maven-resources-plugin %{version} JPP maven-resources-plugin
  
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/maven-resources-plugin-%{version}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/maven-resources-plugin-%{version}/
! ln -s maven-resources-plugin-%{version} %{buildroot}%{_javadocdir}/maven-resources-plugin
  
  %post
***************
*** 94,110 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
! * Wed Dec 08 2010 David Walluck <dwalluck at redhat.com> 2.4.3-1
! - 2.4.3
  
  * Wed Dec 08 2010 David Walluck <dwalluck at redhat.com> 2.3-1
--- 80,97 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/maven-resources-plugin-%{version}.jar
! %{_javadir}*/maven-resources-plugin.jar
! %{_datadir}/maven2/poms/JPP-maven-resources-plugin.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/maven-resources-plugin-%{version}
! %{_javadocdir}/maven-resources-plugin
  
  %changelog
! * Wed Dec 08 2010 David Walluck <dwalluck at redhat.com> 2.4.2-1
! - 2.4.2
  
  * Wed Dec 08 2010 David Walluck <dwalluck at redhat.com> 2.3-1




More information about the JPackage-commits mailing list