rpms/jetty/F-12 jetty.spec,1.23,1.24

[Jeff Johnston]

Author: jjohnstn

Update of /cvs/pkgs/rpms/jetty/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20031

Modified Files:
	jetty.spec 
Log Message:

* Wed Dec 02 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-7
- Resovles #543081
- Add maven depmap fragments.




Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-12/jetty.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- jetty.spec	18 Nov 2009 14:19:49 -0000	1.23
+++ jetty.spec	2 Dec 2009 22:14:17 -0000	1.24
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.20
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -106,6 +106,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
 
@@ -213,6 +215,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}
@@ -325,10 +336,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
@@ -347,6 +360,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}
@@ -371,6 +386,10 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Dec 02 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-7
+- Resovles #543081
+- Add maven depmap fragments.
+
 * Wed Nov 18 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.20-6
 - Add unversioned symlinks in javadir.