Bryan Kowal
a7d9b9fc11
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Conflicts:
nativeLib/files.native/files.native.ecl
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.cots.g2clib/.project
nativeLib/rary.cots.g2clib/g2_unpack3.c
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
Former-commit-id: 2ebed2011f
[formerly 4d7a4aefec
] [formerly 665911b033
] [formerly 2ebed2011f
[formerly 4d7a4aefec
] [formerly 665911b033
] [formerly c76c856340
[formerly 665911b033
[formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]]
Former-commit-id: c76c856340
Former-commit-id: f37abe3599
[formerly 7a83214b1c
] [formerly a87ff201ab972ea4012700b7f82b08857452a1f6 [formerly 0954490a5a
]]
Former-commit-id: da8082dd7ce7ed30ca84ffbe89c5465a9f2b305e [formerly 6e08dc72c0
]
Former-commit-id: 731efe0fb6
2013-10-31 15:23:08 -05:00
Steve Harris
6b1df92d87
14.1.1-5 baseline
...
Former-commit-id: 31eefc21cd
[formerly 933e7395ac
] [formerly 877776a04c
] [formerly 31eefc21cd
[formerly 933e7395ac
] [formerly 877776a04c
] [formerly f4c53b02fa
[formerly 877776a04c
[formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]]
Former-commit-id: f4c53b02fa
Former-commit-id: 7de3535d64
[formerly 3b738baba8
] [formerly ba0194dff6dd3d0a89190211a15a136f32ca0270 [formerly af2707389c
]]
Former-commit-id: 900d27f61f6ae40659280476bc184bfecf0849a7 [formerly 92851705fc
]
Former-commit-id: 09eee9a31a
2013-10-28 12:14:27 -04:00
Steve Harris
cbf859daf6
14.1.1-4 baseline
...
Former-commit-id: cb3b53f205
[formerly 82dec19b6a
] [formerly bd95bb6a4e
] [formerly cb3b53f205
[formerly 82dec19b6a
] [formerly bd95bb6a4e
] [formerly 99e3707c5b
[formerly bd95bb6a4e
[formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef
[formerly b60635cd70
] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e
]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42
]
Former-commit-id: da4589ec2b
2013-10-28 10:55:16 -04:00
Steve Harris
c784003711
14.1.1-3 baseline
...
Former-commit-id: a0ba2e1252
[formerly 851f9df229
] [formerly 94f24e0d8a
] [formerly a0ba2e1252
[formerly 851f9df229
] [formerly 94f24e0d8a
] [formerly 5739b4f832
[formerly 94f24e0d8a
[formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d
[formerly aa59400b67
] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea
]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4
]
Former-commit-id: 472c0a1a5e
2013-10-28 10:46:02 -04:00
Bryan Kowal
57da7e4a76
Issue #2396 - updated grib2.so to use a newer version of g2clib
...
Former-commit-id: a564f382da
[formerly 2ad7db4f5d
] [formerly b7b11dc747
] [formerly a564f382da
[formerly 2ad7db4f5d
] [formerly b7b11dc747
] [formerly 9a472e1bbe
[formerly b7b11dc747
[formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]]]
Former-commit-id: 9a472e1bbe
Former-commit-id: d6ea68d9c5
[formerly b1bdf0dbc5
] [formerly 8d9c6dc200980dd6606b3b3826f070666ae2fefa [formerly f892849313
]]
Former-commit-id: 717b0e4321c98c5d3d3288436344edb96c5d1300 [formerly 83c0c7e365
]
Former-commit-id: 15cb18c19f
2013-10-16 12:54:58 -05:00
Bryan Kowal
537228e934
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 80c2ccd547
[formerly 96c800f3f4
] [formerly 5eba3290c8
] [formerly 80c2ccd547
[formerly 96c800f3f4
] [formerly 5eba3290c8
] [formerly 8f14318bc7
[formerly 5eba3290c8
[formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]]
Former-commit-id: 8f14318bc7
Former-commit-id: ef0e6ede56
[formerly 72ed6c5f7a
] [formerly d3917f8d40a980b637b27fc44df2b93eff0d5796 [formerly 53af4c7284
]]
Former-commit-id: 7f36b6b414d057a6775afb670b148d983edab252 [formerly 5477a06781
]
Former-commit-id: b8c2ece19c
2013-10-08 10:35:03 -05:00
Steve Harris
90889f8aa3
13.5.2-8 baseline
...
Former-commit-id: 553238dca4
[formerly 8ba7d392d6
] [formerly 94aa71fcd1
] [formerly 553238dca4
[formerly 8ba7d392d6
] [formerly 94aa71fcd1
] [formerly 18325949fb
[formerly 94aa71fcd1
[formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96
[formerly 21b84f0290
] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9
]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7
]
Former-commit-id: e1f7463a41
2013-10-04 11:30:03 -04:00
Bryan Kowal
ea88581637
Issue #2432 - fix qpid build
...
Former-commit-id: 20cf44791d
[formerly fdf31a8a6e
] [formerly 5db663c2ae
] [formerly 20cf44791d
[formerly fdf31a8a6e
] [formerly 5db663c2ae
] [formerly 6736231873
[formerly 5db663c2ae
[formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]]]
Former-commit-id: 6736231873
Former-commit-id: 51cf9ed479
[formerly bd93d164c7
] [formerly f0d8690b42b34a08e3cc25f03f917bd6fd863575 [formerly f100a9c96a
]]
Former-commit-id: 27430e9ec9200cfdcd7eee31ec3a7954ca40324c [formerly 751cd48248
]
Former-commit-id: e874f182ef
2013-10-03 08:33:15 -05:00
Steve Harris
995b29e33c
Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
...
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/python.site-packages/Installer.qpid/component.spec
kept the omaha_14.1.1 versions of the .so files
Former-commit-id: 42cf95b398
[formerly 59f753ee0d
] [formerly fc0cdf4996
] [formerly 42cf95b398
[formerly 59f753ee0d
] [formerly fc0cdf4996
] [formerly 84ad96f2e0
[formerly fc0cdf4996
[formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]]]
Former-commit-id: 84ad96f2e0
Former-commit-id: 7fbcfe7e31
[formerly c2fa80310e
] [formerly fdd4df5abe5cb73e831f675a386f04a37e52c5b9 [formerly c6a4241c5b
]]
Former-commit-id: 88d1ef7b773b7f227f1e41ee678ac1173e134ee6 [formerly 9aa19b42b5
]
Former-commit-id: 160a5819f9
2013-10-01 15:34:01 -05:00
Steve Harris
08f26c03de
13.5.2-7 baseline
...
Former-commit-id: cbda847929
[formerly b5cb693619
] [formerly 0f8fc513bf
] [formerly cbda847929
[formerly b5cb693619
] [formerly 0f8fc513bf
] [formerly a212c30bd7
[formerly 0f8fc513bf
[formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]]
Former-commit-id: a212c30bd7
Former-commit-id: 430d088fae
[formerly 06ba0dbf6c
] [formerly 8a4b80da2796beb7c54f486f50af54a82a51b808 [formerly 02d6145782
]]
Former-commit-id: 2b43017e06d19d174d794056f4c10668bd2a1f3c [formerly 5e4023b974
]
Former-commit-id: 79d71e33d0
2013-09-30 13:05:31 -04:00
Steve Harris
6e9e71c2c6
13.5.2-6 baseline
...
Former-commit-id: 3cb4574635
[formerly 059549438a
] [formerly 3821475d4e
] [formerly 3cb4574635
[formerly 059549438a
] [formerly 3821475d4e
] [formerly 3837fbe670
[formerly 3821475d4e
[formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]]]
Former-commit-id: 3837fbe670
Former-commit-id: 4f4af06329
[formerly 557a7c87d5
] [formerly 3c4113cbd9b34d856c9d3a2aa3b0c92346ba75b4 [formerly 22cb9b98cd
]]
Former-commit-id: 5d26a3bd0b975f9318873a838bde4603b2acc0b7 [formerly f91cf37d43
]
Former-commit-id: b7b8d4a0b7
2013-09-23 10:03:15 -04:00
Bryan Kowal
b5e9b872db
Issue #2334 - only free memory when we actually no longer care about its contents.
...
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4
Former-commit-id: 3794ade854
[formerly 0d9fe24f7b
] [formerly 5e334a7b0e
] [formerly 3794ade854
[formerly 0d9fe24f7b
] [formerly 5e334a7b0e
] [formerly 706920aed6
[formerly 5e334a7b0e
[formerly ac3d847501e41668f923f2ea40572c3894e8dc79]]]]
Former-commit-id: 706920aed6
Former-commit-id: c71603ddb3
[formerly 0f702bf515
] [formerly e3edd648a9a4f9aa02d5b7f1f450f6103f4ca525 [formerly 34f85b41c2
]]
Former-commit-id: 6921b98fb606257b648d735fd115837bd9f437ef [formerly efe4ee8b48
]
Former-commit-id: 129f271175
2013-09-19 17:32:08 -05:00
Bryan Kowal
c853ded300
Issue #2382 - fix qpid amqp path
...
Former-commit-id: 4179f9f927
[formerly b84cb9106f
] [formerly b9f4e93687
] [formerly 4179f9f927
[formerly b84cb9106f
] [formerly b9f4e93687
] [formerly b002df8a06
[formerly b9f4e93687
[formerly 263ce6e82d1ecf3164961b599c2d4aac7d61f783]]]]
Former-commit-id: b002df8a06
Former-commit-id: 77b339ea66
[formerly eb6cc0320c
] [formerly f786adcc134d577e9f93acb1482d9559bd497a3f [formerly 8ce22ec91a
]]
Former-commit-id: a28b2aebd008f7e196b19bc60c3a0c73f9bf601f [formerly f10a1a5ac2
]
Former-commit-id: 5889733924
2013-09-17 17:51:43 -05:00
Steve Harris
bbbcc661b7
13.5.2-5 baseline
...
Former-commit-id: dc60765dcb
[formerly 31111f4f52
] [formerly 0745317d53
] [formerly dc60765dcb
[formerly 31111f4f52
] [formerly 0745317d53
] [formerly 67cceefe5d
[formerly 0745317d53
[formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]]]]
Former-commit-id: 67cceefe5d
Former-commit-id: 4c4dd59711
[formerly c8ead44672
] [formerly 738f26259951c00c72cc70df42f55b887349b3ef [formerly 6202bacae1
]]
Former-commit-id: e26890a39b824d77b4f4c3c0acd1eed489865f1e [formerly c79546c83a
]
Former-commit-id: fb70a4b4b0
2013-09-16 10:14:25 -04:00
Bryan Kowal
eb4df10d2e
Issue #2356 - update httpd-collaboration configuration for new httpd version and RHEL6
...
Former-commit-id: c775cb0879
[formerly ac9a5ad4d9
] [formerly 21d395a914
] [formerly c775cb0879
[formerly ac9a5ad4d9
] [formerly 21d395a914
] [formerly 646d61335d
[formerly 21d395a914
[formerly 21ac850e9cf61f58a324f17ee687f50cda7c5804]]]]
Former-commit-id: 646d61335d
Former-commit-id: 1ae63f3157
[formerly 118ea128c6
] [formerly 34755fb2aa71834eccf3544a836d15e84ca85428 [formerly 8d936cbfc3
]]
Former-commit-id: 97589af62028e23987817c22a77c1996d345657f [formerly 499377b332
]
Former-commit-id: fc6554a658
2013-09-12 13:08:07 -05:00
Steve Harris
3a21a9eb6c
13.5.2-4 baseline
...
Former-commit-id: 3d0b711ccf
[formerly 595e7bc0d9
] [formerly e3c935d48b
] [formerly 3d0b711ccf
[formerly 595e7bc0d9
] [formerly e3c935d48b
] [formerly 58c6821427
[formerly e3c935d48b
[formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]]
Former-commit-id: 58c6821427
Former-commit-id: a8201afb82
[formerly 4c6790f10f
] [formerly 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59
]]
Former-commit-id: d4668ee6901a6bb072be3a88eaad320aed699c0f [formerly e2398f74e5
]
Former-commit-id: 609926f1f4
2013-09-12 11:13:59 -04:00
Bryan Kowal
53299750f2
Issue #2356 - pypies configuration updates and RHEL6 compatibility updates
...
Former-commit-id: 7125f37454
[formerly 938e49d7f1
] [formerly 826d5e1c78
] [formerly 7125f37454
[formerly 938e49d7f1
] [formerly 826d5e1c78
] [formerly ca9597b66a
[formerly 826d5e1c78
[formerly 2f1617632a5d24748e915066a7209839bca3f68a]]]]
Former-commit-id: ca9597b66a
Former-commit-id: 3a1d03c001
[formerly baab46f8d1
] [formerly 84d980d70d0ce9c1e1176eca66b2e53a40563d1e [formerly 1a59a35500
]]
Former-commit-id: 99860085b5648dfcafff0d995e58d24221ed6792 [formerly c2fbbdc727
]
Former-commit-id: f4dbb79115
2013-09-11 17:34:19 -05:00
Bryan Kowal
8c19f264bc
Issue #2343 - resolve AWIPS II httpd depenency issue
...
Former-commit-id: 5e9e23ffa6
[formerly b6d787103b
] [formerly 18756316ce
] [formerly 5e9e23ffa6
[formerly b6d787103b
] [formerly 18756316ce
] [formerly 9a370ca614
[formerly 18756316ce
[formerly b5081a38c6d90f47a625fde975f717ff4f63215f]]]]
Former-commit-id: 9a370ca614
Former-commit-id: 1d0f7a96d2
[formerly 3e27389e5b
] [formerly bc7a84e1a11d7e93be480b3c93b8f2e1b8d046c9 [formerly aa88d48c30
]]
Former-commit-id: ff7af534e5b4189990c45acec19208c3a2f4e5c6 [formerly 00696f6876
]
Former-commit-id: 89ee59610b
2013-09-10 17:04:35 -05:00
Bryan Kowal
06ab49af49
Issue #2163 - disable Java 7 build
...
Former-commit-id: b2871f542b
[formerly e062b24680
] [formerly f8c0886d52
] [formerly b2871f542b
[formerly e062b24680
] [formerly f8c0886d52
] [formerly 101fd09211
[formerly f8c0886d52
[formerly eb2bba4ac4a43eff894a23f714c8b71fba20419c]]]]
Former-commit-id: 101fd09211
Former-commit-id: 3a37ab654c
[formerly 4f859e716c
] [formerly e88e489fbfdc65a5fb95edd76f00600dbdd7b328 [formerly 4c1a283575
]]
Former-commit-id: 4e916ad3938b1694e7bc9e5fce691587a5f791b9 [formerly 2174e72247
]
Former-commit-id: 33de2c0b6b
2013-09-09 09:46:09 -05:00
Bryan Kowal
24b03aada7
Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
...
Former-commit-id: a58482866f
[formerly 6578b9a7de
] [formerly 1adf764747
] [formerly a58482866f
[formerly 6578b9a7de
] [formerly 1adf764747
] [formerly 79e88c19aa
[formerly 1adf764747
[formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]]]
Former-commit-id: 79e88c19aa
Former-commit-id: 7b209d0c22
[formerly 2a35fb001d
] [formerly 4410ae3e4d51d61cc16e04ba9bb3b7110221a5a9 [formerly aa8eb47b95
]]
Former-commit-id: 6a4e910bd056845f6fdb0a5b822d117601347bd7 [formerly 8dad5af165
]
Former-commit-id: 39bd67265e
2013-09-06 12:30:01 -05:00
Bryan Kowal
7ae23cb1c3
Issue #2163 - fix Eclipse CDT metadata after merge
...
Former-commit-id: 277d72298e
[formerly ea4cbc4c9a
] [formerly 351824fb85
] [formerly 277d72298e
[formerly ea4cbc4c9a
] [formerly 351824fb85
] [formerly b88a13d3b5
[formerly 351824fb85
[formerly 7502d12a78c68f56e33a41bae7b3346d195ad79f]]]]
Former-commit-id: b88a13d3b5
Former-commit-id: f5b3756c16
[formerly 1918d5e96a
] [formerly 36773401b7a2515d282f22c11fbcd2c522248e81 [formerly 4670dcb9a7
]]
Former-commit-id: 4bc71d478d9262168bd340a7de1878463148855a [formerly 8e1df0bda0
]
Former-commit-id: c9a29b19ff
2013-09-04 14:49:47 -05:00
Bryan Kowal
7788062ef9
Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
...
Former-commit-id: 2374999571
[formerly 41ab242c2d
] [formerly a02d910023
] [formerly 2374999571
[formerly 41ab242c2d
] [formerly a02d910023
] [formerly 03cadc5aa9
[formerly a02d910023
[formerly 422e9b611535e9c20338041e0e1af62d38aab047]]]]
Former-commit-id: 03cadc5aa9
Former-commit-id: 2fbf708d37
[formerly 9c890422fa
] [formerly a1835e61d037b5682286f5b833659d21414debeb [formerly 65bb1ec74b
]]
Former-commit-id: 86188daec355e915f4360626abcc95dfc640869c [formerly bcb07a8f39
]
Former-commit-id: 7ea8a63f32
2013-09-04 13:48:08 -05:00
Steve Harris
58c92ee186
13.5.2-3 baseline
...
Former-commit-id: 7008da4acd
[formerly 91fb128c17
] [formerly 9fdd0e51a0
] [formerly 7008da4acd
[formerly 91fb128c17
] [formerly 9fdd0e51a0
] [formerly bae0a20b8e
[formerly 9fdd0e51a0
[formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]]]]
Former-commit-id: bae0a20b8e
Former-commit-id: c232631639
[formerly 8ac02ce922
] [formerly 6d2b921e8731c04bdf279dff1768af30f0c643a6 [formerly c666ac7283
]]
Former-commit-id: 4d570483a8273c1504954f4ab46c44871ea3dc74 [formerly ccc5095251
]
Former-commit-id: 41a6eebf23
2013-09-04 14:13:29 -04:00
Bryan Kowal
8e130b4e87
Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
...
- Amend: restore mpe changes
- Amend: attempt rebase
Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90
Conflicts:
nativeLib/edex_com/.cproject
nativeLib/edex_notify/.cproject
Former-commit-id: 5b9b97b080
[formerly 5bcf751c50
] [formerly 9db548db3e
] [formerly 5b9b97b080
[formerly 5bcf751c50
] [formerly 9db548db3e
] [formerly 326cae8be4
[formerly 9db548db3e
[formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]]]
Former-commit-id: 326cae8be4
Former-commit-id: 47160fb743
[formerly 98e4f44a7d
] [formerly 5f5e74b7dd3ceb43cb11f3eb9a628232439ee13d [formerly 573aeaa238
]]
Former-commit-id: 93a7eb9a61c5d85f72ea4773b0ba6a1b47c86231 [formerly 929e30a520
]
Former-commit-id: 3daf51dacf
2013-09-04 10:08:21 -05:00
Steve Harris
ff9e712630
Merge branch 'master_13.5.2' (13.5.2-2) into omaha_14.1.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
nativeLib/edexBridge/.cproject
nativeLib/edexBridge/edexBridge.cpp
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/ld.so.conf.d/awips2-ldm-i386.conf
rpms/awips2.qpid/0.18/SOURCES/awips.patch
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/build/common/rpms.sh
Former-commit-id: fec8541795
[formerly 433cc78081
] [formerly 18ee1d0092
] [formerly fec8541795
[formerly 433cc78081
] [formerly 18ee1d0092
] [formerly 7fe19d898c
[formerly 18ee1d0092
[formerly b2674e0f626c643f0f81f865ea56351af2531c6a]]]]
Former-commit-id: 7fe19d898c
Former-commit-id: 0f6f34ec8c
[formerly 55bbf0f747
] [formerly 5a94406e31101181f9717f529104887e73712284 [formerly 0514103d87
]]
Former-commit-id: 0a46a83928b6e3462cb1aa939abe80a85f2d9a5b [formerly 482b9d838d
]
Former-commit-id: 5bb983c645
2013-09-03 16:05:44 -05:00
Bryan Kowal
147412207e
Issue #2163 - RHEL6 14.1.1 build updates
...
Former-commit-id: 861a887084
[formerly 17d652a8dd
] [formerly 9415560b38
] [formerly 861a887084
[formerly 17d652a8dd
] [formerly 9415560b38
] [formerly ab3485a3ed
[formerly 9415560b38
[formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]]]
Former-commit-id: ab3485a3ed
Former-commit-id: ece1f596c6
[formerly 751f005228
] [formerly dbc6b10841e1b6bd48ab2c5bb58813c728e5fbb6 [formerly 17b8ded082
]]
Former-commit-id: 5eac7e9d81479e0f95630179883986d57bbb753f [formerly 6de01af674
]
Former-commit-id: a8898ec348
2013-09-03 13:46:19 -05:00
Steve Harris
7c47939632
13.5.2-2 baseline
...
Former-commit-id: 8dcd159377
[formerly 8cde3b2b54
] [formerly 4a47fb97c5
] [formerly 8dcd159377
[formerly 8cde3b2b54
] [formerly 4a47fb97c5
] [formerly 9e4bf0cf2e
[formerly 4a47fb97c5
[formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: c10c39b5d6
[formerly 12b0ab91fd
] [formerly 8411cf39c13b7f63f746f4a1b8806ba15bfa7510 [formerly 5de6d566f0
]]
Former-commit-id: ac9d4632081685ff126231e5a993f8fb95aba22d [formerly 180e042b5d
]
Former-commit-id: db64b2e2d9
2013-08-29 15:01:29 -04:00
Steve Harris
85235051aa
13.5.2-1 baseline
...
Former-commit-id: 3cd0b2dfc6
[formerly 894d2425b2
] [formerly 73dd0f166c
] [formerly 3cd0b2dfc6
[formerly 894d2425b2
] [formerly 73dd0f166c
] [formerly 542b2c3d18
[formerly 73dd0f166c
[formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]]
Former-commit-id: 542b2c3d18
Former-commit-id: b4e006162f
[formerly 43af1b227a
] [formerly 43ff166b6d3df833e29603f504019d7b3776a1d1 [formerly 4ecb349ed8
]]
Former-commit-id: 551ebb34fc0bd9a337eef969bbbeff276486196a [formerly 4a9a91ce2e
]
Former-commit-id: 1900cef156
2013-08-28 09:43:48 -04:00
Steve Harris
690e24905c
13.5.1-18 baseline
...
Former-commit-id: 80d8236464
[formerly d931b80e70
] [formerly afb34814dd
] [formerly 80d8236464
[formerly d931b80e70
] [formerly afb34814dd
] [formerly 0a7acf96c7
[formerly afb34814dd
[formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: ff31991527
[formerly 261b1da9d6
] [formerly bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f
]]
Former-commit-id: 9f45e3bbb3ed565bf3eab964a0ff4d2313fd7eda [formerly cde7f2a59c
]
Former-commit-id: 6c258a0b7c
2013-08-22 09:12:43 -04:00
Steve Harris
7a291e0bfb
13.5.1-17 baseline
...
Former-commit-id: fb9ab08255
[formerly 2d882ccb54
] [formerly 9dd7dc5d20
] [formerly fb9ab08255
[formerly 2d882ccb54
] [formerly 9dd7dc5d20
] [formerly b210c90245
[formerly 9dd7dc5d20
[formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]]
Former-commit-id: b210c90245
Former-commit-id: 4fd4093539
[formerly 7c0cf13ea8
] [formerly c4d2af6f3a1f86a3300795dc1db7d6c9323eac0b [formerly a192a3ebb1
]]
Former-commit-id: 27a8a42f514b9659d14772e48ae0d9cff9703709 [formerly 815bfe575c
]
Former-commit-id: 4bcb06cd63
2013-08-19 16:34:24 -04:00
Bryan Kowal
038e4deef4
Issue #2163 - build the java and awips2-common-base rpms
...
Former-commit-id: fa69d98320
[formerly dd55894802
] [formerly a3a5c799fc
] [formerly fa69d98320
[formerly dd55894802
] [formerly a3a5c799fc
] [formerly 7f8226d319
[formerly a3a5c799fc
[formerly dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43]]]]
Former-commit-id: 7f8226d319
Former-commit-id: e63473681c
[formerly 178b4904ef
] [formerly 13c28d981888a56ba89f41db6a1eb715dc47ee3c [formerly 110fb14b91
]]
Former-commit-id: 25b46948bc574e6bb3ed33397af485deae77cff5 [formerly 64fe4b6760
]
Former-commit-id: cf5293fe91
2013-08-15 15:40:18 -05:00
Bryan Kowal
c236be07f6
Issue #2163 - copy additional httpd source to the rpm SOURCES directory
...
Former-commit-id: 18a3f63616
[formerly 4e3c577c56
] [formerly 32f3e63bd5
] [formerly 18a3f63616
[formerly 4e3c577c56
] [formerly 32f3e63bd5
] [formerly 382cb87fa3
[formerly 32f3e63bd5
[formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]]]]
Former-commit-id: 382cb87fa3
Former-commit-id: 38c4f03c0a
[formerly 6a129d3a96
] [formerly bd8c04417fd168b2227cc23f892d33fc380013fa [formerly 50ab20be95
]]
Former-commit-id: 503397f6e87caa0148f630463b4737d8b4056cee [formerly 2205b4a02f
]
Former-commit-id: a533b3b52c
2013-08-15 15:40:05 -05:00
Bryan Kowal
67a52cd7b0
Issue #2163 - remaining RHEL6 RPM changes
...
- Amend: update build.sh to build the full set of rpms
Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f
Conflicts:
rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
Former-commit-id: 23fb13a41c
[formerly 7d7511af9b
] [formerly 19d80d96c3
] [formerly 23fb13a41c
[formerly 7d7511af9b
] [formerly 19d80d96c3
] [formerly c0458d512d
[formerly 19d80d96c3
[formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]]]
Former-commit-id: c0458d512d
Former-commit-id: 2a9f4d41c9
[formerly f68943aeef
] [formerly b7074896173a8852588739234ce215ff22e0dba5 [formerly 6b305d4ea3
]]
Former-commit-id: ba3cdfa1c21458bf0f95c2202e0d7749db484d77 [formerly 5b55bd8c72
]
Former-commit-id: a3f3f45f4b
2013-08-15 15:39:37 -05:00
Bryan Kowal
d75fd1d5ec
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: 31ee9b4bdc
[formerly a962be9a15
] [formerly 0b4961e9b0
] [formerly 31ee9b4bdc
[formerly a962be9a15
] [formerly 0b4961e9b0
] [formerly 8b51e353f1
[formerly 0b4961e9b0
[formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]]]
Former-commit-id: 8b51e353f1
Former-commit-id: 5ccd628305
[formerly 9943f3a57c
] [formerly b7034f9b0272242db414c96f4e37cd005d0e39a8 [formerly 5dffc9321c
]]
Former-commit-id: 96167e3734f02c78a86ef1c1abf9b19316a64ba9 [formerly 9af6b44727
]
Former-commit-id: 9f506d7ce6
2013-08-15 15:38:11 -05:00
Bryan Kowal
cb7e87d9a4
Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
...
Conflicts:
RadarServer/build.rcm/build.xml
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
Former-commit-id: fb1feea107
[formerly 683d7e5b19
] [formerly c1dab22fdb
] [formerly fb1feea107
[formerly 683d7e5b19
] [formerly c1dab22fdb
] [formerly 94eacfc460
[formerly c1dab22fdb
[formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]]
Former-commit-id: 94eacfc460
Former-commit-id: 33b6f03899
[formerly 53124c5e02
] [formerly b8d6af6f18e6e9e34cf5082362f7b792032c2de6 [formerly 75c6d4ebf6
]]
Former-commit-id: e3b28978c51f9031cb777d8427d123b55b738085 [formerly eab659f961
]
Former-commit-id: 2e6116a952
2013-08-15 15:30:05 -05:00
Bryan Kowal
cc84331809
Issue #2163 - additional RHEL6 changes
...
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready
Former-commit-id: 6e76fc6624
[formerly 5feab7c0be
] [formerly bbca63a8b8
] [formerly 6e76fc6624
[formerly 5feab7c0be
] [formerly bbca63a8b8
] [formerly 36eca9bbfb
[formerly bbca63a8b8
[formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]]]]
Former-commit-id: 36eca9bbfb
Former-commit-id: 45ab6afc31
[formerly 9b62e39fff
] [formerly be9ce96e1e14d369e98c21317e7f54a4d7d48430 [formerly 1f5e92aac9
]]
Former-commit-id: 371f2a79d88405004e831cbc983ff10de8c7cfeb [formerly 858a41c50d
]
Former-commit-id: b32933f72a
2013-08-15 15:25:52 -05:00
Bryan Kowal
9bf0e0ab3c
Issue #2163 - pgadmin 3 updated for RHEL 6 compatibility
...
Former-commit-id: 37ebd41ee0
[formerly 1c2ca11a33
] [formerly b08a9da804
] [formerly 37ebd41ee0
[formerly 1c2ca11a33
] [formerly b08a9da804
] [formerly b1e4e77a13
[formerly b08a9da804
[formerly 417c6abe1a9d7f2df51ca38a8127d06e6a15dc7b]]]]
Former-commit-id: b1e4e77a13
Former-commit-id: b177c46971
[formerly a5effbed37
] [formerly 290da1b6c7cb0a4e7ce8b2b679428c5b1cd6adc2 [formerly c97d4f42b6
]]
Former-commit-id: aad45a32804a8acb7021f846cf3cb4bab5ff5424 [formerly 8068e7a7b2
]
Former-commit-id: b68cdebe4e
2013-08-15 15:25:43 -05:00
Bryan Kowal
016bc8099d
Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
...
- httpd has been updated for compatibility
Former-commit-id: 3074681a82
[formerly d3f5a8ecfd
] [formerly 91a84e57b5
] [formerly 3074681a82
[formerly d3f5a8ecfd
] [formerly 91a84e57b5
] [formerly c0614bc7d4
[formerly 91a84e57b5
[formerly 8298c43aba3850753b67ff002f71e02e70b12fb0]]]]
Former-commit-id: c0614bc7d4
Former-commit-id: b1bf843307
[formerly 68c89e6736
] [formerly c5c75095cdb39d40899d94cb78da35c31632b661 [formerly ba04336262
]]
Former-commit-id: ab7b60780791a6953edc75b72d16a7558fda6a96 [formerly 44722e1106
]
Former-commit-id: 4df25d3b0f
2013-08-15 15:25:02 -05:00
Bryan Kowal
ad5a8ced22
Issue #2163 - 64-bit RHEL6 rpm conversion
...
- converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm)
- converted Java
- converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools
- fixed python h5py to correctly include the built libsz libraries
Former-commit-id: 35478ce5ff
[formerly b32922186d
] [formerly 0bee225031
] [formerly 35478ce5ff
[formerly b32922186d
] [formerly 0bee225031
] [formerly e686f9bdda
[formerly 0bee225031
[formerly ffc8892888976ee4b9d9edeb315b74edc5bb375f]]]]
Former-commit-id: e686f9bdda
Former-commit-id: d30c098382
[formerly 8d4645a0a4
] [formerly d66458a6e3e011df4ee392929eae99b13093533d [formerly e24b249d5b
]]
Former-commit-id: 1606e698a2e37ca23b45451d93010cb5de3244f1 [formerly 5b451d09f1
]
Former-commit-id: 55e29b2bba
2013-08-15 15:24:48 -05:00
Bryan Kowal
832f4a5250
Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
...
Former-commit-id: 61b14897fd
[formerly 2b4faafed7
] [formerly e3e596eb5d
] [formerly 61b14897fd
[formerly 2b4faafed7
] [formerly e3e596eb5d
] [formerly be011d3b92
[formerly e3e596eb5d
[formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]]]]
Former-commit-id: be011d3b92
Former-commit-id: 5185e79785
[formerly 6561efe457
] [formerly 475cbcc55e42aa6fa76623a7fa80a66662613073 [formerly 7b1615ba80
]]
Former-commit-id: 30dc8c2a9b14c42729bb6d14f3cdcd806be041dd [formerly 8331e2a16a
]
Former-commit-id: f61b437746
2013-08-15 15:24:11 -05:00
Steve Harris
ca5109f3d6
13.5.1-16 baseline
...
Former-commit-id: 47130c98a5
[formerly 6818d80085
] [formerly cd3b63d961
] [formerly 47130c98a5
[formerly 6818d80085
] [formerly cd3b63d961
] [formerly 7ce0234d76
[formerly cd3b63d961
[formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]]
Former-commit-id: 7ce0234d76
Former-commit-id: ca5796e082
[formerly e881ff6271
] [formerly 0cee24c9ec1cc1b51da8edf9a2cdeef3b66498e1 [formerly d7b1ed4900
]]
Former-commit-id: 8ac6ca8ce4a5022058bcf2cfc30b1481b8e7c987 [formerly af2b4495bb
]
Former-commit-id: ff03caef3d
2013-08-15 13:40:37 -04:00
Steve Harris
a700182250
13.5.1-15 baseline
...
Former-commit-id: b05abcaec0
[formerly 535218c676
] [formerly 53e96e21db
] [formerly b05abcaec0
[formerly 535218c676
] [formerly 53e96e21db
] [formerly c6dc1817e7
[formerly 53e96e21db
[formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 6f1b6d494f
[formerly 4f9288e7c1
] [formerly c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58
]]
Former-commit-id: 813df6d93357ffbcdd78c9658dc75c9aaa803d60 [formerly 9ea3f0c215
]
Former-commit-id: d0be6956e9
2013-08-14 10:24:26 -04:00
Steve Harris
a338706fa4
13.5.1-14 baseline
...
Former-commit-id: c6465a3398
[formerly b848317203
] [formerly d695e5debe
] [formerly c6465a3398
[formerly b848317203
] [formerly d695e5debe
] [formerly 80e5f7fbd4
[formerly d695e5debe
[formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 4e75333155
[formerly 9bd983e2fe
] [formerly 979d519294a0cce041889e9000a739088fbe1b71 [formerly cd5b1e9e2f
]]
Former-commit-id: d8f0e84b19aec7b3ded8283169da1f9631e8d68a [formerly 0f3ffc3892
]
Former-commit-id: f4262380d6
2013-08-14 10:07:41 -04:00
Greg Armendariz
b264a9d841
13.5.1-13 baseline
...
Former-commit-id: 429898edc6
[formerly f0b62a22bf
] [formerly 29b823fee4
] [formerly 429898edc6
[formerly f0b62a22bf
] [formerly 29b823fee4
] [formerly 5577e686c1
[formerly 29b823fee4
[formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]]
Former-commit-id: 5577e686c1
Former-commit-id: 076a0b08ac
[formerly 9f2f62427b
] [formerly 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add
]]
Former-commit-id: e2cd5730bab137f2b61daadd542fa1f16682d2c6 [formerly b66fcc40a5
]
Former-commit-id: 0c61b62d24
2013-08-08 17:00:36 -04:00
Greg Armendariz
d37c94464b
13.5.1-12 baseline
...
Former-commit-id: 34e0218b59
[formerly 01d067cff9
] [formerly c9898ba8d1
] [formerly 34e0218b59
[formerly 01d067cff9
] [formerly c9898ba8d1
] [formerly fe51885ba7
[formerly c9898ba8d1
[formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]]
Former-commit-id: fe51885ba7
Former-commit-id: 75d1e77f1b
[formerly f777a744e5
] [formerly cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262
]]
Former-commit-id: c31f8384962ae36ae9a33ef84d46aea958522032 [formerly cbf9e42c21
]
Former-commit-id: 244bc3ac37
2013-08-08 15:34:01 -04:00
Greg Armendariz
7fb928e967
13.5.1-11 baseline
...
Former-commit-id: 814f7fdcdd
[formerly c402dbf6e9
] [formerly ea7b22500e
] [formerly 814f7fdcdd
[formerly c402dbf6e9
] [formerly ea7b22500e
] [formerly 4ec04083bd
[formerly ea7b22500e
[formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 4c20fc4977
[formerly 75f9f8df3f
] [formerly f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb
]]
Former-commit-id: 4b97c9297a6132e1a64e7b28e4204a8cd32cdd79 [formerly f06ee47260
]
Former-commit-id: 8bf2c1cc07
2013-08-07 14:34:27 -04:00
Greg Armendariz
0bb16ced54
13.5.1-10 baseline
...
Former-commit-id: 9694f9390a
[formerly e276b0fabe
] [formerly 852455843f
] [formerly 9694f9390a
[formerly e276b0fabe
] [formerly 852455843f
] [formerly acf7ced37b
[formerly 852455843f
[formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]]
Former-commit-id: acf7ced37b
Former-commit-id: 690ea2e228
[formerly 9ddb32967c
] [formerly 55e2845c864335ebeda69be5a21e4f9deaffd22e [formerly 05282eac88
]]
Former-commit-id: f92c8134fca60f550bc93797091c6154015f9683 [formerly f37ef8c24e
]
Former-commit-id: 5998f47f57
2013-08-07 14:14:46 -04:00
Steve Harris
a7c6d3b46d
13.5.1-9 baseline
...
Former-commit-id: 1be9abc02f
[formerly 778df21de9
] [formerly 97fe6a670f
] [formerly 1be9abc02f
[formerly 778df21de9
] [formerly 97fe6a670f
] [formerly 6e60cd9a79
[formerly 97fe6a670f
[formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 7fc384a659
[formerly c7e7c838aa
] [formerly 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49
]]
Former-commit-id: dd4d7bf31c8224a969995ed35d8e37b50bb8a6d6 [formerly e16fce85ae
]
Former-commit-id: ef41819406
2013-08-01 09:20:23 -04:00
Steve Harris
dded20dc93
13.5.1-8 baseline
...
Former-commit-id: 52da6c54db
[formerly 392faf86e7
] [formerly 3bece5e5d0
] [formerly 52da6c54db
[formerly 392faf86e7
] [formerly 3bece5e5d0
] [formerly dfbf9a5afe
[formerly 3bece5e5d0
[formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60
[formerly a7d4c6274e
] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814
]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf
]
Former-commit-id: 767b7fdb4d
2013-07-26 09:02:34 -04:00
Steve Harris
adf2f89d57
13.5.1-7 baseline
...
Former-commit-id: 67299457b1
[formerly 630705aa3f
] [formerly bf58a81b38
] [formerly 67299457b1
[formerly 630705aa3f
] [formerly bf58a81b38
] [formerly 86ce1248c2
[formerly bf58a81b38
[formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b
[formerly cb50a0028d
] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5
]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd
]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00