[jetty] Add depmap for activation.jar.
by Alexander Kurtakov
commit c22daad5e637dafc8de5bf83ef02317bc477c6f4
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Aug 12 15:57:56 2011 +0300
Add depmap for activation.jar.
jetty-depmap.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/jetty-depmap.xml b/jetty-depmap.xml
index 0f7c2be..a888a31 100644
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@ -174,6 +174,13 @@
</dependency>
<dependency>
<maven>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </maven>
+ </dependency>
+ <dependency>
+ <maven>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-descriptor</artifactId>
<version>2.0.6</version>
12 years, 8 months
[jetty] Install jetty-client and its deps into _javadir and provide maven integration.
by Alexander Kurtakov
commit f60f84d1f6eac65b9a422bb8f8d8da9c23d07bb4
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Aug 12 14:37:57 2011 +0300
Install jetty-client and its deps into _javadir and provide maven
integration.
jetty.spec | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 9b5a8ea..4b0585e 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,7 +42,7 @@
Name: jetty
Version: 6.1.26
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: The Jetty Webserver and Servlet Container
Group: Applications/Internet
@@ -105,8 +105,6 @@ Requires: slf4j
Requires: javamail
Requires: xerces-j2 >= 0:2.7
Requires: xml-commons-apis
-Requires(post): jpackage-utils >= 0:1.6
-Requires(postun): jpackage-utils >= 0:1.6
Provides: group(%username) = %jtuid
Provides: user(%username) = %jtuid
@@ -200,11 +198,12 @@ install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-jetty.pom
+install -pm 644 modules/jetty/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty.pom
install -pm 644 modules/util/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty-util.pom
-
-%add_to_maven_depmap org.mortbay.jetty jetty %{version} JPP/jetty jetty
-%add_to_maven_depmap org.mortbay.jetty jetty-util %{version} JPP/jetty jetty-util
+install -pm 644 modules/util5/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty-util5.pom
+install -pm 644 extras/client/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty-client.pom
+install -pm 644 extras/sslengine/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty-sslengine.pom
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -dm 755 $RPM_BUILD_ROOT%{confdir}
@@ -227,6 +226,16 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
echo '# Placeholder configuration file. No default is provided.' > $RPM_BUILD_ROOT%{confdir}/jetty.conf
ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util.jar
+ln -s %{homedir}/lib/jre1.5/%{name}-util5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util5.jar
+ln -s %{homedir}/lib/ext/%{name}-client-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-client.jar
+ln -s %{homedir}/lib/ext/%{name}-sslengine-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-sslengine.jar
+
+%add_maven_depmap JPP-jetty.pom
+%add_maven_depmap JPP.jetty-jetty.pom %{name}/%{name}.jar
+%add_maven_depmap JPP.jetty-jetty-util.pom %{name}/%{name}-util.jar
+%add_maven_depmap JPP.jetty-jetty-util5.pom %{name}/%{name}-util5.jar
+%add_maven_depmap JPP.jetty-jetty-client.pom %{name}/%{name}-client.jar
+%add_maven_depmap JPP.jetty-jetty-sslengine.pom %{name}/%{name}-sslengine.jar
( cat << EO_RC
JAVA_HOME=/usr/lib/jvm/java
JAVA_OPTIONS=
@@ -312,12 +321,10 @@ popd
%post
[ -x /sbin/chkconfig ] && /sbin/chkconfig --add %{name}
-%update_maven_depmap
%postun
%__fe_userdel %username &>/dev/null || :
%__fe_groupdel %username &>/dev/null || :
-%update_maven_depmap
%preun
@@ -331,8 +338,7 @@ fi
%files
%{_bindir}/*
%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/%{name}.jar
-%{_javadir}/%{name}/%{name}-util.jar
+%{_javadir}/%{name}/*.jar
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%config(noreplace) %{confdir}
@@ -357,6 +363,9 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Fri Aug 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 6.1.26-8
+- Install jetty-client and its deps into _javadir and provide maven integration.
+
* Tue Jun 28 2011 Alexander Kurtakov <akurtako(a)redhat.com> 6.1.26-7
- Adapt build for maven 3.x.
12 years, 8 months