[jspecview] Update to newest svn, remove bundling of libraries.
Susi Lehtola
jussilehtola at fedoraproject.org
Wed May 7 15:58:21 UTC 2014
commit ed3aea46d59a3e2db0533d67ec14938d5017d023
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date: Wed May 7 18:58:43 2014 +0300
Update to newest svn, remove bundling of libraries.
.gitignore | 1 +
jspecview-fedora.patch | 73 +++++++++++++++++++++++++++++-------------------
jspecview.spec | 15 ++++++---
sources | 2 +-
4 files changed, 56 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3284be0..c7e15f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/jspecview-1169svn.tar.bz2
/jspecview-1171svn.tar.xz
/jspecview-1464svn.tar.xz
+/jspecview-1649svn.tar.xz
diff --git a/jspecview-fedora.patch b/jspecview-fedora.patch
index 8fb1e0a..c0eaad2 100644
--- a/jspecview-fedora.patch
+++ b/jspecview-fedora.patch
@@ -1,6 +1,6 @@
diff -up jspecview/JSpecView/build.xml.fedora jspecview/JSpecView/build.xml
---- jspecview/JSpecView/build.xml.fedora 2014-01-01 22:34:33.000000000 +0200
-+++ jspecview/JSpecView/build.xml 2014-01-01 22:46:36.871615760 +0200
+--- jspecview/JSpecView/build.xml.fedora 2014-05-07 18:46:32.000000000 +0300
++++ jspecview/JSpecView/build.xml 2014-05-07 18:50:18.169164378 +0300
@@ -21,6 +21,7 @@
</classpath>
</taskdef>
@@ -18,36 +18,33 @@ diff -up jspecview/JSpecView/build.xml.fedora jspecview/JSpecView/build.xml
<property name="debug" value="off" />
<property file="TODO.txt" prefix="TODO.txt" />
<property file="build_info.properties"/>
-@@ -75,16 +76,18 @@
+@@ -77,6 +78,7 @@
-->
<target name="build">
-- <echo message="copying files from ${jmol.path}/src/org/jmol/api"/>
-- <delete quiet="true">
-- <fileset dir="src/org/jmol" includes="**/*.java"/>
-- </delete>
-- <copy overwrite="true" todir="src/org/jmol" >
-- <fileset dir="${jmol.path}/src/org/jmol">
-- <include name="api/JmolSyncInterface.java" />
-- <include name="api/JSVInterface.java" />
-- </fileset>
-- </copy>
-+ <!--
-+ <echo message="copying files from ${jmol.path}/src/org/jmol/api"/>
-+ <delete quiet="true">
-+ <fileset dir="src/org/jmol" includes="**/*.java"/>
-+ </delete>
-+ <copy overwrite="true" todir="src/org/jmol" >
-+ <fileset dir="${jmol.path}/src/org/jmol">
-+ <include name="api/JmolSyncInterface.java" />
-+ <include name="api/JSVInterface.java" />
-+ </fileset>
-+ </copy>
++<!--
+ <echo message="copying files from ${jmol.path}/src/org/jmol"/>
+ <delete quiet="true">
+ <fileset dir="src/org/jmol" includes="**/*.java"/>
+@@ -106,6 +108,8 @@
+ </fileset>
+ </copy>
+ </then></if>
+-->
-
- <echo message="getting application icons and resources"/>
++
+
+ <echo message="getting application icons and resources"/>
<mkdir dir="${bin.dir}"/>
-@@ -135,17 +138,19 @@
+@@ -140,7 +144,7 @@
+ </linecontains>
+ </filterchain>
+ </copy>
+- <unjar dest="${bin.dir}" src="${lib.dir}/netscape.jar"/>
++ <!--<unjar dest="${bin.dir}" src="${lib.dir}/netscape.jar"/>-->
+ <jar destfile="${build.dir}/${ant.project.name}.app.${build.number}_unsigned.jar" manifest="manifests/application.txt">
+ <fileset dir="${bin.dir}">
+ <include name="**/*"/>
+@@ -156,17 +160,19 @@
<copy overwrite="true" file="${build.dir}/${ant.project.name}.app.${build.number}_unsigned.jar"
tofile="${build.dir}/JSpecView.jar">
</copy>
@@ -69,7 +66,16 @@ diff -up jspecview/JSpecView/build.xml.fedora jspecview/JSpecView/build.xml
</target>
<!---
-->
-@@ -183,12 +188,12 @@
+@@ -188,7 +194,7 @@
+ </filterchain>
+ </copy>
+
+- <unjar dest="${bin.dir}" src="${lib.dir}/netscape.jar"/>
++ <!--<unjar dest="${bin.dir}" src="${lib.dir}/netscape.jar"/>-->
+ <jar destfile="${build.dir}/${ant.project.name}.applet.${build.number}_unsigned.jar" manifest="manifests/applet.txt">
+ <fileset dir="${bin.dir}">
+ <exclude name="jspecview/application/**/*"/>
+@@ -204,12 +210,12 @@
<copy overwrite="true" file="${build.dir}/${ant.project.name}.applet.${build.number}_unsigned.jar"
tofile="build/JSpecViewApplet.jar">
</copy>
@@ -84,7 +90,16 @@ diff -up jspecview/JSpecView/build.xml.fedora jspecview/JSpecView/build.xml
<!--
<echo message="copying applet to ${jmol.path}/appletfiles/JSpecViewApplet.jar"/>
-@@ -293,7 +298,6 @@
+@@ -225,7 +231,7 @@
+ <target name="make-signed-applet-jar" depends="make-applet-jar" description="Make all-permission JSpecView applet jar">
+ <antcall target="revision" />
+ <mkdir dir="${build.dir}"/>
+- <unjar dest="${bin.dir}" src="${lib.dir}/netscape.jar"/>
++ <!--<unjar dest="${bin.dir}" src="${lib.dir}/netscape.jar"/>-->
+ <jar destfile="${build.dir}/JSpecViewAppletSigned.jar" manifest="manifests/appletSigned.txt">
+ <fileset dir="${bin.dir}">
+ <exclude name="jspecview/application/**/*"/>
+@@ -314,7 +320,6 @@
</fileset>
</signjar>
</else></if>
diff --git a/jspecview.spec b/jspecview.spec
index 5c1acab..4d80b34 100644
--- a/jspecview.spec
+++ b/jspecview.spec
@@ -1,4 +1,4 @@
-%global svnrel 1464
+%global svnrel 1649
Name: jspecview
Version: 2
@@ -11,7 +11,7 @@ URL: http://jspecview.sourceforge.net/
# Upstream does not release stable source tarballs. Tarball created with attached script.
Source0: jspecview-%{svnrel}svn.tar.xz
Source1: generate-sources.sh
-# Fedora patches: no JMol bindings, no signing
+# Fedora patches: no JMol bindings, no signing, no bundling
Patch0: jspecview-fedora.patch
BuildArch: noarch
@@ -23,7 +23,8 @@ BuildRequires: icedtea-web
BuildRequires: eclipse
Requires: jpackage-utils
-Requires: java-headless
+Requires: icedtea-web
+Requires: java
%description
The JSpecView Project provides JAVA applets for the display of
@@ -57,6 +58,9 @@ find -name '*.jar' -exec rm -f '{}' \;
cp -a %{_datadir}/icedtea-web/plugin.jar JSpecView/libs/netscape.jar
%build
+# Files are UTF-8 encoded
+export ANT_OPTS="-Dfile.encoding=UTF8"
+
# Build library
cd JSpecViewLib
ant
@@ -92,8 +96,9 @@ cp -rp JSpecView/doc/ %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}/
%changelog
-* Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 2-8.1464svn
-- Use Requires: java-headless rebuild (#1067528)
+* Wed May 07 2014 Susi Lehtola <jussilehtola at fedoraproject.org> - 2-8.1649svn
+- Remove bundled libraries (BZ #1095316).
+- Update to revision 1649.
* Thu Mar 06 2014 Michal Srb <msrb at redhat.com> - 2-7.1464svn
- Remove unneeded BR: itext
diff --git a/sources b/sources
index b412874..e76ec36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b4c97c687ce41a29ed30b33fa2a37ad jspecview-1464svn.tar.xz
+cd9077255a10a39bd0408108001594d4 jspecview-1649svn.tar.xz
More information about the scm-commits
mailing list