public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Permaine Cheung <pcheung@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/plexus-i18n] epel10: Update to the same version as upstream
Date: Wed, 15 Jul 2026 09:37:26 GMT [thread overview]
Message-ID: <178410824636.1.16378833022552480999.rpms-plexus-i18n-b3fb90b35347@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/plexus-i18n
Branch : epel10
Commit : b3fb90b35347c753ab6fb0e18121bae4bc0d8fcb
Author : Permaine Cheung <pcheung@fedoraproject.org>
Date : 2008-01-22T14:10:57+00:00
Stats : +154/-23 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/plexus-i18n/c/b3fb90b35347c753ab6fb0e18121bae4bc0d8fcb?branch=epel10
Log:
Update to the same version as upstream
---
diff --git a/plexus-i18n-1.0-jpp-depmap.xml b/plexus-i18n-1.0-jpp-depmap.xml
new file mode 100644
index 0000000..dece954
--- /dev/null
+++ b/plexus-i18n-1.0-jpp-depmap.xml
@@ -0,0 +1,17 @@
+<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>
diff --git a/plexus-i18n-settings.xml b/plexus-i18n-settings.xml
new file mode 100644
index 0000000..efe7bd7
--- /dev/null
+++ b/plexus-i18n-settings.xml
@@ -0,0 +1,47 @@
+<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>
diff --git a/plexus-i18n.spec b/plexus-i18n.spec
index e4dffd2..2219019 100644
--- a/plexus-i18n.spec
+++ b/plexus-i18n.spec
@@ -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 @@ Javadoc for %{name}.
%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 @@ plexus/utils \
ant jar javadoc
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -111,13 +149,26 @@ rm -rf $RPM_BUILD_ROOT
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 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
%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 @@ fi
%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@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@redhat.com> - 0:1.0-0.b6.3jpp.1
- Fixed %%Release tag.
- Changed the svn URL.
reply other threads:[~2026-07-15 9:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178410824636.1.16378833022552480999.rpms-plexus-i18n-b3fb90b35347@fedoraproject.org \
--to=pcheung@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox