rpms/plexus-containers/devel plexus-component-annotations-build.xml, NONE, 1.1.2.1 plexus-container-default-build.xml, NONE, 1.1.2.1 plexus-containers-javadoc-junit-link.patch, NONE, 1.1.2.1 plexus-containers-settings.xml, NONE, 1.1.2.1 plexus-containers-sourcetarget.patch, NONE, 1.1.2.1 plexus-containers.spec, NONE, 1.1.2.1 .cvsignore, 1.1, 1.1.2.1 sources, 1.1, 1.1.2.1
Fernando Nasser
fnasser at fedoraproject.org
Wed May 20 13:59:45 UTC 2009
- Previous message: rpms/kernel/F-11 drm-intel-gem-use-dma32-on-pae.patch, NONE, 1.1 agp-set_memory_ucwb.patch, 1.1, 1.2 kernel.spec, 1.1614, 1.1615
- Next message: rpms/iwl5000-firmware/devel .cvsignore, 1.1, 1.2 iwl5000-firmware.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: fnasser
Update of /cvs/extras/rpms/plexus-containers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9556
Modified Files:
Tag: private-newmaven-branch
.cvsignore sources
Added Files:
Tag: private-newmaven-branch
plexus-component-annotations-build.xml
plexus-container-default-build.xml
plexus-containers-javadoc-junit-link.patch
plexus-containers-settings.xml
plexus-containers-sourcetarget.patch plexus-containers.spec
Log Message:
Import pre-bootstrap version
--- NEW FILE plexus-component-annotations-build.xml ---
<project name="plexus-component-annotations" default="jar" basedir=".">
<property name="maven.build.output" value="target/classes"/>
<property name="maven.build.directory" value="target"/>
<property name="maven.build.final.name" value="plexus-component-annotations-1.0-alpha-30"/>
<property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
<property name="maven.test.output" value="target/test-classes"/>
<property name="javadocdir" value="target/site/annotationsdocs"></property>
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.directory}"/>
</target>
<target name="compile" description="Compile the code">
<mkdir dir="${maven.build.output}"/>
<javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/main/java"/>
</src>
</javac>
</target>
<target name="jar" depends="compile,test" description="Clean the JAR">
<jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
</target>
<target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
<mkdir dir="${maven.test.output}"/>
<javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/test/java"/>
</src>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
</classpath>
</javac>
</target>
<target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
<pathelement location="${maven.test.output}"/>
</classpath>
<batchtest todir="${maven.test.reports}">
<fileset dir="src/test/java">
<include name="**/*Test.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="junit-present" depends="test-junit-present" unless="junit.present">
<echo>================================= WARNING ================================</echo>
<echo> Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. </echo>
<echo>==========================================================================</echo>
</target>
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${build.sysclasspath}" arg2="only"/>
</condition>
</target>
<target name="javadoc" description="o Generate javadoc" >
<mkdir dir="${javadocdir}"></mkdir>
<tstamp>
<format pattern="-yyyy" property="year"></format>
</tstamp>
<property name="copyright" value="Copyright &copy; . All Rights Reserved."></property>
<property name="title" value="Plexus Component 1.0 API"></property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.*">
</javadoc>
</target>
</project>
--- NEW FILE plexus-container-default-build.xml ---
<project name="plexus-container-default" default="jar" basedir=".">
<property name="maven.build.output" value="target/classes"/>
<property name="maven.build.directory" value="target"/>
<property name="maven.build.final.name" value="plexus-container-default-1.0-alpha-30"/>
<property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
<property name="maven.test.output" value="target/test-classes"/>
<property name="javadocdir" value="target/site/apidocs"></property>
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.directory}"/>
</target>
<target name="compile" description="Compile the code">
<mkdir dir="${maven.build.output}"/>
<javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/main/java"/>
</src>
</javac>
<copy todir="${maven.build.output}">
<fileset dir="src/main/resources"/>
</copy>
</target>
<target name="jar" depends="compile,test" description="Clean the JAR">
<jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
</target>
<target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
<mkdir dir="${maven.test.output}"/>
<javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/test/java"/>
</src>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
</classpath>
</javac>
<copy todir="${maven.test.output}">
<fileset dir="src/test/resources"/>
</copy>
</target>
<target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="false" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
<pathelement location="${maven.test.output}"/>
</classpath>
<batchtest todir="${maven.test.reports}">
<fileset dir="src/test/java">
<include name="**/*Test.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="junit-present" depends="test-junit-present" unless="junit.present">
<echo>================================= WARNING ================================</echo>
<echo> Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. </echo>
<echo>==========================================================================</echo>
</target>
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${build.sysclasspath}" arg2="only"/>
</condition>
</target>
<target name="javadoc" description="o Generate javadoc" >
<mkdir dir="${javadocdir}"></mkdir>
<tstamp>
<format pattern="-yyyy" property="year"></format>
</tstamp>
<property name="copyright" value="Copyright &copy; . All Rights Reserved."></property>
<property name="title" value="Plexus Container Default 1.0 API"></property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.*">
</javadoc>
</target>
</project>
plexus-containers-javadoc-junit-link.patch:
--- NEW FILE plexus-containers-javadoc-junit-link.patch ---
diff -up ./plexus-container-default/pom.xml.sav ./plexus-container-default/pom.xml
--- ./plexus-container-default/pom.xml.sav 2008-01-31 17:50:25.000000000 -0500
+++ ./plexus-container-default/pom.xml 2008-01-31 17:53:08.000000000 -0500
@@ -51,18 +51,16 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
- <link>http://java.sun.com/j2ee/1.4/docs/api</link>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
- <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
- <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
- <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
- <link>http://www.junit.org/junit/javadoc/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- <link>http://jakarta.apache.org/regexp/apidocs/</link>
- <link>http://jakarta.apache.org/velocity/api/</link>
+ <link>file:///usr/share/javadoc/java</link>
+ <link>file:///usr/share/javadoc/jakarta-commons-collections</link>
+ <link>file:///usr/share/javadoc/jakarta-commons-dbcp</link>
+ <link>file:///usr/share/javadoc/jakarta-commons-fileupload</link>
+ <link>file:///usr/share/javadoc/jakarta-commons-httpclient</link>
+ <link>file:///usr/share/javadoc/jakarta-commons-logging</link>
+ <link>file:///usr/share/javadoc/jakarta-commons-pool</link>
+ <link>file:///usr/share/javadoc/log4j</link>
+ <link>file:///usr/share/javadoc/regexp</link>
+ <link>file:///usr/share/javadoc/velocity</link>
</links>
</configuration>
</plugin>
diff -up ./plexus-component-annotations/pom.xml.sav ./plexus-component-annotations/pom.xml
--- NEW FILE plexus-containers-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>
plexus-containers-sourcetarget.patch:
--- NEW FILE plexus-containers-sourcetarget.patch ---
--- ./plexus-container-default/pom.xml.orig 2008-12-10 15:39:48.915862000 -0500
+++ ./plexus-container-default/pom.xml 2008-12-10 15:43:30.466597000 -0500
@@ -27,6 +27,14 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
--- NEW FILE plexus-containers.spec ---
# Copyright (c) 2000-2007, 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 parent plexus
%define subname containers
%define namedversion 1.0-alpha-34
Name: %{parent}-%{subname}
Version: 1.0
Release: 0.1.a34.4%{?dist}
Epoch: 0
Summary: Containers for Plexus
License: Apache Software License 2.0
Group: Development/Java
URL: http://plexus.codehaus.org/
# svn export http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.0-alpha-44/
# tar czf plexus-containers-1.0-alpha-44.tar.gz plexus-containers-1.0-alpha-44/
Source0: %{name}-%{namedversion}.tar.gz
Source1: plexus-container-default-build.xml
Source2: plexus-component-annotations-build.xml
Source3: plexus-containers-settings.xml
Patch0: plexus-containers-javadoc-junit-link.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRequires: jpackage-utils >= 0:1.7.3
%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-resources
BuildRequires: maven2-plugin-surefire
BuildRequires: maven2-common-poms >= 1.0
BuildRequires: maven-release
%else
BuildRequires: ant >= 0:1.6.5
BuildRequires: ant-junit
BuildRequires: junit
%endif
BuildRequires: plexus-classworlds
BuildRequires: plexus-utils
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
Requires: plexus-classworlds
Requires: plexus-utils
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
embedded or for a full scale application server. There are many
reusable components for hibernate, form processing, jndi, i18n,
velocity, etc. Plexus also includes an application server which
is like a J2EE application server, without all the baggage.
%package component-annotations
Summary: Component API from %{name}
Group: Development/Java
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: plexus-classworlds
%description component-annotations
%{summary}.
%package container-default
Summary: Default Container from %{name}
Group: Development/Java
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: plexus-classworlds
Requires: plexus-containers-component-annotations
Requires: plexus-utils
Provides: plexus-containers-component-api = %{epoch}:%{version}-%{release}
%description container-default
%{summary}.
%package component-annotations-javadoc
Summary: Javadoc for plexus-component-annotations
Group: Development/Documentation
Requires(post): /bin/rm,/bin/ln
Requires(postun): /bin/rm
BuildRequires: java-javadoc
BuildRequires: jakarta-commons-collections-javadoc
BuildRequires: jakarta-commons-dbcp-javadoc
BuildRequires: jakarta-commons-fileupload-javadoc
BuildRequires: jakarta-commons-httpclient-javadoc
BuildRequires: jakarta-commons-logging-javadoc
BuildRequires: jakarta-commons-pool-javadoc
BuildRequires: log4j-javadoc
BuildRequires: regexp-javadoc
BuildRequires: velocity-javadoc
Requires: java-javadoc
Requires: jakarta-commons-collections-javadoc
Requires: jakarta-commons-dbcp-javadoc
Requires: jakarta-commons-fileupload-javadoc
Requires: jakarta-commons-httpclient-javadoc
Requires: jakarta-commons-logging-javadoc
Requires: jakarta-commons-pool-javadoc
Requires: log4j-javadoc
Requires: regexp-javadoc
Requires: velocity-javadoc
%description component-annotations-javadoc
%{summary}.
%package container-default-javadoc
Summary: Javadoc for plexus-container-default
Group: Development/Documentation
Requires(post): /bin/rm,/bin/ln
Requires(postun): /bin/rm
%description container-default-javadoc
%{summary}.
%prep
%setup -q -n plexus-containers-%{namedversion}
cp %{SOURCE1} plexus-container-default/build.xml
cp %{SOURCE2} plexus-component-annotations/build.xml
%patch0 -b .sav0
# Remove test that fails upstream as well
rm -f plexus-container-default/src/test/java/org/codehaus/plexus/logging/console/ConsoleLoggerTest.java
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
#FIXME:Why maven not support assert, "/UriConverter.java:[33,19] ';' expected"
sed -i "s|assert|// assert|g" plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java
%if %{with_maven}
mvn-jpp \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install
# Manual iteration should not be needed, but there is a bug in the javadoc
# plugin which makes this necessary. See:
# http://jira.codehaus.org/browse/MJAVADOC-157
for module in container-default \
component-annotations; do
pushd plexus-$module
mvn-jpp \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
javadoc:javadoc
popd
done
%else
export OPT_JAR_LIST="ant/ant-junit junit"
pushd plexus-component-annotations
export CLASSPATH=$(build-classpath \
plexus/classworlds \
)
ant -Dbuild.sysclasspath=only jar javadoc
popd
pushd plexus-container-default
rm src/test/java/org/codehaus/plexus/hierarchy/PlexusHierarchyTest.java
CLASSPATH=$CLASSPATH:$(build-classpath \
plexus/utils \
)
CLASSPATH=$CLASSPATH:../plexus-component-annotations/target/plexus-component-annotations-%{namedversion}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
ant -Dbuild.sysclasspath=only jar javadoc
popd
%endif
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 plexus-container-default/target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-container-default-%{version}.jar
install -pm 644 plexus-component-annotations/target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-annotations-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && 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 -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
install -pm 644 plexus-container-default/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-containers-container-default.pom
install -pm 644 plexus-component-annotations/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-containers-component-annotations.pom
%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
%add_to_maven_depmap org.codehaus.plexus containers-container-default %{namedversion} JPP/%{parent} containers-container-default
%add_to_maven_depmap org.codehaus.plexus containers-component-annotations %{namedversion} JPP/%{parent} containers-component-annotations
# component-api is now folded into container-default
%add_to_maven_depmap org.codehaus.plexus containers-component-api %{namedversion} JPP/%{parent} containers-container-default
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
%if %{with_maven}
cp -pr plexus-component-annotations/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
%else
# directory name is annotationsdocs while building with ant
ls -l plexus-component-annotations/target/site/
cp -pr plexus-component-annotations/target/site/annotationsdocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
%endif
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default-%{version}
cp -pr plexus-container-default/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default-%{version}
ln -s %{parent}-containers-component-annotations-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations # ghost symlink
ln -s %{parent}-containers-container-default-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default # ghost symlink
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%post component-annotations-javadoc
rm -f %{_javadocdir}/plexus-containers-component-annotations-javadoc
ln -s plexus-containers-component-annotations-javadoc-%{version} %{_javadocdir}/plexus-containers-component-annotations-javadoc
%postun component-annotations-javadoc
if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/plexus-containers-component-annotations-javadoc
fi
%post container-default-javadoc
rm -f %{_javadocdir}/plexus-containers-container-default-javadoc
ln -s plexus-containers-container-default-javadoc-%{version} %{_javadocdir}/plexus-containers-container-default-javadoc
%postun container-default-javadoc
if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/plexus-containers-container-default-javadoc
fi
%post component-annotations
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%postun component-annotations
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%post container-default
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%postun container-default
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%files
%defattr(-,root,root,-)
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
%files component-annotations
%defattr(-,root,root,-)
%{_javadir}/%{parent}/containers-component-annotations*
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/containers-component-annotations*-%{version}.jar.*
%endif
%files container-default
%defattr(-,root,root,-)
%{_javadir}/%{parent}/containers-container-default*
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/containers-container-default*-%{version}.jar.*
%endif
%files component-annotations-javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/plexus-containers-component-annotations-%{version}
%ghost %doc %{_javadocdir}/plexus-containers-component-annotations
%files container-default-javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/plexus-containers-container-default-%{version}
%ghost %doc %{_javadocdir}/plexus-containers-container-default
%changelog
* Mon Mar 16 2009 Yong Yang <yyang at redhat.com> 1.0-0.1.a34.4
- rebuild with new maven2 2.0.8 built in bootstrap mode
* Wed Feb 04 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.3
- re-build with maven
* Wed Feb 04 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.2
- fix bulding with ant
- temporarily buid with ant
* Wed Jan 14 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.1jpp.2
- re-build with maven
- disabled assert in plexus-container-default/.../UriConverter.java???
* Tue Jan 13 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.1jpp.1
- Imported into devel from dbhole's maven 2.0.8 packages
* Tue Apr 08 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a34.0jpp.1
- Initial build with original base spec from JPackage
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plexus-containers/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -p -r1.1 -r1.1.2.1
--- .cvsignore 18 May 2009 04:24:50 -0000 1.1
+++ .cvsignore 20 May 2009 13:59:15 -0000 1.1.2.1
@@ -0,0 +1 @@
+plexus-containers-1.0-alpha-34.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plexus-containers/devel/sources,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -p -r1.1 -r1.1.2.1
--- sources 18 May 2009 04:24:50 -0000 1.1
+++ sources 20 May 2009 13:59:15 -0000 1.1.2.1
@@ -0,0 +1 @@
+caf796d8fc7c64a72923601e0985d6e4 plexus-containers-1.0-alpha-34.tar.gz
- Previous message: rpms/kernel/F-11 drm-intel-gem-use-dma32-on-pae.patch, NONE, 1.1 agp-set_memory_ucwb.patch, 1.1, 1.2 kernel.spec, 1.1614, 1.1615
- Next message: rpms/iwl5000-firmware/devel .cvsignore, 1.1, 1.2 iwl5000-firmware.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list