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

David Walluck david at ryu.zarb.org
Fri Oct 14 22:12:28 CEST 2011


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

Modified Files:
	.cvsignore maven-assembly-plugin.spec sources 
Removed Files:
	maven-assembly-plugin-jpp-depmap.xml 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-assembly-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:50:54 -0000	1.2
--- .cvsignore	14 Oct 2011 20:12:26 -0000	1.3
***************
*** 1 ****
! maven-assembly-plugin-2.2.1.tar.bz2
--- 1 ----
! maven-assembly-plugin-2.2-beta-5.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-assembly-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:50:54 -0000	1.2
--- sources	14 Oct 2011 20:12:26 -0000	1.3
***************
*** 1 ****
! 837c879d7162dbd1e0252a44e043d1e4  maven-assembly-plugin-2.2.1.tar.bz2
--- 1 ----
! 35f496b7162a31a20f2d22623382ca97  maven-assembly-plugin-2.2-beta-5.tar.bz2

Index: maven-assembly-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-assembly-plugin/devel/maven-assembly-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-assembly-plugin.spec	12 Oct 2011 20:50:54 -0000	1.1
--- maven-assembly-plugin.spec	14 Oct 2011 20:12:26 -0000	1.2
***************
*** 1,76 ****
! %global project_version %{version}
  
  Name:           maven-assembly-plugin
! Version:        2.2.1
! Release:        1%{?dist}
  Summary:        Maven Assembly Plugin
! 
! Group:          Development/Libraries
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-assembly-plugin/
! # svn export -r 1171819 http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.2.1 && tar cjf maven-assembly-plugin-2.2.1.tar.bz2 maven-assembly-plugin-2.2.1
! Source0:        %{name}-%{project_version}.tar.bz2
! Source1:        %{name}-jpp-depmap.xml
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! 
! BuildArch: noarch
! 
! Obsoletes: maven2-plugin-assembly <= 0:2.0.8
! Provides:  maven2-plugin-assembly = 1:%{version}-%{release}
! 
! BuildRequires:  java-devel >= 1:1.6.0
! BuildRequires:  ant, ant-nodeps
! 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-filtering
! 
! BuildRequires: plexus-container-default
! BuildRequires: plexus-utils
! BuildRequires: plexus-active-collections
! BuildRequires: plexus-maven-plugin
! BuildRequires: plexus-io
! BuildRequires: plexus-interpolation
! BuildRequires: plexus-archiver >= 0:1.1
! 
! BuildRequires: maven-shared-file-management
! BuildRequires: maven-shared-repository-builder
! BuildRequires: maven-shared-filtering
! 
! BuildRequires: easymock
! BuildRequires: jdom
! BuildRequires: jaxen
! # FIXME: should be in the Requires for jaxen
! BuildRequires: xom
! BuildRequires: saxpath
! BuildRequires: junit
! BuildRequires: easymock-classextension2
! 
! Requires: java >= 1:1.6.0
! Requires: easymock
! Requires: jdom
! Requires: jaxen
! # FIXME: should be in the Requires for jaxen
! Requires: xom
! Requires: saxpath
! Requires: plexus-container-default
! Requires: plexus-utils
! Requires: plexus-active-collections
! Requires: plexus-maven-plugin
! Requires: plexus-io
! Requires: plexus-interpolation
! Requires: plexus-archiver >= 0:1.1
! Requires: maven-shared-repository-builder
! Requires: maven-shared-filtering
! 
! Requires:          jpackage-utils
! Requires(post):    jpackage-utils
! Requires(postun):  jpackage-utils
  
  %description
--- 1,82 ----
! %define reltag _beta_5
! %define namedreltag -beta-5
! %global namedversion %{version}%{?namedreltag}
  
  Name:           maven-assembly-plugin
! Version:        2.2
! Release:        1%{?dist}%{?reltag}
! Epoch:          0
  Summary:        Maven Assembly Plugin
