[Jpackage-commits] rpms/free/velocity-tools velocity-tools-1.1-docs.patch, 1.2, NONE velocity-tools-jpp-depmap.xml, 1.1, 1.2 velocity-tools-settings.xml, 1.1, 1.2 velocity-tools-site.xml, 1.1, 1.2 velocity-tools.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Sun Dec 26 10:08:06 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/velocity-tools
In directory ryu.zarb.org:/tmp/_KjawkZ9N6/rpms/free/velocity-tools

Modified Files:
	velocity-tools.spec 
Added Files:
	velocity-tools-jpp-depmap.xml velocity-tools-settings.xml 
	velocity-tools-site.xml 
Removed Files:
	velocity-tools-1.1-docs.patch 
Log Message:
1.4-1.jpp6

--- NEW FILE: velocity-tools-site.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
 regarding copyright ownership.  The ASF licenses this file
 to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at

   http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on an
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.    
-->

<project name="Apache Velocity Tools">
  <publishDate position="bottom" format="yyyy-MM-dd HH:mm:ss"/>
  <bannerLeft>
    <name>Apache Velocity Project</name>
    <src>/images/velocity_project_wide.png</src>
    <href>http://velocity.apache.org/</href>
  </bannerLeft>

  <bannerRight>
    <name>Apache Velocity Tools</name>
    <src>/images/dvsl.png</src>
  </bannerRight>

  <poweredBy>
    <logo name="Apache Velocity" 
          href="http://velocity.apache.org/"
          img="/images/pbv90x30.png" />
    <logo name="Velocity News Feed" 
          href="http://velocity.apache.org/rss/news.rss"
          img="/images/feed-icon-24x24.jpg" />
  </poweredBy>

  <skin>
    <groupId>org.apache.maven</groupId>
    <artifactId>maven-default-skin</artifactId>
    <version>1.0</version>
  </skin>

  <body>
    <breadcrumbs>
      <item name="Apache" href="http://www.apache.org/"/>
      <item name="Velocity" href="http://velocity.apache.org/"/>
      <item name="Tools"/>
    </breadcrumbs>

    <links>
      <item name="Engine" href="http://velocity.apache.org/engine/devel/"/>
      <item name="Tools" href="http://velocity.apache.org/tools/devel/"/>
      <item name="Anakia" href="http://velocity.apache.org/anakia/devel/"/>
      <item name="Texen" href="http://velocity.apache.org/texen/devel/"/>
      <item name="DocBook" href="http://velocity.apache.org/docbook/"/>
      <item name="DVSL" href="http://velocity.apache.org/dvsl/devel/"/>
    </links>

    <menu name="Community">
        <item name="Wiki"                     href="http://wiki.apache.org/velocity/"/>
        <item name="Get Involved"             href="http://wiki.apache.org/velocity/GetInvolved"/>
        <item name="Mailing Lists"            href="http://velocity.apache.org/contact.html"/>
    </menu>

    <menu name="Velocity Development">
        <item name="Coding Standards"         href="http://wiki.apache.org/velocity/CodeStandards"/>
        <item name="Documentation Guidelines" href="http://wiki.apache.org/velocity/DocumentationGuidelines"/>
        <item name="Issues"                   href="https://issues.apache.org/jira/browse/DVSL"/>
        <item name="Who we are"               href="http://velocity.apache.org/who-we-are.html"/>
    </menu>

    <menu ref="reports" />

  </body>
</project>

--- velocity-tools-1.1-docs.patch DELETED ---

--- NEW FILE: velocity-tools-jpp-depmap.xml ---
<dependencies>
    <dependency>
        <maven>
            <groupId>commons-digester</groupId>
            <artifactId>commons-digester</artifactId>
            <version>1.8</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>commons-digester</artifactId>
            <version>1.7</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>struts</groupId>
            <artifactId>struts</artifactId>
            <version>1.2.9</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>struts</artifactId>
            <version>1.2.9</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>sslext</groupId>
            <artifactId>sslext</artifactId>
            <version>1.2-0</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>sslext</artifactId>
            <version>1.2-0</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>commons-beanutils</groupId>
            <artifactId>commons-beanutils</artifactId>
            <version>1.7.0</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>commons-beanutils</artifactId>
            <version>1.7.0</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>commons-collections</groupId>
            <artifactId>commons-collections</artifactId>
            <version>3.2</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>commons-collections</artifactId>
            <version>3.2</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>commons-digester</groupId>
            <artifactId>commons-digester</artifactId>
            <version>1.8</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>commons-digester</artifactId>
            <version>1.8</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>commons-lang</groupId>
            <artifactId>commons-lang</artifactId>
            <version>2.3</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>commons-lang</artifactId>
            <version>2.3</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>commons-logging</groupId>
            <artifactId>commons-logging</artifactId>
            <version>1.1</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>commons-logging</artifactId>
            <version>1.1</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>commons-validator</groupId>
            <artifactId>commons-validator</artifactId>
            <version>1.3.1</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>commons-validator</artifactId>
            <version>1.1.4</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
          <groupId>javax.servlet</groupId>
          <artifactId>servlet-api</artifactId>
          <version>2.3</version>
        </maven>
        <jpp>
          <groupId>JPP</groupId>
          <artifactId>servletapi4</artifactId>
          <version>2.3</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
          <groupId>oro</groupId>
          <artifactId>oro</artifactId>
          <version>2.0.8</version>
        </maven>
        <jpp>
          <groupId>JPP</groupId>
          <artifactId>oro</artifactId>
          <version>2.0.8</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>velocity</groupId>
            <artifactId>velocity</artifactId>
            <version>1.4</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>velocity</artifactId>
            <version>1.5</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
          <groupId>org.apache.maven</groupId>
          <artifactId>maven-default-skin</artifactId>
          <version>1.0</version>
        </maven>
        <jpp>
          <groupId>JPP/maven2</groupId>
          <artifactId>default-skin</artifactId>
          <version>1.0</version>
        </jpp>
    </dependency>

