[Jpackage-commits] rpms/free/plexus-archiver plexus-archiver-1.0-build.xml, 1.3, 1.4 plexus-archiver-1.0-jpp-depmap.xml, 1.3, NONE plexus-archiver-1.0-project.xml, 1.1, 1.2 plexus-archiver-settings.xml, 1.2, NONE plexus-archiver.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Fri Feb 6 04:20:46 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/plexus-archiver
In directory ryu.zarb.org:/tmp/Pv3JYQaCgr/rpms/free/plexus-archiver

Modified Files:
	plexus-archiver-1.0-build.xml plexus-archiver.spec 
Added Files:
	plexus-archiver-1.0-project.xml 
Removed Files:
	plexus-archiver-1.0-jpp-depmap.xml 
	plexus-archiver-settings.xml 
Log Message:
1.0-0.2.a7.3.jpp6

--- plexus-archiver-settings.xml DELETED ---

Index: plexus-archiver-1.0-build.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-archiver/plexus-archiver-1.0-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** plexus-archiver-1.0-build.xml	1 Feb 2008 16:40:11 -0000	1.3
--- plexus-archiver-1.0-build.xml	6 Feb 2009 03:20:44 -0000	1.4
***************
*** 11,16 ****
    <property name="testreportdir" value="target/test-reports"></property>
    <property name="distdir" value="dist"></property>
!   <property name="javadocdir" value="target/site/apidocs"></property>
!   <property name="final.name" value="plexus-archiver-1.0-alpha-8"></property>
    <path id="build.classpath">
      <fileset dir="${libdir}">
--- 11,16 ----
    <property name="testreportdir" value="target/test-reports"></property>
    <property name="distdir" value="dist"></property>
!   <property name="javadocdir" value="target/docs/apidocs"></property>
!   <property name="final.name" value="plexus-archiver-1.0-alpha-3"></property>
    <path id="build.classpath">
      <fileset dir="${libdir}">
***************
*** 55,59 ****
    </target>
    <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
!     <echo message="There were test failures."></echo>
    </target>
    <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
--- 55,59 ----
    </target>
    <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
!     <fail message="There were test failures."></fail>
    </target>
    <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
***************
*** 104,108 ****
      </tstamp>
      <property name="copyright" value="Copyright &copy;  . All Rights Reserved."></property>
!     <property name="title" value="Plexus Archiver Component 1.0-alpha-8 API"></property>
      <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.archiver.*">
        <classpath>
--- 104,108 ----
      </tstamp>
      <property name="copyright" value="Copyright &copy;  . All Rights Reserved."></property>
!     <property name="title" value="Plexus Archiver Component 1.0-alpha-3 API"></property>
      <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.archiver.*">
        <classpath>

--- NEW FILE: plexus-archiver-1.0-project.xml ---
<project>
  <parent>
    <artifactId>plexus-components</artifactId>
    <groupId>org.codehaus.plexus</groupId>
    <version>1.1.4</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.codehaus.plexus</groupId>
  <artifactId>plexus-archiver</artifactId>
  <name>Plexus Archiver Component</name>
  <currentVersion>1.0-alpha-3</currentVersion>
  <package>org.codehaus.plexus.archiver</package>
  <build>
    <sourceDirectory>src/main/java</sourceDirectory>
    <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
    <resources>
      <resource>
        <directory>src/main/resources</directory>
        <includes>
          <include>**/*</include>
        </includes>
      </resource>
    </resources>
    <unitTest>
      <resources>
        <resource>
          <directory>src/test/resources</directory>
          <includes>
            <include>**/*</include>
          </includes>
        </resource>
      </resources>
      <includes>
        <include>**/*Test.java</include>
      </includes>
      <excludes>
        <exclude>**/Abstract*.java</exclude>
      </excludes>
    </unitTest>
  </build>
  <dependencies>
    <dependency>
      <groupId>JPP</groupId>
      <artifactId>plexus-container-default</artifactId>
      <jar>plexus_container-default.jar</jar>
      <version>1.0</version>
    </dependency>
    <dependency>
      <groupId>JPP</groupId>
      <artifactId>plexus-utils</artifactId>
      <jar>plexus_utils.jar</jar>
      <version>1.0</version>
    </dependency>
    <dependency>
      <groupId>JPP</groupId>
      <artifactId>classworlds</artifactId>
      <jar>classworlds.jar</jar>
      <version>1.1</version>
    </dependency>
    <dependency>
      <groupId>JPP</groupId>
      <artifactId>junit</artifactId>
      <jar>[junit].jar</jar>
      <version>3.8.1</version>
    </dependency>
  </dependencies>