! Group:          Development/Java
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-assembly-plugin/
! # svn export -r 1171819 http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.2-beta-5 && tar cjf maven-assembly-plugin-2.2-beta-5.tar.bz2 maven-assembly-plugin-2.2-beta-5
! Source0:        %{name}-%{namedversion}.tar.bz2
! Obsoletes:      maven2-plugin-assembly <= 0:2.0.8
! Provides:       maven2-plugin-assembly = %{epoch}:%{version}-%{release}
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       maven-archiver >= 0:2.4
! Requires:       maven2 >= 0:2.0.4
! Requires:       maven-shared-file-management >= 0:1.1
! Requires:       maven-shared-common-artifact-filters >= 0:1.1
! # XXX: 1.0-beta-2
! Requires:       maven-shared-filtering >= 0:1.0
! # XXX: 1.0-alpha-2
! Requires:       maven-shared-repository-builder >= 0:1.0
! Requires:       maven-shared-io >= 0:1.1
! # XXX: 1.0-beta-2
! Requires:       plexus-active-collections >= 0:1.0
! # XXX: 1.0-alpha-12
! Requires:       plexus-archiver >= 0:1.0
! # XXX: 1.0-alpha-9-stable-1
! Requires:       plexus-container-default >= 0:1.0
! Requires:       plexus-interpolation >= 0:1.7
! # XXX: 2.0.1
! Requires:       plexus-utils >= 0:1.5.15
! BuildRequires:  easymock-classextension >= 0:1.2
! # XXX: 1.0-FCS
! BuildRequires:  jaxen >= 0:1.0
! BuildRequires:  jdom >= 0:1.0
! BuildRequires:  junit >= 0:3.8.1
! BuildRequires:  maven-archiver >= 0:2.4
! BuildRequires:  maven2 >= 0:2.0.4
! BuildRequires:  maven-shared-file-management >= 0:1.1
! BuildRequires:  maven-shared-common-artifact-filters >= 0:1.1
! # XXX: 1.0-beta-2
! BuildRequires:  maven-shared-filtering >= 0:1.0
! # XXX: 1.0-alpha-1
! BuildRequires:  maven-shared-plugin-testing-tools >= 0:1.0
! # XXX: 1.0-alpha-2
! BuildRequires:  maven-shared-repository-builder >= 0:1.0
! BuildRequires:  maven-shared-io >= 0:1.1
! # XXX: 1.0-alpha-1
! BuildRequires:  maven-shared-test-tools >= 0:1.0
! # XXX: 1.0-beta-2
! BuildRequires:  plexus-active-collections >= 0:1.0
! # XXX: 1.0-alpha-12
! BuildRequires:  plexus-archiver >= 0:1.0
! # XXX: 1.0-alpha-9-stable-1
! BuildRequires:  plexus-container-default >= 0:1.0
! BuildRequires:  plexus-interpolation >= 0:1.7
! # XXX: 2.0.1
! BuildRequires:  plexus-utils >= 0:1.5.15
! # XXX: 1.0-FCS
! BuildRequires:  saxpath >= 0:1.0
! BuildRequires:  modello-maven-plugin >= 0:1.0
! BuildRequires:  plexus-maven-plugin >= 0:1.3.8
! BuildRequires:  java-devel
! BuildRequires:  jpackage-utils
  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
***************
*** 81,95 ****
  Group:          Documentation
  Summary:        Javadoc for %{name}
! Requires:          jpackage-utils >= 0:1.7.2
  
  %description javadoc
  API documentation for %{name}.
  
- 
  %prep
! %setup -q -n %{name}-%{project_version}
  mkdir -p target/classes/
  cp -pr src/main/resources/META-INF/ target/classes/
  
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
--- 87,103 ----
  Group:          Documentation
  Summary:        Javadoc for %{name}
! Requires:       jpackage-utils
  
  %description javadoc
  API documentation for %{name}.
  
  %prep
! %setup -q -n maven-assembly-plugin-%{namedversion}
! 
  mkdir -p target/classes/
  cp -pr src/main/resources/META-INF/ target/classes/
  
+ perl -pi -e 's|<maven>.*</maven>|<maven>2.0.8</maven>|;' pom.xml
+ 
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
***************
*** 98,103 ****
          -Dmaven2.jpp.mode=true \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-         -Dmaven.test.skip=true \
          install javadoc:javadoc
  
--- 106,109 ----
***************
*** 106,123 ****
  
  # jars
! install -Dpm 644 target/%{name}-%{project_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-assembly-plugin %{version} JPP maven-assembly-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}
  
  %post
--- 112,126 ----
  
  # jars
! install -Dpm 644 target/maven-assembly-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/maven-assembly-plugin-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} `echo $jar| sed "s|-%{namedversion}||g"`; done)
  
  # poms
! install -Dpm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-maven-assembly-plugin.pom
! %add_to_maven_depmap org.apache.maven.plugins maven-assembly-plugin %{namedversion} JPP maven-assembly-plugin
  
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/maven-assembly-plugin-%{namedversion}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/maven-assembly-plugin-%{namedversion}
! ln -s maven-assembly-plugin-%{namedversion} %{buildroot}%{_javadocdir}/maven-assembly-plugin
  
  %post
***************
*** 131,148 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
! * Fri Sep 16 2011 David Walluck <dwalluck at redhat.com> 2.2.1-1
! - 2.2.1
! - (Build)Requires: plexus-archiver >= 0:1.1
  
  * Tue Sep 28 2010 Hui Wang <huwnag at redhat.com> - 2.2-0.7.beta5
--- 134,151 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/maven-assembly-plugin-%{namedversion}.jar
! %{_javadir}*/maven-assembly-plugin.jar
! %{_datadir}/maven2/poms/JPP-maven-assembly-plugin
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/maven-assembly-plugin-%{namedversion}
! %{_javadocdir}/maven-assembly-plugin
  
  %changelog
! * Fri Sep 16 2011 David Walluck <dwalluck at redhat.com> 2.2-1_beta_5
! - fix for JPackage
  
  * Tue Sep 28 2010 Hui Wang <huwnag at redhat.com> - 2.2-0.7.beta5

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




More information about the JPackage-commits mailing list