[ant] Created tag ant-1.8.1-9.fc15
by Ville Skyttä
The lightweight tag 'ant-1.8.1-9.fc15' was created pointing to:
0504803... - Install javadocs into unversioned dir (#657879).
13 years, 5 months
[ant] - Install javadocs into unversioned dir (#657879).
by Ville Skyttä
commit 050480378748765159370ee989b2d95aab852f8a
Author: Ville Skyttä <ville.skytta(a)iki.fi>
Date: Sun Nov 28 17:00:18 2010 +0200
- Install javadocs into unversioned dir (#657879).
ant.spec | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index cfa370e..c61005c 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,7 +50,7 @@
Name: ant
Version: 1.8.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -622,12 +622,12 @@ echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testu
%if %{build_javadoc}
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%endif
# fix link between manual and javadoc
-(cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api)
+(cd docs/manual; ln -sf %{_javadocdir}/%{name} api)
%if %with bootstrap
find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
@@ -861,13 +861,16 @@ rm -rf $RPM_BUILD_ROOT
%if %{build_javadoc}
%files javadoc
%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
%endif
%endif
# -----------------------------------------------------------------------------
%changelog
+* Sun Nov 28 2010 Ville Skyttä <ville.skytta(a)iki.fi> - 0:1.8.1-9
+- Install javadocs into unversioned dir (#657879).
+
* Tue Nov 23 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.8.1-8
- Fix pom filename (Resolves rhbz#655787)
@@ -1036,10 +1039,10 @@ rm -rf $RPM_BUILD_ROOT
- Update to 1.5.4
- JavaCC task fixed using merged upstream patches from ant HEAD
-* Mon May 5 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.3-2jpp
+* Mon May 5 2003 Ville Skyttä <ville.skytta(a)iki.fi> - 0:1.5.3-2jpp
- Fix non-versioned javadoc symlinking.
-* Tue Apr 22 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.3-1jpp
+* Tue Apr 22 2003 Ville Skyttä <ville.skytta(a)iki.fi> - 0:1.5.3-1jpp
- Update to 1.5.3.
- Remove runtime java-devel dependency.
- Add Epochs in all Provides and Requires.
@@ -1062,7 +1065,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Mar 18 2003 Nicolas Mailhot <Nicolas.Mailhot at JPackage.org> - 1.5.2-7jpp
- for JPackage-utils 1.5
-* Wed Mar 12 2003 Ville Skyttä <ville.skytta at iki.fi> - 1.5.2-5jpp
+* Wed Mar 12 2003 Ville Skyttä <ville.skytta(a)iki.fi> - 1.5.2-5jpp
- Move ANT_HOME to /usr/share/ant.
- Don't special-case the lib dir for RPM layout any more, use ANT_HOME/lib.
- Install XSLs into ANT_HOME/etc.
@@ -1092,7 +1095,7 @@ rm -rf $RPM_BUILD_ROOT
ant optional jars)
- Built with jikes 1.18 and IBM SDK 1.4
-* Sat Feb 1 2003 Ville Skyttä <ville.skytta at iki.fi> - 1.5.1-8jpp
+* Sat Feb 1 2003 Ville Skyttä <ville.skytta(a)iki.fi> - 1.5.1-8jpp
- Symlink a transformer into ANT_LIB for smoother experience on Java 1.3.
- Requires jaxp_transform_impl.
- Don't remove optional.jar symlinks on optional-full upgrade.
@@ -1104,14 +1107,14 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 20 2003 David Walluck <david(a)anti-microsoft.org> 1.5.1-7jpp
- oldbsf
-* Fri Dec 20 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.5.1-6jpp
+* Fri Dec 20 2002 Ville Skyttä <ville.skytta(a)iki.fi> - 1.5.1-6jpp
- Really get rid of automatic dependencies for the -scripts package.
* Wed Dec 18 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.5.1-5jpp
- scripts subpackages
- file-based manual dependencies, as packages doesn't have the same name on RedHat and Mandrake
-* Wed Dec 11 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.5.1-4jpp
+* Wed Dec 11 2002 Ville Skyttä <ville.skytta(a)iki.fi> - 1.5.1-4jpp
- Patched to allow easier use with Jikes and IBM's 1.4.0, see
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15289> for details.
@@ -1143,7 +1146,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Jul 11 2002 Henri Gomez <hgomez(a)users.sourceforge.net> 1.5-3jpp
- add missing symlink between optional-full.jar and optional.jar
-* Wed Jul 10 2002 Ville Skyttä <ville.skytta at iki.fi> 1.5-2jpp
+* Wed Jul 10 2002 Ville Skyttä <ville.skytta(a)iki.fi> 1.5-2jpp
- Requires jaxp_parser_impl, no longer jaxp_parser2
(jaxp_parser_impl already requires xml-commons-apis).
- Use sed instead of bash 2 extension when symlinking.
13 years, 5 months
[maven-enforcer] Fix FTBFS (#631388)
by Stanislav Ochotnicky
commit e527037625c985c74d8289cac984007e6f622be1
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Dec 13 17:24:36 2010 +0100
Fix FTBFS (#631388)
- Use new maven plugin names
- Versionless jars & javadocs
maven-enforcer-depmap.xml | 9 ++---
maven-enforcer.spec | 79 +++++++++++++++++++++-----------------------
2 files changed, 42 insertions(+), 46 deletions(-)
---
diff --git a/maven-enforcer-depmap.xml b/maven-enforcer-depmap.xml
index 428f93b..71ded20 100644
--- a/maven-enforcer-depmap.xml
+++ b/maven-enforcer-depmap.xml
@@ -1,16 +1,15 @@
<dependencies>
<dependency>
<maven>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
<version>1.1</version>
</maven>
<jpp>
- <groupId>JPP/maven-plugin-testing</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
+ <groupId>JPP/plexus</groupId>
+ <artifactId>container-default</artifactId>
<version>1.1</version>
</jpp>
</dependency>
-
</dependencies>
diff --git a/maven-enforcer.spec b/maven-enforcer.spec
index 32ed3b4..16d689f 100644
--- a/maven-enforcer.spec
+++ b/maven-enforcer.spec
@@ -2,7 +2,7 @@
Name: maven-enforcer
Version: 1.0
-Release: 0.1.b2%{?dist}
+Release: 0.2.b2%{?dist}
Summary: Maven Enforcer
Group: Development/Libraries
@@ -13,7 +13,6 @@ URL: http://maven.apache.org/enforcer
Source0: enforcer-%{project_version}.tar.xz
Source1: %{name}-depmap.xml
Patch0: fix-site.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -21,24 +20,25 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven2
BuildRequires: maven-plugin-plugin
-BuildRequires: maven2-plugin-assembly
-BuildRequires: plexus-maven-plugin
+BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
-BuildRequires: maven2-plugin-install
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven2-plugin-resources
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-doxia-tools
+BuildRequires: maven-install-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-jar-plugin
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-plugin-cobertura
-BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
-BuildRequires: maven-doxia-tools
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit
BuildRequires: tomcat6
-Requires: maven2
+BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-javadoc
+Requires: maven2
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
@@ -61,7 +61,7 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description api
-This component provides the generic interfaces needed to
+This component provides the generic interfaces needed to
implement custom rules for the maven-enforcer-plugin.
%package rules
@@ -89,61 +89,51 @@ This component contains the standard Enforcer Rules.
%setup -q -n enforcer-%{project_version}
%patch0
+# fix old dep on javadoc taglet
+sed -i 's:<artifactId>plexus-javadoc</artifactId>:<artifactId>plexus-component-javadoc</artifactId>:' pom.xml
+
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
-e \
- -Dmaven2.jpp.mode=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
install -m 644 enforcer-api/target/enforcer-api-%{project_version}.jar \
- %{buildroot}%{_javadir}/%{name}/enforcer-api-%{project_version}.jar
+ %{buildroot}%{_javadir}/%{name}/enforcer-api.jar
install -m 644 enforcer-rules/target/enforcer-rules-%{project_version}.jar \
- %{buildroot}%{_javadir}/%{name}/enforcer-rules-%{project_version}.jar
+ %{buildroot}%{_javadir}/%{name}/enforcer-rules.jar
install -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{project_version}.jar \
- %{buildroot}%{_javadir}/%{name}/plugin-%{project_version}.jar
-
-(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{project_version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{project_version}||g"`; done)
+ %{buildroot}%{_javadir}/%{name}/plugin.jar
# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.maven.enforcer enforcer %{project_version} JPP %{name}
install -pm 644 enforcer-api/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-enforcer-api.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-enforcer-api.pom
%add_to_maven_depmap org.apache.maven.enforcer enforcer-api %{project_version} JPP/%{name} enforcer-api
install -pm 644 enforcer-rules/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-enforcer-rules.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-enforcer-rules.pom
%add_to_maven_depmap org.apache.maven.enforcer enforcer-rules %{project_version} JPP/%{name} enforcer-rules
install -pm 644 maven-enforcer-plugin/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-plugin.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-plugin.pom
%add_to_maven_depmap org.apache.maven.plugins maven-enforcer-plugin %{project_version} JPP/%{name} plugin
# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-
-for dir in *enforcer*; do
- install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir
- cp -pr $dir/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir/
-done
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-ln -s %{name}-%{version} \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%post
%update_maven_depmap
@@ -151,8 +141,11 @@ ln -s %{name}-%{version} \
%postun
%update_maven_depmap
-%clean
-%{__rm} -rf %{buildroot}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
%files
%defattr(-,root,root,-)
@@ -162,7 +155,6 @@ ln -s %{name}-%{version} \
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%files api
@@ -178,6 +170,11 @@ ln -s %{name}-%{version} \
%{_javadir}/%{name}/plugin*
%changelog
+* Mon Dec 13 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0-0.2.b2
+- Fix FTBFS (#631388)
+- Use new maven plugin names
+- Versionless jars & javadocs
+
* Wed May 19 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-0.1.b2
- Initial package
13 years, 5 months
[plexus-mail-sender] Fix FTBFS.
by Alexander Kurtakov
commit ba3329c5a59cde8b168462a7dc3e18d6a8259a4a
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Dec 13 17:05:28 2010 +0200
Fix FTBFS.
Adapt to current guidelines.
plexus-mail-sender.spec | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index 7fa390c..f9d5038 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
Name: plexus-mail-sender
Version: 1.0
-Release: 0.a2.15%{?dist}
+Release: 0.a2.16%{?dist}
Epoch: 0
Summary: Plexus Mail Sender
License: MIT and ASL 1.1
@@ -83,6 +83,7 @@ Plexus component provides SMTP transport.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -93,10 +94,6 @@ Javadoc for %{name}.
%patch0 -p3
%build
-
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
@@ -105,7 +102,7 @@ mvn-jpp \
-Dmaven2.jpp.depmap.file="%{SOURCE2}" \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=true \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
rm -rf $RPM_BUILD_ROOT
@@ -113,36 +110,21 @@ rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 \
plexus-mail-senders/plexus-mail-sender-javamail/target/%{name}-javamail-%{namedversion}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-javamail-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-javamail.jar
install -pm 644 \
plexus-mail-senders/plexus-mail-sender-simple/target/%{name}-simple-%{namedversion}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-simple-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-simple.jar
install -pm 644 \
plexus-mail-senders/plexus-mail-sender-test/target/%{name}-test-%{namedversion}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-test-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-test.jar
install -pm 644 \
plexus-mail-sender-api/target/%{name}-api-%{namedversion}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do \
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api.jar
+
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-cp -pr plexus-mail-sender-api/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/test
-cp -pr plexus-mail-senders/plexus-mail-sender-test/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/test
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/simple
-cp -pr plexus-mail-senders/plexus-mail-sender-simple/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/simple
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/javamail
-cp -pr plexus-mail-senders/plexus-mail-sender-javamail/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/javamail
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
%defattr(-,root,root,-)
@@ -150,9 +132,13 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%{_javadocdir}/*
%changelog
+* Mon Dec 13 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.a2.16
+- Fix FTBFS.
+- Adapt to current guidelines.
+
* Wed Sep 8 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.0-0.a2.15
- Add maven-site-plugin to BR
- Update maven-plugin BR names
13 years, 5 months
[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
https://bugzilla.redhat.com/show_bug.cgi?id=652183
Jason Tibbitts <tibbs(a)math.uh.edu> changed:
What |Removed |Added
----------------------------------------------------------------------------
Depends on| |655496
Bug 652183 depends on bug 655601, which changed state.
Bug 655601 Summary: Review Request: jing-trang - Schema validation and conversion based on RELAX NG
https://bugzilla.redhat.com/show_bug.cgi?id=655601
What |Old Value |New Value
----------------------------------------------------------------------------
Resolution| |ERRATA
Status|ON_QA |CLOSED
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.
You are the assignee for the bug.
13 years, 5 months