Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.

Conflicts: nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so Former-commit-id: 8b51e353f1 [formerly a962be9a15 [formerly 0b4961e9b0] [formerly 8b51e353f1 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]] Former-commit-id: a962be9a15 [formerly 0b4961e9b0] Former-commit-id: a962be9a15 Former-commit-id: 31ee9b4bdc
2013-08-06 18:15:07 -05:00 · 2013-08-06 18:15:07 -05:00 · d7a09e23cd
commit d7a09e23cd
parent 5c5bcd5313
31 changed files with 4 additions and 5 deletions
--- a/cots/org.jep.linux64/libjep.so
+++ b/cots/org.jep.linux64/libjep.so
--- a/edexOsgi/meteolib.jni.linux64/libmeteoLib.so
+++ b/edexOsgi/meteolib.jni.linux64/libmeteoLib.so
--- a/nativeLib/files.native/awipsShare/hydroapps/bin/runso
+++ b/nativeLib/files.native/awipsShare/hydroapps/bin/runso
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.0
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg.so.6.0
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.0
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libecpg_compat.so.3.0
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.0
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libpgtypes.so.3.0
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id
@ -1 +1 @@
-cbeec8412bbae976431cb0dbe85fc6b9c170253e
+1a32b06c313e625de84f906b3a788e18d5fbf5a4
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
@ -1 +1 @@
-c28b0356ba38c6aa1c3ad220caf3ad27f2534f33
+a86124ed46f7a16af33a87ae5ba9a1c02b870c80
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.util.so
--- a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
+++ b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
--- a/nativeLib/files.native/edex/bin/runso
+++ b/nativeLib/files.native/edex/bin/runso
--- a/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.0
+++ b/nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6.0
--- a/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.0
+++ b/nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3.0
--- a/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0
+++ b/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0
--- a/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.0
+++ b/nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3.0
--- a/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
+++ b/nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
--- a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id
+++ b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.ofs.so.REMOVED.git-id
@ -1 +1 @@
-cbeec8412bbae976431cb0dbe85fc6b9c170253e
+1a32b06c313e625de84f906b3a788e18d5fbf5a4
--- a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
+++ b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
@ -1 +1 @@
-c28b0356ba38c6aa1c3ad220caf3ad27f2534f33
+a86124ed46f7a16af33a87ae5ba9a1c02b870c80
--- a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so
+++ b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.util.so
--- a/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
+++ b/nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
--- a/rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
+++ b/rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
--- a/rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so
+++ b/rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so
--- a/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
+++ b/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
--- a/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
+++ b/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
@ -0,0 +1 @@
+libjasper.so.1.0.0
--- a/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
+++ b/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
--- a/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
+++ b/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
@ -0,0 +1 @@
+libjasper.so.1.0.0
--- a/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
+++ b/rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
--- a/rpms/awips2.core/Installer.xmpp/component.spec
+++ b/rpms/awips2.core/Installer.xmpp/component.spec
@ -16,7 +16,6 @@ Version: %{_xmpp_software_version}
 Release: 2
 Group: AWIPSII
 BuildRoot: /tmp
-BuildArch: noarch
 URL: %{_xmpp_software_url}
 License: %{_xmpp_software_license}
 Distribution: N/A