</project>

--- plexus-archiver-1.0-jpp-depmap.xml DELETED ---

Index: plexus-archiver.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-archiver/plexus-archiver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** plexus-archiver.spec	1 Feb 2008 16:40:11 -0000	1.3
--- plexus-archiver.spec	6 Feb 2009 03:20:44 -0000	1.4
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
***************
*** 31,103 ****
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
! # If you don't want to build with maven, and use straight ant instead,
! # give rpmbuild option '--without maven'
! 
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
! 
! %define section     free
! 
! %define namedversion 1.0-alpha-8
! 
! %define parent plexus
! %define subname archiver
  
  Name:           plexus-archiver
  Version:        1.0
! Release:        0.a8.1jpp
  Epoch:          0
  Summary:        Plexus Archiver Component
! License:        Apache Software License 2.0
  Group:          Development/Java
- Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  URL:            http://plexus.codehaus.org/
! Source0:        %{name}-%{namedversion}.tar.gz
! # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-archiver-1.0-alpha-8/
  Source1:        plexus-archiver-1.0-build.xml
! Source2:        plexus-archiver-settings.xml
! Source3:        plexus-archiver-1.0-jpp-depmap.xml
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
! %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.4-10jpp
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-release
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-surefire
! %endif
! BuildRequires:  classworlds
! BuildRequires:  geronimo-servlet-2.4-api
! BuildRequires:  jakarta-slide-webdavclient
  BuildRequires:  plexus-container-default 
- BuildRequires:  plexus-io 
  BuildRequires:  plexus-utils 
  %if %{gcj_support}
! BuildRequires:    gnu-crypto
! BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
  %endif
  
- Requires:  classworlds
- Requires:  jakarta-slide-webdavclient
- Requires:  plexus-container-default 
- Requires:  plexus-utils 
- Requires:  plexus-io 
- Requires:  servlet_2_4_api
- Requires(post):    jpackage-utils >= 0:1.7.4
- Requires(postun):  jpackage-utils >= 0:1.7.4
- 
  %description
  The Plexus project seeks to create end-to-end developer tools for 
--- 31,71 ----
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
! %define namedversion 1.0-alpha-7
  
  Name:           plexus-archiver
  Version:        1.0
! Release:        0.2.a7.3%{?dist}
  Epoch:          0
  Summary:        Plexus Archiver Component
! License:        MIT and ASL 2.0
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
! Source0:        plexus-archiver-src.tar.gz
! # svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-archiver-%{namedversion} plexus-archiver
! # tar czvf plexus-archiver-src.tar.gz plexus-archiver
  Source1:        plexus-archiver-1.0-build.xml
! Source2:        plexus-archiver-1.0-project.xml
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.6
! BuildRequires:  ant >= 0:1.6
! BuildRequires:  classworlds >= 0:1.1
  BuildRequires:  plexus-container-default 
  BuildRequires:  plexus-utils 
+ Requires:       classworlds >= 0:1.1
+ Requires:       plexus-container-default 
+ Requires:       plexus-utils 
+ Requires:       jpackage-utils
+ 
  %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
  %endif
  
  %description
  The Plexus project seeks to create end-to-end developer tools for 
