system-officeotron-and-odfvalidator

===================================================================

Gbp-Pq: Name system-officeotron-and-odfvalidator.diff

diff --git a/bin/odfvalidator.sh.in b/bin/odfvalidator.sh.in
index 56e2f2985f04dc0df2f32aca49e02b1beb0293d0..451af10a7be8c59fe5a3d91a3fd63441574c1d30 100644 (file)
--- a/bin/odfvalidator.sh.in
+++ b/bin/odfvalidator.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar @TARFILE_LOCATION@/@ODFVALIDATOR_JAR@ -e "$@"
+java -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar /usr/share/java/odfvalidator.jar -e "$@"

diff --git a/bin/officeotron.sh.in b/bin/officeotron.sh.in
index 7281f1bcd17c5af70234392c1b038c37041c4ed6..6eab5b5cdc66e66d64c297bbc4234ffc94ae2544 100644 (file)
--- a/bin/officeotron.sh.in
+++ b/bin/officeotron.sh.in
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-java -jar @TARFILE_LOCATION@/@OFFICEOTRON_JAR@ "$@"
+java -jar /usr/share/java/officeotron.jar "$@"