[plexus-interactivity] Fix pom filenames (Resolves rhbz#655821)
by Stanislav Ochotnicky
commit 16e6528b0e4623f70939454a038ad0898f248ff7
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Dec 1 17:13:30 2010 +0100
Fix pom filenames (Resolves rhbz#655821)
Cleanups according to new guidelines
plexus-interactivity.spec | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec
index fd96bee..2d24ee1 100644
--- a/plexus-interactivity.spec
+++ b/plexus-interactivity.spec
@@ -33,7 +33,7 @@
Name: plexus-interactivity
Version: 1.0
-Release: 0.3.a6.6%{?dist}
+Release: 0.3.a6.7%{?dist}
Epoch: 0
Summary: Plexus Interactivity Handler Component
License: MIT
@@ -50,7 +50,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant >= 0:1.6
-BuildRequires: ant-nodeps
+BuildRequires: ant-nodeps
BuildRequires: maven2
BuildRequires: maven-compiler-plugin
BuildRequires: maven-javadoc-plugin
@@ -77,10 +77,11 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
+Requires: jpackage-utils
%description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
%prep
%setup -q -n plexus-interactivity-1.0-alpha-6
@@ -95,43 +96,37 @@ mvn-jpp \
install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 \
plexus-interactivity-api/target/%{name}-api-%{version}-alpha-6.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-api-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-api.jar
install -pm 644 \
plexus-interactivity-jline/target/%{name}-jline-%{version}-alpha-6.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-jline-%{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/interactivity-jline.jar
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 \
-pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
+pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
install -pm 644 \
plexus-interactivity-api/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-interactivity-api.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-interactivity-api.pom
install -pm 644 \
plexus-interactivity-jline/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-interactivity-jline.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-interactivity-jline.pom
%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
%add_to_maven_depmap org.codehaus.plexus %{name}-api %{version} JPP/%{parent} interactivity-api
-%add_to_maven_depmap org.codehaus.plexus %{name}-jline %{version} JPP/%{parent} interactivity-jline
+%add_to_maven_depmap org.codehaus.plexus %{name}-jline %{version} JPP/%{parent} interactivity-jline
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug #447156 (can be removed in F-17)
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -151,6 +146,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 1 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.0-0.3.a6.7
+- Fix pom filenames (Resolves rhbz#655821)
+- Cleanups according to new guidelines
+
* Wed Oct 6 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.3.a6.6
- Use javadoc:aggregate.
13 years, 5 months
[Bug 655808] jetty installs pom files with incorrect filename
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=655808
Stanislav Ochotnicky <sochotni(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Flag|needinfo?(sochotni(a)redhat.c |
|om) |
--- Comment #3 from Stanislav Ochotnicky <sochotni(a)redhat.com> 2010-12-01 08:07:34 EST ---
FYI the problem is with this call:
%add_to_maven_depmap org.mortbay.jetty servlet-api %{version} JPP
tomcat6-servlet-2.5-api
This call tells us that there should be tomcat6-servlet-2.5-api jar file and
JPP-tomcat6-servlet-2.5.api.pom file. These files are present in tomcat6
package not jetty though. There are 2 normal solutions:
1. Fix pom file of jetty to use normal javax.servlet:servlet-api depmap
2. move the depmap call to tomca6.
The first approach is better IMO, since this depmap is quite unique...
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years, 5 months
[Bug 655808] jetty installs pom files with incorrect filename
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=655808
Alexander Kurtakov <akurtako(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |akurtako(a)redhat.com
--- Comment #2 from Alexander Kurtakov <akurtako(a)redhat.com> 2010-12-01 02:56:37 EST ---
jetty-util.pom is the only installed pom that references
org.mortbasy.jetty:servlet-api it would be best to replace it with
javax.servlet:servlet-api in the pom
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years, 5 months