diff options
| author | Brent Eagles <brent@zeroc.com> | 2006-07-11 21:50:34 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2006-07-11 21:50:34 +0000 |
| commit | 930c43cc7edbb527ff4df5c790d7ca52627b39b7 (patch) | |
| tree | a8d7bf5cc9dc0aa6682a4daf942c26dadc370f58 /cpp | |
| parent | fixing placement of debug dlls to be available independently of development (diff) | |
| download | ice-930c43cc7edbb527ff4df5c790d7ca52627b39b7.tar.bz2 ice-930c43cc7edbb527ff4df5c790d7ca52627b39b7.tar.xz ice-930c43cc7edbb527ff4df5c790d7ca52627b39b7.zip | |
removing openssl from hpux and fixing broken rpms
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/RPMTools.py | 8 | ||||
| -rwxr-xr-x | cpp/makebindist.py | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py index 00725169706..f9b3a830078 100644 --- a/cpp/RPMTools.py +++ b/cpp/RPMTools.py @@ -353,8 +353,8 @@ fileLists = [ ('file', 'share/doc/Ice-%version%/certs/c_rsa1024_priv.pem'), ('file', 'share/doc/Ice-%version%/certs/c_rsa1024_pub.pem'), ('file', 'share/doc/Ice-%version%/certs/s_rsa1024_priv.pem'), - ('file', 'share/doc/Ice-%version%/certs/s_rsa1024_priv.pem'), - ('file', 'share/doc/Ice-%version%/certs/s_dsa1024_pub.pem'), + ('file', 'share/doc/Ice-%version%/certs/s_rsa1024_pub.pem'), + ('file', 'share/doc/Ice-%version%/certs/s_dsa1024_priv.pem'), ('file', 'share/doc/Ice-%version%/certs/s_dsa1024_pub.pem'), ('file', 'share/doc/Ice-%version%/certs/dsaparam1024.pem'), ('file', 'share/doc/Ice-%version%/certs/cakey.pem'), @@ -458,11 +458,11 @@ fileLists = [ [('lib', '%{icelibdir}/php/modules'), ('cfg', '/etc/php.d/ice.ini')] ), NoarchSubpackage('php-devel', - 'ice= %version%, iphp = 5.1.4, ice-php = %version%', + 'ice = %version%, php = 5.1.4, ice-php = %version%', 'Demos for developing Ice applications in PHP', 'Development/Tools', iceDescription, - 'Requires: ice-php', + '', [('dir', 'share/doc/Ice-%version%/demophp')]), NoarchSubpackage('java', 'ice = %version%, db4-java >= 4.3.29', diff --git a/cpp/makebindist.py b/cpp/makebindist.py index 4ead611ff4d..369672ee8b0 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -1184,15 +1184,15 @@ def main(): if getPlatform() == 'macosx': copyExpatFiles(os.environ['EXPAT_HOME'], version) - if getPlatform() == 'hpux': - ssl = os.environ['OPENSSL_HOME'] - shutil.copy('%s/bin/openssl' % ssl, 'Ice-%s/bin' % version) - runprog('cp -R ' + ssl + '/include Ice-' + version) - runprog('cp -R ' + ssl + '/lib Ice-' + version) - runprog('rm -rf Ice-' + version + '/lib/libfips*') - runprog('rm -rf Ice-' + version + '/lib/engines') - runprog('rm -rf Ice-' + version + '/lib/pkgconfig') - runprog('rm -f Ice-' + version + '/lib/*.a') +# if getPlatform() == 'hpux': +# ssl = os.environ['OPENSSL_HOME'] +# shutil.copy('%s/bin/openssl' % ssl, 'Ice-%s/bin' % version) +# runprog('cp -R ' + ssl + '/include Ice-' + version) +# runprog('cp -R ' + ssl + '/lib Ice-' + version) +# runprog('rm -rf Ice-' + version + '/lib/libfips*') +# runprog('rm -rf Ice-' + version + '/lib/engines') +# runprog('rm -rf Ice-' + version + '/lib/pkgconfig') +# runprog('rm -f Ice-' + version + '/lib/*.a') uname = readcommand('uname') platformSpecificFiles = [ 'README', 'SOURCES', 'THIRD_PARTY_LICENSE' ] |