[Jpackage-commits] dist/maven-clean-plugin/devel maven-clean-plugin.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Oct 13 18:36:03 CEST 2011


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

Modified Files:
	maven-clean-plugin.spec 
Log Message:
- fix for JPP-6

Index: maven-clean-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-clean-plugin/devel/maven-clean-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-clean-plugin.spec	12 Oct 2011 20:52:05 -0000	1.1
--- maven-clean-plugin.spec	13 Oct 2011 16:36:01 -0000	1.2
***************
*** 1,38 ****
  Name:           maven-clean-plugin
  Version:        2.4.1
! Release:        5%{?dist}
  Summary:        Maven Clean Plugin
- 
  Group:          Development/Libraries
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-clean-plugin/
! #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.4.1 maven-clean-plugin-2.4.1
! #tar jcf maven-clean-plugin-2.4.1.tar.bz2 maven-clean-plugin-2.4.1/
  Source0:        %{name}-%{version}.tar.bz2
  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: 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: maven-shared-plugin-testing-harness
! Requires: maven2
  Requires:       jpackage-utils
  Requires:       java
! Requires(post):       jpackage-utils
! Requires(postun):     jpackage-utils
! 
! 
! Provides:       maven2-plugin-clean = 1:%{version}-%{release}
! Obsoletes:      maven2-plugin-clean <= 0:2.0.8
  
  %description
--- 1,33 ----
  Name:           maven-clean-plugin
  Version:        2.4.1
! Release:        6%{?dist}
! Epoch:          0
  Summary:        Maven Clean Plugin
  Group:          Development/Libraries
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-clean-plugin/
! #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.4.1 maven-clean-plugin-2.4.1 && tar cjf maven-clean-plugin-2.4.1.tar.bz2 maven-clean-plugin-2.4.1/
  Source0:        %{name}-%{version}.tar.bz2
  Source1:        %{name}-jpp-depmap.xml
! Obsoletes:      maven2-plugin-clean <= 0:2.0.8
! Provides:       maven2-plugin-clean = %{epoch}:%{version}-%{release}
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       maven2
  Requires:       jpackage-utils
  Requires:       java
! 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
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 48,64 ****
  API documentation for %{name}.
  
- 
  %prep
  %setup -q 
  
  %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
--- 43,53 ----
  API documentation for %{name}.
  
  %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
***************
*** 66,84 ****
  
  # 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-clean-plugin %{version} JPP maven-clean-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
--- 55,70 ----
  
  # jars
! install -Dpm 644 target/maven-clean-plugin-%{version}.jar %{buildroot}%{_javadir}/maven-clean-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-clean-plugin.pom
! %add_to_maven_depmap org.apache.maven.plugins maven-clean-plugin %{version} JPP maven-clean-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}
  
  %post
***************
*** 92,106 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %changelog
  * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> - 2.4.1-5
  - Adjust BRs
--- 78,96 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/maven-clean-plugin-%{version}.jar
! %{_javadir}*/maven-clean-plugin.jar
! %{_datadir}/maven2/poms/JPP-maven-clean-plugin.pom
! %{_mavendepmapfragdir}/maven-clean-plugin
  
  %files javadoc
! %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %changelog
+ * Thu Oct 13 2011 David Walluck <dwalluck at redhat.com> 0:2.4.1-6
+ - fix for JPP-6
+ 
  * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> - 2.4.1-5
  - Adjust BRs




More information about the JPackage-commits mailing list