***************
*** 112,159 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
  Javadoc for %{name}.
  
  %prep
! %setup -q -n %{name}-%{namedversion}
  cp %{SOURCE1} build.xml
! cp %{SOURCE2} settings.xml
  
  %build
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
! sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
! sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
! sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
! sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
! 
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL
! 
! mkdir external_repo
! ln -s %{_javadir} external_repo/JPP
! 
! %if %{with_maven}
!     mvn-jpp \
!         -e \
!         -Dmaven.test.failure.ignore=true \
!         -s $(pwd)/settings.xml \
!         -Dmaven2.jpp.depmap.file=%{SOURCE3} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         install javadoc:javadoc
! 
! %else
! export CLASSPATH=$(build-classpath \
  classworlds \
  plexus/container-default \
- plexus/io \
  plexus/utils \
! )
! CLASSPATH=$CLASSPATH:target/classes:target/test-classes
! ant -Dbuild.sysclasspath=only jar javadoc
! %endif
  
  %install
--- 80,102 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
  Javadoc for %{name}.
  
+ 
  %prep
! %setup -q -n plexus-archiver
  cp %{SOURCE1} build.xml
! cp %{SOURCE2} project.xml
  
  %build
! mkdir -p target/lib
! build-jar-repository -s -p target/lib \
  classworlds \
  plexus/container-default \
  plexus/utils \
! 
! ant jar javadoc
! 
  
  %install
***************
*** 161,182 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -pm 644 target/%{name}-%{namedversion}.jar \
    $RPM_BUILD_ROOT%{_javadir}/plexus/archiver-%{version}.jar
! %add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
! 
! (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
! 
! # poms
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
! 
  # 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} # ghost symlink
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 104,117 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -pm 644 target/%{name}-%{version}-alpha-3.jar \
    $RPM_BUILD_ROOT%{_javadir}/plexus/archiver-%{version}.jar
! (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
!                   do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 185,200 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
- %post
- %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 120,125 ----
  rm -rf $RPM_BUILD_ROOT
  
  %if %{gcj_support}
+ %post
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 203,209 ****
  %endif
  
- %postun
- %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 128,133 ----
  %endif
  
  %if %{gcj_support}
+ %postun
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 214,223 ****
  %files
  %defattr(-,root,root,-)
! %{_javadir}/%{parent}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.*
  %endif
  
--- 138,146 ----
  %files
  %defattr(-,root,root,-)
! %{_javadir}/*
! 
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/archiver-1.0.jar.*
  %endif
  
***************
*** 225,240 ****
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
! * Fri Feb 01 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a8.1jpp
! - 1.0-alpha-8
  
! * Fri Nov 30 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a7.1jpp
! - 1.0-alpha-7
  
! * Sat Mar 24 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a6.2jpp
! - Build with maven2 by default
! - Add gcj_support option
  
  * Mon Jun 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a6.1jpp
--- 148,174 ----
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
! * Fri Feb 06 2009 Yong Yang <yyang at redhat.com> - 0:1.0-0.a7.3
! - Fix release tag
  
! * Thu Jan 15 2009 Yong Yang <yyang at redhat.com> - 0:1.0-0.a7.2jpp.1
! - Imported from dbhole's maven 2.0.8 packages, initial building
  
! * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.0-0.2.a7.1.2
! - drop repotag
! - fix license tag
! 
! * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.0-0.2.a7.1jpp.1
! - Autorebuild for GCC 4.3
! 
! * Fri Jan 04 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a7.1jpp.1
! - Update to alpha 7
! 
! * Thu Feb 15 2007 Matt Wrigne <mwringe at redhat.com> - 0:1.0-0.1.a6.1jpp.1
! - Fix rpmlint issues
! - Version package to new jpp versioning standards
! - Remove javadoc post and postun sections
  
  * Mon Jun 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a6.1jpp




More information about the JPackage-commits mailing list