</dependencies>

Index: velocity-tools.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/velocity-tools/velocity-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** velocity-tools.spec	4 Nov 2005 21:27:58 -0000	1.3
--- velocity-tools.spec	26 Dec 2010 09:08:04 -0000	1.4
***************
*** 1,49 ****
  
! %define name            velocity-tools
! %define version         1.1
! %define release         4jpp
! %define section		free
  
! Name:           %{name}
! Version:        %{version}
! Release:        %{release}
  Epoch:          0
! Summary:        Java-based template engine
  License:        Apache Software License
! Source:         http://www.apache.org/dist/jakarta/velocity-tools/source/velocity-tools-1.1-src.tar.gz
! URL:            http://jakarta.apache.org/velocity/tools/
  Group:          Development/Libraries/Java
! Patch0:		velocity-tools-1.1-docs.patch
! BuildRequires:  ant
! BuildRequires:  jakarta-commons-beanutils
! BuildRequires:  jakarta-commons-collections
! BuildRequires:  jakarta-commons-digester
! BuildRequires:  jakarta-commons-logging
! BuildRequires:  jakarta-commons-validator
  BuildRequires:  dom4j
! BuildRequires:	jaxen >= 0:1.1
! BuildRequires:  jpackage-utils >= 0:1.5
! BuildRequires:  servletapi4
! BuildRequires:	struts11
! BuildRequires:	velocity
! BuildRequires:	velocity-dvsl
! BuildRequires:	xerces-j2
! Requires:  jakarta-commons-beanutils
! Requires:  jakarta-commons-collections
! Requires:  jakarta-commons-digester
! Requires:  jakarta-commons-logging
! Requires:  jakarta-commons-validator
  Requires:  dom4j
  Requires:  jaxen >= 0:1.1
! Requires:  jpackage-utils >= 0:1.5
! Requires:  servletapi4
! Requires:  struts11
  Requires:  velocity
  Requires:  velocity-dvsl
! Requires:  xerces-j2
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
! Vendor:         JPackage Project
! Distribution:   JPackage
  
  %description
--- 1,120 ----
+ # Copyright (c) 2000-2010, JPackage Project
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions
+ # are met:
+ #
+ # 1. Redistributions of source code must retain the above copyright
+ #    notice, this list of conditions and the following disclaimer.
+ # 2. Redistributions in binary form must reproduce the above copyright
+ #    notice, this list of conditions and the following disclaimer in the
+ #    documentation and/or other materials provided with the
+ #    distribution.
+ # 3. Neither the name of the JPackage Project nor the names of its
+ #    contributors may be used to endorse or promote products derived
+ #    from this software without specific prior written permission.
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #
  
! %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
! 
! Name:           velocity-tools
! Version:        1.4
! Release:        1%{?dist}
  Epoch:          0
! Summary:        Velocity application building tools
  License:        Apache Software License
! URL:            http://velocity.apache.org/tools/releases/1.4/
  Group:          Development/Libraries/Java
! Source0:         http://apache.speedbone.de/velocity/tools/1.4/velocity-tools-1.4-src.tar.gz
! Source1:        %{name}-settings.xml
! Source2:        %{name}-jpp-depmap.xml
! Source3:        sslext-1.2-0.jar
! Source4:        %{name}-site.xml
! 
! 
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
! BuildRequires:  apache-commons-beanutils
! BuildRequires:  apache-commons-collections
! BuildRequires:  apache-commons-digester
! BuildRequires:  apache-commons-lang
! BuildRequires:  apache-commons-logging
! BuildRequires:  apache-commons-validator
  BuildRequires:  dom4j
