[svgsalamander] Update to last svn revision (106)

[Cédric OLIVIER]

commit 7a1af61153e94b0bba60be0e1d39fa448e980784
Author: cquad <cedric.olivier at free.fr>
Date:   Sat Jan 21 17:50:16 2012 +0100

    Update to last svn revision (106)

 sources                                |    2 +-
 svgsalamander-generate-tarball.sh      |    5 +---
 svgsalamander-source-1.5-version.patch |   20 -----------------
 svgsalamander.spec                     |   36 +++++++++++++++----------------
 4 files changed, 19 insertions(+), 44 deletions(-)
---
diff --git a/sources b/sources
index d18d811..539b6b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4020018967ad3d7b810f3c0175f13a10  svgsalamander-0.0.tar.gz
+eb1ba99314e3832faeea50419caebc92  svgsalamander-0.0.tar.gz
diff --git a/svgsalamander-generate-tarball.sh b/svgsalamander-generate-tarball.sh
index 07ce231..a368090 100644
--- a/svgsalamander-generate-tarball.sh
+++ b/svgsalamander-generate-tarball.sh
@@ -8,10 +8,7 @@ NAME=svgsalamander
 rm -rf ${NAME_VERSION} 
 
 # cheking out svgSalamander svn
-svn export https://svn.java.net/svn/svgsalamander~svn/tags/release-0.0 ${NAME_VERSION}  
-
-# Delete org.apache.tools.bzip2, it can be found in buildrequires ant package
-rm -r ${NAME_VERSION}/src/org/apache
+svn export https://svn.java.net/svn/svgsalamander~svn/trunk/ ${NAME_VERSION}  
 
 # creating source tar
 tar zcvf ${NAME_VERSION}.tar.gz ${NAME_VERSION}
diff --git a/svgsalamander.spec b/svgsalamander.spec
index a653485..dbeafeb 100644
--- a/svgsalamander.spec
+++ b/svgsalamander.spec
@@ -1,9 +1,11 @@
 #
 # spec file for package svgsalamander
 
+%global svn_revision 106
+
 Name:           svgsalamander
 Version:        0.0
-Release:        5%{?dist}
+Release:        6.%{svn_revision}svn%{?dist}
 Summary:        An SVG engine for Java
 
 Group:          Development/Libraries
@@ -13,15 +15,13 @@ Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}-generate-tarball.sh
 #Source built using the following commands : sh svgSalamander-generate-tarball.sh
 
-#patch to change source 1.4 to 1.5 when calling javac
-Patch1:         %{name}-source-1.5-version.patch
-
 BuildArch:      noarch
 BuildRequires:  jpackage-utils 
 BuildRequires:  junit
-BuildRequires:  ant
+BuildRequires:  maven
 BuildRequires:  java-devel
-BuildRequires:  javacc
+BuildRequires:  javacc-maven-plugin
+BuildRequires:  maven-enforcer-plugin
 Requires:       java
 Requires:       jpackage-utils
 Requires(post): jpackage-utils
@@ -46,16 +46,10 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q
-%patch1 -p0
-
-
 
 find . -name '*.jar' -exec rm -f '{}' \;
 find . -name '*.class' -exec rm -f '{}' \;
 
-# Fix rights
-chmod a-x www/docs/*.html www/docs/exampleCode/*
-
 # Remove DOS line endings
 for file in www/docs/*.html www/docs/exampleCode/*.html; do
   sed 's|\r||g' $file >$file.new && \
@@ -65,16 +59,15 @@ done
 
 
 %build
-ant -Djavacc.home=$(dirname $(build-classpath javacc)) \
-    -Djunit.jar=$(build-classpath junit)
+pushd svg-core
+mvn-rpmbuild install javadoc:aggregate 
+popd
 
 %install
 mkdir -p %{buildroot}%{_javadir}
-
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp build/javadoc %{buildroot}%{_javadocdir}/%{name}
 
-install -Dpm 0644 build/jar/svgSalamander.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -Dpm 0644 svg-core/target/kitfox-svg-salamander-1.0.8.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/svgSalamander.jar
 
 install -Dpm 644 www/maven/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
@@ -103,8 +96,13 @@ install -Dpm 644 www/maven/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.p
 
 
 %changelog
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Tue Jan 17 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0.0-6.106svn
+- Update to last svn snapshot - new method needed by another package : josm
+- Build with maven (it was ant before)
+- Remove docs rights fix (updated in upstream)
+
+* Wed Oct 05 2011 Cédric OLIVIER <cedric.olivier at free.fr> 0.0-5
+- Add ant.jar in classpath
 
 * Wed Oct 05 2011 Cédric OLIVIER <cedric.olivier at free.fr> 0.0-4
 - Fix stange permissions on svgsalamander-generate-tarball.sh