- Update to beta 10.
- Drop gcj and fix BRs.
This commit is contained in:
parent
b747cfbfa1
commit
644775fc31
@ -1 +1,2 @@
|
||||
plexus-i18n-1.0-beta-6-src.tar.gz
|
||||
plexus-i18n-1.0-beta-10-src.tar.bz2
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
<dependencies>
|
||||
<!--
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>jline</groupId>
|
||||
<artifactId>jline</artifactId>
|
||||
<version>0.9.1</version>
|
||||
</maven>
|
||||
<jpp>
|
||||
<groupId>JPP</groupId>
|
||||
<artifactId>jline</artifactId>
|
||||
<version>0.9.9</version>
|
||||
</jpp>
|
||||
</dependency>
|
||||
|
||||
-->
|
||||
</dependencies>
|
||||
@ -1,81 +0,0 @@
|
||||
<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-i18n</artifactId>
|
||||
<name>Plexus I18N Component</name>
|
||||
<currentVersion>1.0-beta-6</currentVersion>
|
||||
<package>org.codehaus.plexus.i18n</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>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-maven-plugin</artifactId>
|
||||
<version>1.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>descriptor</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</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>
|
||||
@ -1,47 +0,0 @@
|
||||
<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>
|
||||
@ -29,32 +29,26 @@
|
||||
#
|
||||
|
||||
%define with_maven 1
|
||||
%define gcj_support 0
|
||||
%define parent plexus
|
||||
%define subname i18n
|
||||
|
||||
Name: plexus-i18n
|
||||
Version: 1.0
|
||||
Release: 0.b6.5.3%{?dist}.3
|
||||
Release: 0.b10.1%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Plexus I18N Component
|
||||
License: ASL 2.0
|
||||
Group: Development/Java
|
||||
URL: http://plexus.codehaus.org/
|
||||
Source0: plexus-i18n-1.0-beta-6-src.tar.gz
|
||||
# svn export http://svn.codehaus.org/plexus/tags/plexus-i18n-1.0-beta-6svn export http://svn.plexus.codehaus.org/plexus/tags/plexus-i18n-1.0-beta-6
|
||||
# tar czf plexus-i18n-1.0-beta-6-src.tar.gz plexus-i18n-1.0-beta-6/
|
||||
URL: http://plexus.codehaus.org/plexus-components/plexus-i18n
|
||||
Source0: plexus-i18n-1.0-beta-10-src.tar.bz2
|
||||
# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-i18n-1.0-beta-10/
|
||||
# tar cjf plexus-i18n-1.0-beta-10-src.tar.bz2 plexus-i18n-1.0-beta-10/
|
||||
Source1: plexus-i18n-1.0-build.xml
|
||||
Source2: plexus-i18n-1.0-project.xml
|
||||
Source3: plexus-i18n-settings.xml
|
||||
Source4: plexus-i18n-1.0-jpp-depmap.xml
|
||||
Source5: plexus-i18n-1.0-plexus-components.xml
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
%if ! %{gcj_support}
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
BuildRequires: jpackage-utils >= 0:1.7.2
|
||||
BuildRequires: ant >= 0:1.6
|
||||
%if %{with_maven}
|
||||
@ -63,9 +57,10 @@ 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
|
||||
BuildRequires: maven-surefire-maven-plugin
|
||||
BuildRequires: maven-surefire-provider-junit
|
||||
BuildRequires: maven-doxia-sitetools
|
||||
BuildRequires: plexus-maven-plugin
|
||||
%endif
|
||||
BuildRequires: classworlds >= 0:1.1
|
||||
@ -77,12 +72,6 @@ Requires: plexus-utils
|
||||
Requires(post): jpackage-utils >= 0:1.7.2
|
||||
Requires(postun): jpackage-utils >= 0:1.7.2
|
||||
|
||||
%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
|
||||
writing applications. At the core is the container, which can be
|
||||
@ -101,23 +90,15 @@ Javadoc for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n plexus-i18n-1.0-beta-6
|
||||
%setup -q -n plexus-i18n-1.0-beta-10
|
||||
for j in $(find . -name "*.jar"); do
|
||||
mv $j $j.no
|
||||
done
|
||||
cp %{SOURCE1} build.xml
|
||||
cp %{SOURCE2} project.xml
|
||||
mkdir -p src/main/resources/META-INF/plexus
|
||||
cp %{SOURCE3} settings.xml
|
||||
|
||||
%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
|
||||
|
||||
@ -126,9 +107,7 @@ ln -s %{_javadir} external_repo/JPP
|
||||
|
||||
mvn-jpp \
|
||||
-e \
|
||||
-s $(pwd)/settings.xml \
|
||||
-Dmaven2.jpp.mode=true \
|
||||
-Dmaven2.jpp.depmap.file=%{SOURCE4} \
|
||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||
install javadoc:javadoc
|
||||
|
||||
@ -147,7 +126,7 @@ ant jar javadoc
|
||||
mkdir -p META-INF/plexus META-INF/maven/org.codehaus.plexus/plexus-i18n/
|
||||
cp %{SOURCE5} META-INF/plexus/components.xml
|
||||
cp pom.xml META-INF/maven/org.codehaus.plexus/plexus-i18n/
|
||||
jar uvf target/%{name}-%{version}-beta-6.jar META-INF
|
||||
jar uvf target/%{name}-%{version}-beta-10.jar META-INF
|
||||
rm -rf META-INF
|
||||
|
||||
%endif
|
||||
@ -156,7 +135,7 @@ rm -rf META-INF
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# jars
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
|
||||
install -pm 644 target/%{name}-%{version}-beta-6.jar \
|
||||
install -pm 644 target/%{name}-%{version}-beta-10.jar \
|
||||
$RPM_BUILD_ROOT%{_javadir}/plexus/i18n-%{version}.jar
|
||||
%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
|
||||
|
||||
@ -179,30 +158,14 @@ cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
%endif
|
||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
%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(-,root,root,-)
|
||||
@ -211,10 +174,6 @@ fi
|
||||
%{_datadir}/maven2/poms/*
|
||||
%endif
|
||||
%{_mavendepmapfragdir}
|
||||
%if %{gcj_support}
|
||||
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
|
||||
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.*
|
||||
%endif
|
||||
|
||||
%files javadoc
|
||||
%defattr(-,root,root,-)
|
||||
@ -222,6 +181,10 @@ fi
|
||||
%doc %{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Wed Dec 23 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.0-0.b10.1
|
||||
- Update to beta 10.
|
||||
- Drop gcj and fix BRs.
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-0.b6.5.3.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
@ -264,4 +227,3 @@ fi
|
||||
|
||||
* Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b6.1jpp
|
||||
- First JPackage build
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user