From 32a278c5f60d1d81ed8c862e736df12e4fcd5bf9 Mon Sep 17 00:00:00 2001
From: Lillian Angel <langel@fedoraproject.org>
Date: Jan 05 2009 19:08:45 +0000
Subject: - Updated batik-repack.sh to remove font files from test resources.

- Resolves: rhbz#477369
Mon Jan 05 2009 Nicolas Chauvet <kwizart@gmail.com> - 1.7-1
- Fix release field
- Repack the source (without included jar files)
- Fix dual listed files in the demo subpackage
- Fix BR subversion used in determine-svn-revision-svn-info
- Fix BR that was previously bundled within the source archive
- Resolves: rhbz#472736

---

diff --git a/.cvsignore b/.cvsignore
index 5216810..68f23ed 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,5 +3,6 @@ batik-squiggle.desktop
 batik.squiggle.script
 batik.svgpp.script
 batik.ttf2svg.script
-batik-src-1.7.zip
 batik.rasterizer.script
+batik-repack.sh
+batik-repack-1.7.zip
diff --git a/batik.spec b/batik.spec
index e7eb194..6fcc97f 100644
--- a/batik.spec
+++ b/batik.spec
@@ -1,34 +1,45 @@
 Name:           batik
 Version:        1.7
-Release:        0.7
+Release:        1%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0
 URL:            http://xml.apache.org/batik/
 Group:          Applications/Multimedia
-Source0:        %{name}-src-%{version}.zip
+#Source0:        http://apache.crihan.fr/dist/xmlgraphics/batik/batik-src-%{version}.zip
+Source0:        %{name}-repack-%{version}.zip
 Source1:        %{name}.squiggle.script
 Source2:        %{name}.svgpp.script
 Source3:        %{name}.ttf2svg.script
 Source4:        %{name}.rasterizer.script
 Source5:        %{name}.slideshow.script
 Source6:        %{name}-squiggle.desktop
+Source7:       %{name}-repack.sh
 Patch0:         %{name}-manifests.patch
 Patch1:         %{name}-policy.patch
 Requires:       rhino >= 1.5
-Requires:       xml-commons-apis >= 1.3.04
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
+BuildRequires:  java-1.6.0-openjdk-devel >= 1:1.6.0.0
+BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  ant
+BuildRequires:  ant-trax
+BuildRequires:  subversion
+
+BuildRequires:  jython
 BuildRequires:  rhino >= 1.5
 BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  xerces-j2
-BuildRequires:  jython
+BuildRequires:  xml-commons-apis >= 1.3.04
+
 BuildRequires:  java-javadoc
 BuildRequires:  rhino-javadoc
-BuildRequires:  %{__perl}
-BuildRequires:  java-1.7.0-icedtea >= 1.7.0.0
-BuildArch:      noarch
+
+Requires:       java >= 1:1.6.0.0
+Requires:       rhino >= 1.5
+Requires:       xml-commons-apis >= 1.3.04
+
 
 %description
 Batik is a Java(tm) technology based toolkit for applications that want
@@ -115,17 +126,29 @@ rm -f `find -name properties`
 
 
 %build
-export CLASSPATH=$CLASSPATH:/usr/share/java/ant/ant-trax-1.7.0.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/ant/ant-trax.jar
 export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis.jar
 export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis-ext.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/js.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/rhino.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/xalan-j2.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/xerces-j2.jar
 ant all-jar \
-        javadoc \
+	-Ddebug=on \
+        -Dsun-codecs.present=false \
+        -Dsun-codecs.disabled=true \
         svg-pp-jar \
         svg-slideshow-jar \
         squiggle-jar \
         rasterizer-jar \
         ttf2svg-jar
 
+for j in $(find batik-%{version} -name *.jar); do
+ export CLASSPATH=$CLASSPATH:${j}
+done
+ant javadoc
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -165,6 +188,10 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr contrib resources samples test-resources test-sources \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+#Fix perms
+chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/rasterizertask/build.sh 
+chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -208,11 +235,21 @@ rm -rf $RPM_BUILD_ROOT
 %files demo
 %defattr(-,root,root,-)
 %{_datadir}/%{name}
-%attr(0755,root,root) %{_datadir}/%{name}/contrib/rasterizertask/build.sh 
-%attr(0755,root,root) %{_datadir}/%{name}/contrib/charts/convert.sh
 
 
 %changelog
+* Mon Jan 05 2009 Lillian Angel  <langel@redhat.com> - 1.7-1
+- Updated batik-repack.sh to remove font files from test resources.
+- Resolves: rhbz#477369
+
+* Mon Jan 05 2009 Nicolas Chauvet <kwizart@gmail.com> - 1.7-1
+- Fix release field
+- Repack the source (without included jar files)
+- Fix dual listed files in the demo subpackage
+- Fix BR subversion used in determine-svn-revision-svn-info
+- Fix BR that was previously bundled within the source archive
+- Resolves: rhbz#472736
+
 * Fri Nov 28 2008 Lillian Angel <langel at redhat.com> - 1.7-0.7
 - Fixed BASE_JARS in batik.rasterizer.script.
 - Resolves: rhbz#455397
diff --git a/sources b/sources
index 588e594..2a6acdd 100644
--- a/sources
+++ b/sources
@@ -2,6 +2,7 @@
 c20cbde45a96e45bf6e657b50b4fa8e2  batik-squiggle.desktop
 0e2b0bc15b89eef1b72306ebcce4075b  batik.svgpp.script
 96002f6d0e61453b72dc8183e0dce9c8  batik.ttf2svg.script
-c117ca2241907f62a2b3031167ebf917  batik-src-1.7.zip
 83bd841d2e11c265c930765d974480c4  batik.squiggle.script
 41e4dcaacf99bb8e583ee3e7e04e662f  batik.rasterizer.script
+26100fd0b228e3466c4e1788589140b3  batik-repack.sh
+207f23ed2d90e9b9982f739398834c4d  batik-repack-1.7.zip