[jboss-as/f19] Make the jboss-as package run smoothly with oVirt and others

[Marek Goldmann]

commit eea32c1dec4dba7f23c71a58639026541a3a5a77
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Mon Jun 17 21:53:43 2013 +0200

    Make the jboss-as package run smoothly with oVirt and others
    
    - Fix dangling symlinks
    - ovirt-engine fails to start on Fedora 19 RHBZ#972738
    - Fixes issues with other renamed jars

 jboss-as.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/jboss-as.spec b/jboss-as.spec
index d63153c..867651a 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -19,7 +19,7 @@
 
 Name:             jboss-as
 Version:          7.1.1
-Release:          19%{?dist}
+Release:          20%{?dist}
 Summary:          JBoss Application Server
 Group:            System Environment/Daemons
 License:          LGPLv2 and ASL 2.0
@@ -716,7 +716,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
     ln -s $(build-classpath apache-scout) org/apache/juddi/scout/main/apache-scout.jar
 
     for m in core dom storage; do
-      ln -s $(build-classpath apache-mime4j/${m}) org/apache/james/mime4j/main/${m}.jar
+      ln -s $(build-classpath apache-mime4j/${m}) org/apache/james/mime4j/main/apache-mime4j-${m}.jar
     done
 
     ln -s $(build-classpath antlr) org/antlr/main/antlr.jar
@@ -965,7 +965,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
     ln -s $(build-classpath weld-api/weld-api) org/jboss/weld/api/main/weld-api.jar
     ln -s $(build-classpath weld-api/weld-spi) org/jboss/weld/spi/main/weld-spi.jar
     ln -s $(build-classpath weld-core) org/jboss/weld/core/main/weld-core.jar
-    ln -s $(build-classpath woodstox-core-asl) org/codehaus/woodstox/main/woodstox-core-asl.jar
+    ln -s $(build-classpath woodstox-core) org/codehaus/woodstox/main/woodstox-core.jar
     ln -s $(build-classpath wsdl4j) javax/wsdl4j/api/main/wsdl4j.jar
     ln -s $(build-classpath wss4j) org/apache/ws/security/main/wss4j.jar
     ln -s $(build-classpath xalan-j2) org/apache/xalan/main/xalan-j2.jar
@@ -978,6 +978,8 @@ pushd $RPM_BUILD_ROOT%{homedir}
     ln -s $(build-classpath xnio-api) org/jboss/xnio/main/xnio-api.jar
     ln -s $(build-classpath xnio-nio) org/jboss/xnio/nio/main/xnio-nio.jar
     ln -s $(build-classpath xom) nu/xom/main/xom.jar
+    # Workaround, fix after it'll be fixed in xom package
+    ln -s $(build-classpath xom) nu/xom/main/xom-1.0.jar
   popd
 popd
 
@@ -1013,8 +1015,8 @@ popd > /dev/null
 pushd %{homedir}/modules/org/jboss/as/web/main/lib/linux-${arch} > /dev/null
   ln -sf ${libdir}/libjbnative-1.so.0 libtcnative-1.so
   ln -sf ${libdir}/libapr-1.so.0 libapr-1.so
-  ln -sf ${libdir}/libcrypto.so libcrypto.so
-  ln -sf ${libdir}/libssl.so libssl.so
+  ln -sf ${libdir}/libcrypto.so.10 libcrypto.so
+  ln -sf ${libdir}/libssl.so.10 libssl.so
 popd > /dev/null
 
 %systemd_post jboss-as.service
@@ -1074,6 +1076,11 @@ rm -rf %{homedir}/modules/org/hornetq/main/lib/linux-${arch}/*
 %doc %{homedir}/LICENSE.txt
 
 %changelog
+* Mon Jun 17 2013 Marek Goldmann <mgoldman at redhat.com> - 7.1.1-20
+- Fix dangling symlinks
+- ovirt-engine fails to start on Fedora 19 RHBZ#972738
+- Fixes issues with other renamed jars
+
 * Thu May 23 2013 Marek Goldmann <mgoldman at redhat.com> - 7.1.1-19
 - Fix the jar symlinks
 - Make it possible to launch the domain mode using systemd service