diff --git a/.cvsignore b/.cvsignore
index da6fe37..1c9ba8a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
plexus-i18n-1.0-beta-6-src.tar.gz
+plexus-i18n-1.0-beta-10-src.tar.bz2
diff --git a/plexus-i18n-1.0-jpp-depmap.xml b/plexus-i18n-1.0-jpp-depmap.xml
deleted file mode 100644
index dece954..0000000
--- a/plexus-i18n-1.0-jpp-depmap.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/plexus-i18n-1.0-project.xml b/plexus-i18n-1.0-project.xml
deleted file mode 100644
index 8781771..0000000
--- a/plexus-i18n-1.0-project.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
- plexus-components
- org.codehaus.plexus
- 1.1.4
-
- 4.0.0
- org.codehaus.plexus
- plexus-i18n
- Plexus I18N Component
- 1.0-beta-6
- org.codehaus.plexus.i18n
-
- src/main/java
- src/test/java
-
-
- src/main/resources
-
- **/*
-
-
-
-
-
-
- src/test/resources
-
- **/*
-
-
-
-
- **/*Test.java
-
-
- **/Abstract*.java
-
-
-
-
- org.codehaus.plexus
- plexus-maven-plugin
- 1.1
-
-
-
- descriptor
-
-
-
-
-
-
-
-
- JPP
- plexus-container-default
- plexus_container-default.jar
- 1.0
-
-
- JPP
- plexus-utils
- plexus_utils.jar
- 1.0
-
-
- JPP
- classworlds
- classworlds.jar
- 1.1
-
-
- JPP
- junit
- [junit].jar
- 3.8.1
-
-
-
diff --git a/plexus-i18n-settings.xml b/plexus-i18n-settings.xml
deleted file mode 100644
index efe7bd7..0000000
--- a/plexus-i18n-settings.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- JPP
-
-
- internal
- jpp
- __JPP_URL_PLACEHOLDER__
-
-
- external
- jpp
- __JAVADIR_PLACEHOLDER__
-
-
- local
- jpp
- __MAVENREPO_DIR_PLACEHOLDER__
-
-
-
-
- plugins-internal
- plugins-internal
- jpp
- __JPP_URL_PLACEHOLDER__
-
-
- plugins-external
- plugins-external
- jpp
- __JAVADIR_PLACEHOLDER__
-
-
- plugins-maven
- plugins-maven
- jpp
- __MAVENDIR_PLUGIN_PLACEHOLDER__
-
-
-
-
-
- JPP
-
-
diff --git a/plexus-i18n.spec b/plexus-i18n.spec
index 9c25881..8caf311 100644
--- a/plexus-i18n.spec
+++ b/plexus-i18n.spec
@@ -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|__JPP_URL_PLACEHOLDER__|file://`pwd`/.m2/repository|g" settings.xml
-sed -i -e "s|__JAVADIR_PLACEHOLDER__|file://`pwd`/external_repo|g" settings.xml
-sed -i -e "s|__MAVENREPO_DIR_PLACEHOLDER__|file://`pwd`/.m2/repository|g" settings.xml
-sed -i -e "s|__MAVENDIR_PLUGIN_PLACEHOLDER__|file:///usr/share/maven2/plugins|g" settings.xml
-sed -i -e "s|__ECLIPSEDIR_PLUGIN_PLACEHOLDER__|file:///usr/share/eclipse/plugins|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 0:1.0-0.b10.1
+- Update to beta 10.
+- Drop gcj and fix BRs.
+
* Sun Jul 26 2009 Fedora Release Engineering - 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 - 0:1.0-0.b6.1jpp
- First JPackage build
-
diff --git a/sources b/sources
index f1c023e..5b356f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37d0050c62c1ceb49a50420a8ee0dff8 plexus-i18n-1.0-beta-6-src.tar.gz
+203d01844ef13facf5e52afeff9f93c6 plexus-i18n-1.0-beta-10-src.tar.bz2