rpms/plexus-i18n/devel plexus-i18n-1.0-jpp-depmap.xml, NONE, 1.1 plexus-i18n-settings.xml, NONE, 1.1 plexus-i18n.spec, 1.1, 1.2
Permaine Cheung (pcheung)
fedora-extras-commits at redhat.com
Tue Jan 22 14:11:33 UTC 2008
Author: pcheung
Update of /cvs/extras/rpms/plexus-i18n/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30315
Modified Files:
plexus-i18n.spec
Added Files:
plexus-i18n-1.0-jpp-depmap.xml plexus-i18n-settings.xml
Log Message:
Update to the same version as upstream
--- NEW FILE plexus-i18n-1.0-jpp-depmap.xml ---
<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>
--- NEW FILE plexus-i18n-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>
Index: plexus-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-i18n/devel/plexus-i18n.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plexus-i18n.spec 8 Mar 2007 21:59:32 -0000 1.1
+++ plexus-i18n.spec 22 Jan 2008 14:10:57 -0000 1.2
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -28,42 +28,53 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 0
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:
-%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:
-i%{_gcj_support}}%{!?_gcj_support:0}}}
-
+%define with_maven 0
%define gcj_support 0
+%define parent plexus
+%define subname i18n
Name: plexus-i18n
Version: 1.0
-Release: 0.b6.3jpp.1%{?dist}
+Release: 0.b6.5jpp.1%{?dist}
Epoch: 0
Summary: Plexus I18N Component
-License: Apache Software License
+License: ASL 2.0
Group: Development/Java
URL: http://plexus.codehaus.org/
Source0: plexus-i18n-1.0-beta-6-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-i18n-1.0-beta-6
-# tar czf plexus-i18n.tar.gz plexus-i18n-1.0-beta-6/
+# 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/
Source1: plexus-i18n-1.0-build.xml
Source2: plexus-i18n-1.0-project.xml
-Source3: plexus-i18n-1.0-plexus-components.xml
+Source3: plexus-i18n-settings.xml
+Source4: plexus-i18n-1.0-jpp-depmap.xml
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{gcj_support}
BuildArch: noarch
%endif
-BuildRequires: jpackage-utils >= 0:1.6
+BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
+%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
+BuildRequires: plexus-maven-plugin
+%endif
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(post): jpackage-utils >= 0:1.7.2
+Requires(postun): jpackage-utils >= 0:1.7.2
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -90,12 +101,38 @@
%prep
%setup -q -n plexus-i18n-1.0-beta-6
+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} src/main/resources/META-INF/plexus/components.xml
+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
+
+mkdir external_repo
+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
+
+%else
+
mkdir -p target/lib
build-jar-repository -s -p target/lib \
classworlds \
@@ -104,6 +141,7 @@
ant jar javadoc
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -111,13 +149,26 @@
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{version}-beta-6.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/i18n-%{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)
+ do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# poms
+%if %{with_maven}
+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
+%endif
+
# 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 target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
+%endif
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
@@ -126,16 +177,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%if %{gcj_support}
%post
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%if %{gcj_support}
%postun
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -144,18 +197,32 @@
%files
%defattr(-,root,root,-)
-%{_javadir}/*
-
+%{_javadir}/%{parent}/*
+%if %{with_maven}
+%{_datadir}/maven2/poms/*
+%endif
+%{_mavendepmapfragdir}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/i18n-1.0.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.*
%endif
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> - 0:1.0-0.b6.5jpp.1
+- Update to the same version as upstream
+
+* Thu Apr 26 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b6.5jpp
+- Reupload to fix metadata
+
+* Sat Mar 24 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b6.4jpp
+- Optionally build without maven
+- Add gcj_support option
+
* Mon Feb 19 2007 Tania Bento <tbento at redhat.com> - 0:1.0-0.b6.3jpp.1
- Fixed %%Release tag.
- Changed the svn URL.
More information about the fedora-extras-commits
mailing list