! BuildRequires:  jaxen >= 0:1.1
! BuildRequires:  servlet_2_3_api
! BuildRequires:  struts >= 0:1.3.8
! BuildRequires:  struts-taglib >= 0:1.3.8
! BuildRequires:  struts-tiles >= 0:1.3.8
! # FIXME
! #BuildRequires:  struts-sslext >= 0:1.2
! BuildRequires:  velocity >= 0:1.4
! BuildRequires:  velocity-dvsl
! BuildRequires:  oro >= 0:2.0.8
! %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.8
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-project-info-reports
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-site
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  mojo-maven2-plugin-taglist
! BuildRequires:  maven2-default-skin
! BuildRequires:  apache-commons-parent
! BuildRequires:  liberation-fonts
! %endif
! 
! Requires:  java >= 0:1.6.0
! Requires:  apache-commons-beanutils
! Requires:  apache-commons-collections
! Requires:  apache-commons-digester
! Requires:  apache-commons-lang
! Requires:  apache-commons-logging
! Requires:  apache-commons-validator
  Requires:  dom4j
  Requires:  jaxen >= 0:1.1
! Requires:  servlet_2_3_api
! Requires:  struts >= 0:1.3.8
! Requires:  struts-taglib >= 0:1.3.8
! Requires:  struts-tiles >= 0:1.3.8
  Requires:  velocity
  Requires:  velocity-dvsl
! Requires:  oro
! %if ! %{gcj_support}
  BuildArch:      noarch
+ %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
! %if %{gcj_support}
! BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
! %endif
  
  %description
***************
*** 66,112 ****
  Javadoc for %{name}.
  
! #%package        demo
! #Summary:        Demo for %{name}
! #Group:          Development/Libraries/Java
! #Requires:       %{name} = %{epoch}:%{version}-%{release}
! 
! #%description    demo
! #Demonstrations and samples for %{name}.
  
! # -----------------------------------------------------------------------------
  
  %prep
! %setup -q -c -n %{name}-%{version}
  # Remove all binary libs used in compiling the package.
! # Note that velocity has some jar files containing macros under
! # examples and test that should not be removed.
! find lib -name "*.jar" -and -not -name sslext.jar -print | xargs rm -f
  
- %patch0 -p1
  
! # -----------------------------------------------------------------------------
  
  %build
! cat > build.properties <<EOBP
  
! commons-beanutils.jar=$(build-classpath commons-beanutils)
! commons-collections.jar=$(build-classpath commons-collections)
! commons-digester.jar=$(build-classpath commons-digester)
! commons-logging.jar=$(build-classpath commons-logging)
! commons-validator.jar=$(build-classpath commons-validator)
! dom4j.jar=$(build-classpath dom4j)
! jaxen.jar=$(build-classpath jaxen)
! saxpath.jar=$(build-classpath jaxen)
! servlet.jar=$(build-classpath servletapi4)
! struts.jar=$(build-classpath struts-1.1)
! sslext.jar=lib/sslext.jar
! velocity.jar=$(build-classpath velocity)
! velocity-dvsl.jar=$(build-classpath velocity-dvsl)
! xerces.jar=$(build-classpath xerces-j2)
! EOBP
  
! ant jar.struts jar.view jar.generic javadoc docs
  
! # -----------------------------------------------------------------------------
  
  %install
--- 137,208 ----
  Javadoc for %{name}.
  
! %package        demo
! Summary:        Demo for %{name}
! Group:          Development/Libraries/Java
! Requires:       %{name} = %{epoch}:%{version}-%{release}
  
! %description    demo
! Demonstrations and samples for %{name}.
  
  %prep
! %setup -q -n %{name}-%{version}-src
  # Remove all binary libs used in compiling the package.
! #FIXME Use struts-sslext package
! find lib -name "*.jar" -and -not -name sslext-1.2.jar -print | xargs rm -f
! cp %{SOURCE1} settings.xml
! mkdir -p src/site
! cp %{SOURCE4} src/site/site.xml
  
  
! %if %{with_maven}
! mkdir -p .m2/repository/JPP/
! cp %{SOURCE3} .m2/repository/JPP/sslext.jar
! %else
! 
! mkdir -p lib
! (cd lib
! cp %{SOURCE3} .
! ln -sf $(build-classpath commons-beanutils)
! ln -sf $(build-classpath commons-collections)
! ln -sf $(build-classpath commons-digester)
! ln -sf $(build-classpath commons-lang)
! ln -sf $(build-classpath commons-logging)
! ln -sf $(build-classpath commons-validator)
! ln -sf $(build-classpath dom4j)
! ln -sf $(build-classpath jaxen)
! ln -sf $(build-classpath oro)
! ln -sf $(build-classpath servlet_2_3_api)
! ln -sf $(build-classpath struts)
! ln -sf $(build-classpath struts-taglib)
! ln -sf $(build-classpath struts-tiles)
! ln -sf $(build-classpath velocity)
! ln -sf $(build-classpath velocity-dvsl)
! )
! %endif
  
  %build
