[Jpackage-commits] rpms/free/jetty6 jetty6.spec,1.1,1.1.2.1

jpackage jpackage at ryu.zarb.org
Mon Feb 9 09:11:54 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/jetty6
In directory ryu.zarb.org:/tmp/iDvseh0XAM/rpms/free/jetty6

Modified Files:
      Tag: JPACKAGE-5_0
	jetty6.spec 
Log Message:
6.1.7-5.jpp5

Index: jetty6.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jetty6/jetty6.spec,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** jetty6.spec	10 Aug 2008 16:23:19 -0000	1.1
--- jetty6.spec	9 Feb 2009 08:11:52 -0000	1.1.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 52,62 ****
  Name:           jetty6
  Version:        6.1.7
! Release:        4%{dist}
  Epoch:          0
  Summary:        The Jetty Webserver and Servlet Container
  
  Group:          Networking/Daemons
- #Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- #Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  License:        Apache Software License 2.0
  URL:            http://www.mortbay.org/
--- 52,60 ----
  Name:           jetty6
  Version:        6.1.7
! Release:        5%{dist}
  Epoch:          0
  Summary:        The Jetty Webserver and Servlet Container
  
  Group:          Networking/Daemons
  License:        Apache Software License 2.0
  URL:            http://www.mortbay.org/
***************
*** 82,86 ****
  # tar czf jetty6-glassfish-jsp-2.1-src.tgz modules
  
- #Patch0:         %{name}-felix.patch
  Patch1:         %{name}-pom.patch
  Patch2:         %{name}-jsp-api-2.0-pom_xml.patch
--- 80,83 ----
***************
*** 95,99 ****
  BuildArch:      noarch
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
--- 92,96 ----
  BuildArch:      noarch
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
***************
*** 101,105 ****
  BuildRequires:  jmock
  
! BuildRequires:  maven2 >= 2.0.4-10jpp
  BuildRequires:  maven2-default-skin
  BuildRequires:  maven2-plugin-antrun
--- 98,102 ----
  BuildRequires:  jmock
  
! BuildRequires:  maven2 >= 2.0.7
  BuildRequires:  maven2-default-skin
  BuildRequires:  maven2-plugin-antrun
***************
*** 128,132 ****
  BuildRequires:  jakarta-slide-webdavclient
  BuildRequires:  mx4j
! BuildRequires:  qdox < 0:1.6.2
  BuildRequires:  slf4j
  BuildRequires:  sun-mail
--- 125,129 ----
  BuildRequires:  jakarta-slide-webdavclient
  BuildRequires:  mx4j
! BuildRequires:  qdox 
  BuildRequires:  slf4j
  BuildRequires:  sun-mail
***************
*** 337,342 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- #Requires(post):   /bin/rm,/bin/ln
- #Requires(postun): /bin/rm
  
  %description javadoc
--- 334,337 ----
***************
*** 354,358 ****
  tar xzf %{SOURCE5}
  cp %{SOURCE1} settings.xml
- #%patch0 -b .sav0
  %patch1 -b .sav1
  %patch2 -b .sav2
--- 349,352 ----
***************
*** 831,849 ****
  
  
- ## ========= Start of JAVADOC Subpackage Post-Install and Post-Uninstall    
- ## Post-Install
- #%post javadoc
- #rm -f %{_javadocdir}/%{name}
- #ln -s %{name}-%{version} %{_javadocdir}/%{name}
- #
- ## Post-Uninstall
- #%postun javadoc
- #if [ "$1" = "0" ]; then
- #  rm -f %{_javadocdir}/%{name}
- #fi
- ## ========= End of JAVADOC Subpackage Post-Install and Post-Uninstall    
- 
- 
- 
  # ========= Start of Servlet 2.5 Subpackage Post-Install and Post-Uninstall    
  # Post-Install
--- 825,828 ----
***************
*** 1129,1132 ****
--- 1108,1115 ----
  
  %changelog
+ * Mon Feb 09 2009 Ralph Apel <r.apel at r-apel.de> - 0:6.1.7-5.jpp5
+ - BR newest qdox again
+ - BR maven2 >= 2.0.7
+ 
  * Mon Aug 11 2008 Ralph Apel <r.apel at r-apel.de> - 0:6.1.7-4.jpp5
  - Fix relationship between depmap frags and pom file namings




More information about the JPackage-commits mailing list