[Jpackage-commits] dist/maven-archiver/devel .cvsignore, 1.4, 1.5 maven-archiver-depmap.xml, 1.1, NONE maven-archiver.spec, 1.5, 1.6 sources, 1.4, 1.5

David Walluck david at ryu.zarb.org
Wed Oct 12 20:16:08 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-archiver/devel
In directory ryu.zarb.org:/tmp/cvs-serv20986

Modified Files:
	.cvsignore maven-archiver.spec sources 
Removed Files:
	maven-archiver-depmap.xml 
Log Message:
- 2.4.2

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-archiver/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** .cvsignore	11 Oct 2011 21:12:48 -0000	1.4
--- .cvsignore	12 Oct 2011 18:16:06 -0000	1.5
***************
*** 1 ****
! maven-archiver-2.4.1-src.tar.bz2
--- 1 ----
! maven-archiver-2.4.2.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-archiver/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** sources	11 Oct 2011 21:12:49 -0000	1.4
--- sources	12 Oct 2011 18:16:06 -0000	1.5
***************
*** 1 ****
! ca5f465ea46cd4d0deb8b2f5f123734b  maven-archiver-2.4.1-src.tar.bz2
--- 1 ----
! b2a66eae39ba123fdc15f41b8bb9bf8b  maven-archiver-2.4.2.tar.bz2

--- maven-archiver-depmap.xml DELETED ---

Index: maven-archiver.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-archiver/devel/maven-archiver.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** maven-archiver.spec	11 Oct 2011 21:12:49 -0000	1.5
--- maven-archiver.spec	12 Oct 2011 18:16:06 -0000	1.6
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 27,72 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
  
  Name:           maven-archiver
! Version:        2.4.1
! Release:        5%{?dist}
  Epoch:          0
  Summary:        Maven Archiver
  License:        ASL 2.0
! Group:          Development/Libraries
! URL:            http://maven.apache.org/
! 
! # svn export https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.4.1 maven-archiver
! # tar jcf maven-archiver-2.4.1-src.tar.bz2 maven-archiver/
! Source0:        %{name}-%{version}-src.tar.bz2
! Source1:        %{name}-depmap.xml
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! 
! BuildArch:      noarch
! 
! BuildRequires:  java-devel >= 1:1.6.0
  BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-common-poms
! 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-interpolation
  BuildRequires:  plexus-archiver >= 1.0-0.1.a7
  BuildRequires:  plexus-utils
! 
! Requires:       maven2 >= 0:2.0.4-9
! Requires:       plexus-archiver >= 1.0-0.1.a7
! Requires:       plexus-interpolation
! Requires:       plexus-utils
! 
! Requires(post):   jpackage-utils >= 0:1.7.2
! Requires(postun): jpackage-utils >= 0:1.7.2
! Provides: maven-shared-archiver = %{version}-%{release}
! Obsoletes: maven-shared-archiver < %{version}-%{release}
  
  %description
--- 27,64 ----
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  Name:           maven-archiver
! Version:        2.4.2
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Maven Archiver
  License:        ASL 2.0
! Group:          Development/Java
! URL:            http://maven.apache.org/shared/maven-archiver/
! # svn export -r 1182500 https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.4.2 && tar cjf maven-archiver-2.4.2.tar.bz2 maven-archiver-2.4.2
! Source0:        maven-archiver-2.4.2.tar.bz2
! Obsoletes:      maven-shared-archiver < %{epoch}:%{version}-%{release}
! Provides:       maven-shared-archiver = %{epoch}:%{version}-%{release}
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       maven2 >= 0:2.0.4-9
! Requires:       plexus-archiver >= 1.0-0.1.a7
! Requires:       plexus-interpolation
! Requires:       plexus-utils
! BuildRequires:  java-devel
  BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  maven2 >= 0:2.0.8
  BuildRequires:  maven2-common-poms
! 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:  plexus-interpolation
  BuildRequires:  plexus-archiver >= 1.0-0.1.a7
  BuildRequires:  plexus-utils
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 83,137 ****
  
  %prep
! %setup -q -n %{name}
  
  %build
! 
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL
! 
! mvn-jpp \
!     -e \
!     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!     -Dmaven.test.failure.ignore=true \
!     -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!     -Dmaven.test.skip=true \
!     install javadoc:javadoc
! 
  
  %install
! rm -rf $RPM_BUILD_ROOT
! # jars/poms
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  
! # Copy file and create unversioned symlink
! install -pm 644 target/%{name}-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
! # Copy pom
! install -pm 644 pom.xml \
!   $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-archiver.pom
! %add_to_maven_depmap org.apache.maven maven-archiver %{version} JPP maven-archiver
  
  # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2/poms/JPP-maven-archiver.pom
  %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/*
  
  %changelog
  * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> 0:2.4.1-5
  - Adjust BRs
--- 75,124 ----
  
  %prep
! %setup -q
  
  %build
! export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
! export MAVEN_OPTS="-Xms1g -Xmx1g"
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} -Dmaven.test.failure.ignore=true deploy javadoc:aggregate
  
  %install
! %{__rm} -rf %{buildroot}
  
! # jar
! %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
  
! # pom
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -p pom.xml %{buildroot}/%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap org.apache.maven maven-archiver %{version} JPP %{name}
  
  # javadoc
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %clean
! %{__rm} -rf %{buildroot}
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}-%{version}.jar
! %{_javadir}*/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
  %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Wed Oct 12 2011 David Walluck <dwalluck at redhat.com> 0:2.4.2-1
+ - 2.4.2
+ - update URL
+ 
  * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> 0:2.4.1-5
  - Adjust BRs




More information about the JPackage-commits mailing list