From 4b0f8e5fa70d34b04be8fada35d4fe02f4b898fc Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Dec 02 2009 22:15:26 +0000 Subject: - Resovles #543081 - Add maven depmap fragments. --- diff --git a/jetty.spec b/jetty.spec index 048a7f0..984760e 100644 --- a/jetty.spec +++ b/jetty.spec @@ -42,7 +42,7 @@ Name: jetty Version: 6.1.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Jetty Webserver and Servlet Container Group: Applications/Internet @@ -107,6 +107,8 @@ Requires: slf4j Requires: classpathx-mail 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 @@ -214,6 +216,15 @@ install -dm 755 $RPM_BUILD_ROOT%{_bindir} install -dm 755 $RPM_BUILD_ROOT%{_initrddir} install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} + +install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.jetty-jetty.pom +install -pm 644 modules/util/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/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 +%add_to_maven_depmap org.mortbay.jetty servlet-api %{version} JPP tomcat6-servlet-2.5-api + install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} install -dm 755 $RPM_BUILD_ROOT%{confdir} install -dm 755 $RPM_BUILD_ROOT%{homedir} @@ -326,10 +337,12 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -348,6 +361,8 @@ fi %{_javadir}/%{name}/%{name}-%{version}.jar %{_javadir}/%{name}/%{name}-util.jar %{_javadir}/%{name}/%{name}-util-%{version}.jar +%{_datadir}/maven2 +%{_mavendepmapfragdir} %config(noreplace) %{confdir} %dir %{jettylibdir} %dir %{jettycachedir} @@ -372,6 +387,10 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Wed Dec 02 2009 Jeff Johnston 6.1.21-4 +- Resovles #543081 +- Add maven depmap fragments. + * Tue Nov 03 2009 Jeff Johnston 6.1.21-3 - Security issues - Resolves #532675, #5326565