Rebase to latest upstream & Fix problems from bz#226525

.gitignore

@@ -1 +1,2 @@
 velocity-1.6.3.tar.gz
+/velocity-1.6.4.tar.gz

sources

@@ -1 +1 @@
-5fee48e193cbc471c9a496c87ab06b9e  velocity-1.6.3.tar.gz
+1ba4363ac104301db59075dae0c9e7d0  velocity-1.6.4.tar.gz

velocity-1.6.4.pom

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -18,10 +17,7 @@
  specific language governing permissions and limitations
  under the License.    
 -->
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +29,7 @@
 
   <groupId>org.apache.velocity</groupId>
   <artifactId>velocity</artifactId>
-  <version>1.6.3</version>
+  <version>1.6.4</version>
 
   <name>Apache Velocity</name>
   <url>http://velocity.apache.org/engine/releases/velocity-1.6.2/</url>
@@ -73,7 +69,7 @@
   <distributionManagement>
     <site>
       <id>velocity.apache.org</id>
-      <url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.6.3/</url>
+      <url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.6.4/</url>
     </site>
     <repository>
       <id>apache.releases</id>
@@ -334,4 +330,4 @@
     <system>JIRA</system>
     <url>${jira.browse.url}/VELOCITY</url>
   </issueManagement>
-</project>
+</project>

velocity-cleanup-pom.patch

@@ -1,6 +1,6 @@
---- velocity-1.6.3/pom.xml.orig	2010-01-15 14:35:23.193906857 +0000
+--- velocity-1.6.4/pom.xml.orig	2010-11-03 17:54:46.130858097 +0100
-+++ velocity-1.6.3/pom.xml	2010-01-15 14:36:41.767906266 +0000
++++ velocity-1.6.4/pom.xml	2010-11-03 17:55:51.449631138 +0100
-@@ -25,12 +25,6 @@
+@@ -21,12 +21,6 @@
  
    <modelVersion>4.0.0</modelVersion>
  
@@ -12,8 +12,8 @@
 -
    <groupId>org.apache.velocity</groupId>
    <artifactId>velocity</artifactId>
-   <version>1.6.3</version>
+   <version>1.6.4</version>
-@@ -196,12 +190,6 @@
+@@ -192,12 +186,6 @@
        <scope>provided</scope>
      </dependency>
      <dependency>
@@ -26,3 +26,10 @@
        <groupId>ant</groupId>
        <artifactId>ant</artifactId>
        <version>1.6</version>
+@@ -330,4 +318,4 @@
+     <system>JIRA</system>
+     <url>${jira.browse.url}/VELOCITY</url>
+   </issueManagement>
+-</project>
+\ No newline at end of file
++</project>

velocity.spec

@@ -29,11 +29,12 @@
 #
 
 Name:           velocity
-Version:        1.6.3
+Version:        1.6.4
-Release:        5%{?dist}
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 License:        ASL 2.0
+URL:            http://velocity.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/engine/%{version}/%{name}-%{version}.tar.gz
 Source1:        http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 Patch0:		velocity-remove-avalon-logkit.patch
@@ -41,25 +42,22 @@ Patch1:		velocity-use-system-jars.patch
 Patch2:		velocity-servletapi5.patch
 Patch3:		velocity-cleanup-pom.patch
 Patch4:         velocity-tomcat6.patch
-URL:            http://velocity.apache.org/
 Group:          Development/Libraries
 Requires:       apache-commons-collections
 Requires:       apache-commons-logging
 Requires:       apache-commons-lang
-# Use servletapi5 instead of servletapi3
 Requires:       tomcat6-servlet-2.5-api
 Requires:       oro
-# We need a version of werken-xpath with a POM
+Requires:	werken-xpath
-Requires:	werken-xpath >= 0.9.4-5.beta.12.3
 Requires:       junit
 Requires:       hsqldb
-Requires:       jdom >= 0:1.0-1
+Requires:       jdom
 Requires:       bcel
-Requires:       log4j >= 0:1.1
+Requires:       log4j
 Requires(post): jpackage-utils
 Requires(postun): jpackage-utils
 
-BuildRequires:	werken-xpath >= 0.9.4-5.beta.12.3
+BuildRequires:	werken-xpath
 BuildRequires:  ant
 BuildRequires:  antlr
 BuildRequires:  junit
@@ -70,10 +68,11 @@ BuildRequires:  apache-commons-logging
 BuildRequires:  apache-commons-lang
 BuildRequires:  tomcat6-servlet-2.5-api
 BuildRequires:  oro
-BuildRequires:  jdom >= 0:1.0-1
+BuildRequires:  jdom
 BuildRequires:  bcel
-BuildRequires:  log4j >= 0:1.1
+BuildRequires:  log4j
-BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  jpackage-utils
+
 # It fails one of the arithmetic test cases with gcj
 BuildRequires:	java-devel >= 1:1.6.0
 BuildArch:      noarch
@@ -128,6 +127,9 @@ Demonstrations and samples for %{name}.
 %prep
 %setup -q -n %{name}-%{version}
 
+# remove bundled libs/classes (except those used for testing)
+find . -name '*.jar' -o -name '*.class' -not -path '*test*' -print -delete
+
 # Remove dependency on avalon-logkit
 rm -f src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
 rm -f src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
@@ -169,24 +171,26 @@ ant \
   -Dbuild.sysclasspath=first \
   jar javadocs test
 
+# fix line-endings in generated files
+sed -i 's/\r//' docs/api/stylesheet.css docs/api/package-list
+
 # -----------------------------------------------------------------------------
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -p -m 644 bin/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
 rm -rf docs/api
 
 # data
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d -m 755 %{buildroot}%{_datadir}/%{name}
-cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pr convert examples test %{buildroot}%{_datadir}/%{name}
 
 # Maven metadata
 install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
@@ -201,30 +205,37 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %update_maven_depmap
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # -----------------------------------------------------------------------------
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc LICENSE NOTICE README.txt
 %{_javadir}/*.jar
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*
 
 %files manual
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
+%doc LICENSE
 %doc docs/*
 
 %files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
+%doc LICENSE
+%{_javadocdir}/%{name}
 
 %files demo
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
+%doc LICENSE
 %{_datadir}/%{name}
 
 %changelog
+* Wed Nov  3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-1
+- Rebase to latest upstream
+- Fix problems from bz#226525
+
 * Thu Oct 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.3-5
 - Use apache-commons-collections instead of jakarta name
 - Use tomcat6 for dependency instead of tomcat5 (bz#640660)