rpms/stringtemplate/F-12 sources, 1.2, 1.3 stringtemplate-3.1-build-junit.patch, 1.1, 1.2 stringtemplate.spec, 1.4, 1.5 stringtemplate-3.1-disable-broken-test.patch, 1.1, NONE

[Miloš Jakubíček]

Author: mjakubicek

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

Modified Files:
	sources stringtemplate-3.1-build-junit.patch 
	stringtemplate.spec 
Removed Files:
	stringtemplate-3.1-disable-broken-test.patch 
Log Message:
- Update to 3.2.1
- Supply maven POM files
- Drop stringtemplate-3.1-disable-broken-test.patch (merged upstream)




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stringtemplate/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Apr 2008 17:29:20 -0000	1.2
+++ sources	30 Jan 2010 17:01:35 -0000	1.3
@@ -1 +1 @@
-73c5034bd397d2ab3688328a86667b21  stringtemplate-3.1.tar.gz
+d2f24e500de36a7edb876c31bdc73e5c  stringtemplate-3.2.1.tar.gz

stringtemplate-3.1-build-junit.patch:
 build.xml |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

Index: stringtemplate-3.1-build-junit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/stringtemplate/F-12/stringtemplate-3.1-build-junit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- stringtemplate-3.1-build-junit.patch	5 Apr 2008 17:29:20 -0000	1.1
+++ stringtemplate-3.1-build-junit.patch	30 Jan 2010 17:01:36 -0000	1.2
@@ -1,6 +1,23 @@
---- stringtemplate-3.1.orig/build.xml	2008-01-23 21:24:06.000000000 -0500
-+++ stringtemplate-3.1/build.xml	2008-04-04 18:54:46.000000000 -0400
-@@ -235,7 +235,22 @@
+--- build.xml.orig	2009-09-22 23:00:17.000000000 +0200
++++ build.xml	2010-01-29 03:34:13.000000000 +0100
+@@ -94,6 +94,7 @@
+ 
+     <copy todir="${build.src}" filtering="true">
+       <fileset dir="${src.java}" excludes="${src.excludes}"/>
++      <fileset dir="${basedir}${file.separator}test" excludes="${src.excludes}"/>
+     </copy>
+   </target>
+ 
+@@ -110,7 +111,7 @@
+   <!-- =================================================================== -->
+   <!-- Compiles the source code                                            -->
+   <!-- =================================================================== -->
+-  <target name="compile" depends="init, prepare-sources, generator" description="Compiles the sources. (Default)">
++  <target name="compile" depends="init, generator, prepare-sources" description="Compiles the sources. (Default)">
+     <!-- Echo compilation properties -->
+     <echo level="info" message="Compiler    = ${build.compiler}"/>
+     <echo level="info" message="Optimize    = ${compile.optimize}"/>
+@@ -239,7 +240,22 @@
    <!-- =================================================================== -->
    <target name="clean-all" depends="clean-classes,clean-jars, clean-dist">
      <echo message="Cleaned all."/>


Index: stringtemplate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stringtemplate/F-12/stringtemplate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- stringtemplate.spec	27 Jul 2009 04:55:22 -0000	1.4
+++ stringtemplate.spec	30 Jan 2010 17:01:36 -0000	1.5
@@ -1,17 +1,17 @@
 Summary: A Java template engine
 Name: stringtemplate
-Version: 3.1
-Release: 3%{?dist}
+Version: 3.2.1
+Release: 1%{?dist}
 URL: http://www.stringtemplate.org/
-Source0: http://www.stringtemplate.org/download/stringtemplate-3.1.tar.gz
-# Both patches emailed to upstream 20080404
+Source0: http://www.stringtemplate.org/download/stringtemplate-%{version}.tar.gz
+# Build jUnit tests + make the antlr2 generated code before preparing sources
 Patch0: stringtemplate-3.1-build-junit.patch
-Patch1: stringtemplate-3.1-disable-broken-test.patch
 License: BSD
 Group: Development/Libraries
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ant-antlr, ant-junit
+BuildRequires: antlr
 # Standard deps
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
@@ -35,11 +35,10 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0
 
 %build
-rm -f lib/*.jar
+rm -rf lib target
 ant jar
 ant javadocs -Dpackages= -Djavadocs.additionalparam=
 
@@ -50,9 +49,18 @@ install -D build/stringtemplate.jar $RPM
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pR docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
+install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap org.antlr %{name} %{version} JPP %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
 %check
 ant test
 
@@ -60,12 +68,19 @@ ant test
 %defattr(-,root,root)
 %doc LICENSE.txt README.txt
 %{_datadir}/java/*.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%config(noreplace) %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jan 29 2010 Miloš Jakubíček <xjakub at fi.muni.cz> - 3.2.1-1
+- Update to 3.2.1
+- Supply maven POM files
+- Drop stringtemplate-3.1-disable-broken-test.patch (merged upstream)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- stringtemplate-3.1-disable-broken-test.patch DELETED ---