[Jpackage-commits] rpms/free/velocity14 velocity14.spec,1.1,1.2

jpackage jpackage at ryu.zarb.org
Thu Dec 16 19:09:21 CET 2010


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

Modified Files:
	velocity14.spec 
Log Message:
1.4-9.jpp6

Index: velocity14.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/velocity14/velocity14.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** velocity14.spec	11 Feb 2008 09:56:01 -0000	1.1
--- velocity14.spec	16 Dec 2010 18:09:19 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 37,45 ****
  Name:           velocity14
  Version:        1.4
! Release:        7jpp
  Epoch:          0
  Summary:        Java-based template engine
  License:        Apache Software License
! Source0:        http://jakarta.apache.org/builds/jakarta-velocity/release/v1.4/velocity-1.4.tar.gz
  Source1:        http://repo1.maven.org/maven2/velocity/velocity/1.4/velocity-1.4.pom
  Patch0:		velocity14-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
--- 37,45 ----
  Name:           velocity14
  Version:        1.4
! Release:	9%{?dist}
  Epoch:          0
  Summary:        Java-based template engine
  License:        Apache Software License
! Source0:        http://archive.apache.org/dist/velocity/engine/1.4/velocity-1.4.tar.gz
  Source1:        http://repo1.maven.org/maven2/velocity/velocity/1.4/velocity-1.4.pom
  Patch0:		velocity14-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
***************
*** 47,74 ****
  Patch2:		velocity14-servletapi5.patch
  Patch3:		velocity14-build.patch
! URL:            http://jakarta.apache.org/velocity/
  Group:          Development/Libraries/Java
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  antlr
  BuildRequires:  junit
  BuildRequires:  bcel
  BuildRequires:  excalibur-avalon-logkit
! BuildRequires:  jakarta-commons-collections
  BuildRequires:  jakarta-oro
! BuildRequires:  jdom >= 0:1.0-1
! BuildRequires:  log4j >= 0:1.1
  # Use servletapi5 instead of servletapi3
  BuildRequires:  servletapi5
  BuildRequires:	werken-xpath
  
! Requires:       java >= 0:1.5.0
  Requires:       bcel
  Requires:       excalibur-avalon-logkit
! Requires:       jakarta-commons-collections
  Requires:       jakarta-oro
! Requires:       jdom >= 0:1.0-1
! Requires:       log4j >= 0:1.1
  # Use servletapi5 instead of servletapi3
  Requires:       servletapi5
--- 47,74 ----
  Patch2:		velocity14-servletapi5.patch
  Patch3:		velocity14-build.patch
! URL:            http://velocity.apache.org/
  Group:          Development/Libraries/Java
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  antlr
  BuildRequires:  junit
  BuildRequires:  bcel
  BuildRequires:  excalibur-avalon-logkit
! BuildRequires:  apache-commons-collections
  BuildRequires:  jakarta-oro
! BuildRequires:  jdom >= 0:1.1
! BuildRequires:  log4j >= 0:1.2.15
  # Use servletapi5 instead of servletapi3
  BuildRequires:  servletapi5
  BuildRequires:	werken-xpath
  
! Requires:       java >= 0:1.6.0
  Requires:       bcel
  Requires:       excalibur-avalon-logkit
! Requires:       apache-commons-collections
  Requires:       jakarta-oro
! Requires:       jdom >= 0:1.1
! Requires:       log4j >= 0:1.2.15
  # Use servletapi5 instead of servletapi3
  Requires:       servletapi5
***************
*** 79,84 ****
  %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
- Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  
  %if %{gcj_support}
--- 79,82 ----
***************
*** 88,93 ****
  %endif
  
! Requires(post):    jpackage-utils >= 0:1.7.4
! Requires(postun):  jpackage-utils >= 0:1.7.4
  
  
--- 86,91 ----
  %endif
  
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  
***************
*** 123,129 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):		%{__rm}
- Requires(post):		/bin/ln
- Requires(postun):	%{__rm}
  
  %description    javadoc
--- 121,124 ----
***************
*** 165,169 ****
  export CLASSPATH=$(build-classpath \
  antlr \
! jakarta-commons-collections \
  servletapi5 \
  excalibur/avalon-logkit \
--- 160,164 ----
  export CLASSPATH=$(build-classpath \
  antlr \
! commons-collections \
  servletapi5 \
  excalibur/avalon-logkit \
***************
*** 197,200 ****
--- 192,196 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  rm -rf docs/api
  
***************
*** 211,223 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-     rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 207,210 ----
***************
*** 259,263 ****
  %{_javadir}/*.jar
  %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/velocity-1.4.jar.*
--- 246,250 ----
  %{_javadir}/*.jar
  %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/velocity-1.4.jar.*
***************
*** 271,275 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
  
  %files demo
--- 258,262 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}*
  
  %files demo
***************
*** 290,293 ****
--- 277,286 ----
  
  %changelog
+ * Thu Dec 16 2010 Ralph Apel <r.apel at r-apel.de> 1.4-9
+ - Release for JPP-6
+ 
+ * Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 1.4-8
+ - Auto rebuild for JPackage 5 in mock
+ 
  * Mon Feb 11 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.4-7jpp
  - Rename and downgrade to 1.4 (maven-jxr wants it)




More information about the JPackage-commits mailing list