[jboss-as/f17: 6/6] jboss-web-native changes

[Marek Goldmann]

commit aa786598f7c0451810d61375ea17457e6a7bf3f8
Author: Marek Goldmann <mgoldman at redhat.com>
Date:   Tue May 1 15:16:26 2012 +0200

    jboss-web-native changes

 ...sweb-native-dependency.-We-ll-have-unpack.patch |   29 ++++++++++++++++++++
 jboss-as.spec                                      |   25 ++++++++++++++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/0052-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch b/0052-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch
new file mode 100644
index 0000000..c00fb22
--- /dev/null
+++ b/0052-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch
@@ -0,0 +1,29 @@
+From 6299915111ab611446d79daf3b271a38368b96a3 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Thu, 26 Apr 2012 18:41:09 +0200
+Subject: [PATCH 52/52] Remove jbossweb-native dependency. We'll have
+ unpackaged .so files in jboss-web-native package.
+
+---
+ build/pom.xml |    5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/build/pom.xml b/build/pom.xml
+index fea222d..df3087f 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -349,11 +349,6 @@
+ 
+         <dependency>
+             <groupId>org.jboss.as</groupId>
+-            <artifactId>jbossweb-native</artifactId>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.jboss.as</groupId>
+             <artifactId>jboss-as-naming</artifactId>
+         </dependency>
+ 
+-- 
+1.7.10
+
diff --git a/jboss-as.spec b/jboss-as.spec
index ef16ec7..663de0b 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -81,6 +81,7 @@ Patch47:          0048-Added-org.jboss.as.mail-module.patch
 Patch48:          0049-Added-org.jboss.as.jaxrs-module.patch
 Patch49:          0050-Added-org.jboss.as.pojo-module.patch
 Patch50:          0051-Loose-banned-deps-on-javax.xml.stream-stax-api.patch
+Patch51:          0052-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch
 
 BuildArch:        noarch
 
@@ -189,6 +190,7 @@ BuildRequires:    xnio
 Requires:         atinject
 Requires:         apache-commons-logging
 Requires:         apache-commons-collections
+Requires:         apr
 Requires:         bean-validation-api
 Requires:         cal10n
 Requires:         cdi-api
@@ -260,6 +262,7 @@ Requires:         jul-to-slf4j-stub
 Requires:         joda-time
 Requires:         jpackage-utils
 Requires:         mojarra
+Requires:         openssl
 Requires:         picketbox
 Requires:         picketbox-commons
 Requires:         resteasy >= 2.3.2-6
@@ -342,6 +345,7 @@ This package contains the API documentation for %{name}.
 %patch48 -p1
 %patch49 -p1
 %patch50 -p1
+%patch51 -p1
 
 %build
 # We don't have packaged all test dependencies (jboss-test for example)
@@ -430,7 +434,7 @@ pushd build/target/jboss-as-%{namedversion}
   rm -rf bin/initscripts
 
   # Prepare directory for properties files
-  mkdir docs/examples/properties
+  install -d -m 755 docs/examples/properties
 
   # Copy logging.properties and mgmt-users.properties so we can reuse it later in jboss-as-cp script
   cp standalone/configuration/logging.properties docs/examples/properties/
@@ -487,6 +491,25 @@ pushd $RPM_BUILD_ROOT%{homedir}
   
   # Create symlinks to jars
   pushd modules
+    # AS7 relies on some arch specific binary modules, let's link them both and don't check if they exists.
+    # At least one of these should exists because we require them, but we're not very interested which one.
+    for a in i686 x86_64; do
+      install -d -m 755 org/jboss/as/web/main/lib/linux-${a}
+
+      if [ "${a}" = "x86_64" ]; then
+        libdir="/usr/lib64"
+      else
+        libdir="/usr/lib"
+      fi
+
+      pushd org/jboss/as/web/main/lib/linux-${a}
+        ln -s ${libdir}/libjbnative-1.so.0 libtcnative-1.so
+        ln -s ${libdir}/libapr-1.so.0 libapr-1.so
+        ln -s ${libdir}/libcrypto.so libcrypto.so
+        ln -s ${libdir}/libssl.so libssl.so
+      popd
+    done
+
     # JBoss AS modules
     # Symlinks all main AS7 modules + some addtiional modules that have different naming scheme
     for m in %{modules} domain-http-error-context domain-http-interface; do