! %if %{with_maven}
! 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
  
! mvn-jpp \
!         -e \
!         -s $(pwd)/settings.xml \
!         -Dmaven2.jpp.mode=true \
!         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         install javadoc:javadoc site
! %else
! ant -Dskip.jar.loading=true jar.struts jar.view jar.generic javadoc docs
! %endif
  
  %install
***************
*** 115,170 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! install -p -m 644 dist/%{name}-generic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-generic-%{version}.jar
! install -p -m 644 dist/%{name}-view-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-view-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && 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 docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  rm -rf docs/javadoc
  
! # data
! #install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
! #cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
  
! # -----------------------------------------------------------------------------
  
  %clean
  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
  
! # -----------------------------------------------------------------------------
  
  %files
  %defattr(0644,root,root,0755)
! %doc LICENSE README.txt WHY_THREE_JARS.txt VLS_README.txt STATUS
  %{_javadir}/*.jar
  
  %files manual
  %defattr(0644,root,root,0755)
! %doc docs/*
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! 
! #%files demo
! #%defattr(0644,root,root,0755)
! #%{_datadir}/%{name}
  
! # -----------------------------------------------------------------------------
  
  %changelog
  * Wed Aug 17 2005 Ralph Apel <r.apel at r-apel.de> 0:1.1-4jpp
  - Fix build-classpath arguments
--- 211,323 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! %if ! %{with_maven}
! install -m 644 dist/%{name}-generic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-generic-%{version}.jar
! install -m 644 dist/%{name}-view-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-view-%{version}.jar
! %endif
! %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  
+ # pom
+ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+ install -m 644 pom.xml \
+     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ 
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ %if %{with_maven}
+ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ %else
  cp -pr docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  rm -rf docs/javadoc
+ %endif
+ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
! # manual
! install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
! cp LICENSE README.txt WHY_THREE_JARS.txt VLS_README.txt STATUS \
!                   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! %if %{with_maven}
! cp -pr target/site/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
! %else
! cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
! %endif
  
! # demo
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
! cp -pr examples test $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
! 
! %if %{gcj_support}
! %{_bindir}/aot-compile-rpm
! %endif
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
! %post
! %update_maven_depmap
! %if %{gcj_support}
! if [ -x %{_bindir}/rebuild-gcj-db ]
! then
!   %{_bindir}/rebuild-gcj-db
  fi
+ %endif
  
! %postun
! %update_maven_depmap
! %if %{gcj_support}
! if [ -x %{_bindir}/rebuild-gcj-db ]
! then
!   %{_bindir}/rebuild-gcj-db
! fi
! %endif
  
  %files
  %defattr(0644,root,root,0755)
! %doc %{_docdir}/%{name}-%{version}/LICENSE
! %doc %{_docdir}/%{name}-%{version}/STATUS
! %doc %{_docdir}/%{name}-%{version}/*.txt
  %{_javadir}/*.jar
+ %{_datadir}/maven2/poms/*
+ %{_mavendepmapfragdir}/*
+ %if %{gcj_support}
+ %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+ %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+ %endif
  
  %files manual
  %defattr(0644,root,root,0755)
! %doc %{_docdir}/%{name}-%{version}/site
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
! %files demo
! %defattr(0644,root,root,0755)
! %{_datadir}/%{name}-%{version}
  
  %changelog
+ * Sat Dec 25 2010 Ralph Apel <r.apel at r-apel.de> 0:1.4-2
+ - First JPP-6 release
+ 
+ * Wed Mar 18 2009 Ralph Apel <r.apel at r-apel.de> 0:1.4-1.jpp5
+ - Upgrade to 1.4
+ - First JPP-5 release
+ 
+ * Mon Aug 27 2007 Ralph Apel <r.apel at r-apel.de> 0:1.3-1jpp
+ - Upgrade to 1.3
+ - Build with maven2 by default
+ - Make Vendor, Distribution based on macro
+ - Add pom and depmap frags
+ - Add gcj_support option
+ 
+ * Sat Mar 11 2006 Fernando Nasser <fnasser at redhat.com> 0:1.2-1jpp
+ - Upgrade to 1.2
+ 
+ * Fri Mar 10 2006 Fernando Nasser <fnasser at redhat.com> 0:1.1-5jpp
+ - First JPP 1.7 build
+ 
  * Wed Aug 17 2005 Ralph Apel <r.apel at r-apel.de> 0:1.1-4jpp
  - Fix build-classpath arguments

--- NEW FILE: velocity-tools-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>




More information about the JPackage-commits mailing list